Merge branch 'release/8.2.0' into main

esmf-org · Oct 26, 2021 · 5c6ca08 · 5c6ca08
2 parents c2f8297 + 304824b
commit 5c6ca08
Show file tree

Hide file tree

Showing 203 changed files with 15,776 additions and 7,192 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -26,12 +26,6 @@ jobs:
       - run:
           name: Docker Push esmf-doc-base
           command: bash esmf/.circleci/sh/docker-push-generic.sh "esmf/esmf-doc-base"
-      - run:
-          name: Docker Build esmpy-doc-base
-          command: docker build -t "esmf/esmpy-doc-base" --file "ESCOMP-Containers/ESMF/doc/esmpy-doc-base/Dockerfile" --build-arg DOCKER_NAMESPACE="esmf" .
-      - run:
-          name: Docker Push esmpy-doc-base
-          command: bash esmf/.circleci/sh/docker-push-generic.sh "esmf/esmpy-doc-base"
 
   build-escomp-esmf:
     docker:
@@ -141,7 +135,7 @@ jobs:
       - run:
          name: "Removing slash from branch name "
          command: |
-                  echo 'export CIRCLE_BRANCH_NEW=`echo ${CIRCLE_BRANCH} | sed 's#/#_#'`' >> $BASH_ENV
+                  echo 'export CIRCLE_BRANCH_NEW=`echo ${CIRCLE_BRANCH} | sed 's:/:_:g'`' >> $BASH_ENV
                   echo $CIRCLE_BRANCH_NEW
                   source $BASH_ENV
       - run:
@@ -187,7 +181,7 @@ jobs:
       - run:
          name: "Removing slash from branch name "
          command: |
-                  echo 'export CIRCLE_BRANCH_NEW=`echo ${CIRCLE_BRANCH} | sed 's#/#_#'`' >> $BASH_ENV
+                  echo 'export CIRCLE_BRANCH_NEW=`echo ${CIRCLE_BRANCH} | sed 's:/:_:g'`' >> $BASH_ENV
                   echo $CIRCLE_BRANCH_NEW
                   source $BASH_ENV
       - run:
@@ -233,7 +227,7 @@ jobs:
       - run:
          name: "Removing slash from branch name "
          command: |
-                  echo 'export CIRCLE_BRANCH_NEW=`echo ${CIRCLE_BRANCH} | sed 's#/#_#'`' >> $BASH_ENV
+                  echo 'export CIRCLE_BRANCH_NEW=`echo ${CIRCLE_BRANCH} | sed 's:/:_:g'`' >> $BASH_ENV
                   echo $CIRCLE_BRANCH_NEW
                   source $BASH_ENV
       - run:
@@ -244,7 +238,7 @@ jobs:
           command: git clone --branch $CIRCLE_BRANCH https://github.com/esmf-org/esmf.git
       - run:
           name: Docker Run API Changes
-          command: docker build -t "esmf/api-change:${CIRCLE_BRANCH_NEW}" --file "ESCOMP-Containers/ESMF/API_changes/Dockerfile" --build-arg DOCKER_NAMESPACE="esmf" --build-arg TAG1="ESMF_8_0_0" --build-arg TAG2="${CIRCLE_BRANCH}" --no-cache .
+          command: docker build -t "esmf/api-change:${CIRCLE_BRANCH_NEW}" --file "ESCOMP-Containers/ESMF/API_changes/Dockerfile" --build-arg DOCKER_NAMESPACE="esmf" --build-arg TAG1="ESMF_8_1_0" --build-arg TAG2="${CIRCLE_BRANCH}" --no-cache .
       - run:
           name: Extract API Changes
           command: bash esmf/.circleci/sh/extract-artifacts.sh "/tmp/artifacts" "/artifacts/api_change-artifacts.zip" "esmf/api-change:${CIRCLE_BRANCH_NEW}"
@@ -296,19 +290,18 @@ jobs:
       - run:
          name: "Removing slash from branch name "
          command: |
-                  echo 'export CIRCLE_BRANCH_NEW=`echo ${CIRCLE_BRANCH} | sed 's#/#_#'`' >> $BASH_ENV
+                  echo 'export CIRCLE_BRANCH_NEW=`echo ${CIRCLE_BRANCH} | sed 's:/:_:g'`' >> $BASH_ENV
                   echo $CIRCLE_BRANCH_NEW
                   source $BASH_ENV
       - run:
           name: Checkout Code (ESCOMP-Containers)
           command: git clone --depth 1 https://github.com/ESCOMP/ESCOMP-Containers.git
-#          command: git clone --depth 1 --branch esmpy-doc-base-to-ubuntu https://github.com/esmf-org/ESCOMP-Containers.git
       - run:
           name: Checkout Code (ESMF)
           command: git clone --branch $CIRCLE_BRANCH --depth 1 https://github.com/esmf-org/esmf.git
       - run:
           name: Docker Build esmpy-doc
-          command: docker build -t "esmf/esmpy-doc:${CIRCLE_BRANCH_NEW}" --file "ESCOMP-Containers/ESMF/doc/esmpy-doc/Dockerfile" --build-arg ESMF_BRANCH="${CIRCLE_BRANCH}" --build-arg DOCKER_NAMESPACE="esmf" --no-cache .
+          command: docker build -t "esmf/esmpy-doc:${CIRCLE_BRANCH_NEW}" --file "ESCOMP-Containers/ESMF/doc/esmpy-doc/Dockerfile" --build-arg ESMF_BRANCH="${CIRCLE_BRANCH}" --no-cache .
       - run:
           name: Extract Doc Artifacts
           command: bash esmf/.circleci/sh/extract-artifacts.sh "/tmp/artifacts" "/artifacts/doc-esmpy.zip" "esmf/esmpy-doc:${CIRCLE_BRANCH_NEW}"
@@ -386,7 +379,6 @@ jobs:
       - run:
           name: Checkout Code (ESCOMP-Containers)
           command: git clone --depth 1 https://github.com/ESCOMP/ESCOMP-Containers.git
-#          command: git clone --depth 1 --branch esmpy-doc-base-to-ubuntu https://github.com/esmf-org/ESCOMP-Containers.git
       - run:
           name: Checkout Code (ESMF)
           command: git clone --branch $CIRCLE_BRANCH --depth 1 https://github.com/esmf-org/esmf.git
@@ -481,21 +473,23 @@ workflows:
 
   docs-commit:
     jobs:
-      - should-build-docs:
-          type: approval
-      - build-esmf-docs:
-          requires:
-            - should-build-docs
+#      - should-build-docs:
+#          type: approval
+#      - build-esmf-docs:
+#          requires:
+#            - should-build-docs
+      - build-esmf-docs
       - publish-esmf-docs:
           requires:
             - build-esmf-docs
-#          filters:
-#            branches:
-#              only:
-#                - develop
-      - build-esmpy-docs:
-          requires:
-            - should-build-docs
+          filters:
+            branches:
+              only:
+                - develop
+                - /^release/.*$/
+      - build-esmpy-docs
+#          requires:
+#            - should-build-docs
       - publish-esmpy-docs:
           requires:
             - build-esmpy-docs
@@ -540,3 +534,4 @@ workflows:
 #      - osx-esmf:
 #          requires:
 #            - should-run-osx
+
diff --git a/.circleci/sh/doc-push-esmpy.sh b/.circleci/sh/doc-push-esmpy.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 set -Eeuxo pipefail
 
-git config --global user.email "himanshu@ucar.edu"
+git config --global user.email "dunlap@ucar.edu"
 git config --global user.name "esmf-orgbot"
 
 cd
+
 git clone --depth 1 [email protected]:esmf-org/esmpy_doc.git
 
 cd esmpy_doc/

diff --git a/.circleci/sh/doc-push.sh b/.circleci/sh/doc-push.sh
@@ -3,7 +3,7 @@ set -Eeuxo pipefail
 
 DOC_ARTIFACTS="/tmp/artifacts/artifacts"
 
-git config --global user.email "himanshu@ucar.edu"
+git config --global user.email "dunlap@ucar.edu"
 git config --global user.name "esmf-orgbot"
 
 cd

diff --git a/.circleci/sh/test_coverage-push.sh b/.circleci/sh/test_coverage-push.sh
@@ -5,7 +5,7 @@ DOC_ARTIFACTS="/tmp/artifacts/artifacts"
 
 cd 
 
-git config --global user.email "himanshu@ucar.edu"
+git config --global user.email "dunlap@ucar.edu"
 git config --global user.name "esmf-orgbot"
 
 
@@ -25,9 +25,12 @@ cp -rf ${DOC_ARTIFACTS}/* ~/esmf-test-artifacts/${CIRCLE_BRANCH}/platform_indepe
 
 cd ~/esmf-test-artifacts/
 git add .
-git commit -a -m " Test Coverage pushed in the artifacts `date` [ci skip] "
+git commit -a -m " `echo ${CIRCLE_BRANCH}` Test Coverage pushed in the artifacts `date` [ci skip] "
 
 # Push the changes ------------------------------------------------------------
 
 git remote prune origin
+
+# helps to avoid failures due to commits than come in between
+git pull --no-edit
 git push origin main
diff --git a/build/common.mk b/build/common.mk
@@ -707,7 +707,7 @@ export ESMF_VERSION_STRING_GIT := $(shell $(ESMF_DIR)/scripts/esmfversiongit)
 endif
 
 ifdef ESMF_VERSION_STRING_GIT
-ESMF_CPPFLAGS += -DESMFVERSIONGIT='"$(ESMF_VERSION_STRING_GIT)"'
+ESMF_CPPFLAGS += -DESMF_VERSION_STRING_GIT='"$(ESMF_VERSION_STRING_GIT)"'
 endif
 
 #-------------------------------------------------------------------------------

diff --git a/build/doc/user_arch.tex b/build/doc/user_arch.tex
@@ -7,8 +7,8 @@
 combinations of environment variable settings used by the ESMF
 build system. The exact configurations tested for this release
  are available online in the Supported Platform Table:
-\htmladdnormallink{http://earthsystemmodeling.org/release/platforms\_8\_1\_0}
-{http://earthsystemmodeling.org/release/platforms_8_1_0}.
+\htmladdnormallink{http://earthsystemmodeling.org/release/platforms\_8\_2\_0}
+{http://earthsystemmodeling.org/release/platforms_8_2_0}.
 
 All possible combinations of {\tt ESMF\_OS}, {\tt ESMF\_COMPILER}, {\tt ESMF\_COMM},
 and {\tt ESMF\_ABI} build environment variables are listed in the following table.
@@ -67,6 +67,10 @@
 Linux   &\tt lahey       &\footnotesize \tt {\bf mpiuni},mpich,mpich2,mpich3,mvapich2,lam,openmpi,user &\tt 32, 64 \\
 Linux   &\tt nag         &\footnotesize \tt {\bf mpiuni},mpich,mpich2,mpich3,mvapich2,lam,openmpi,user &\tt 32, 64 \\
 Linux   &\tt nagintel    &\footnotesize \tt {\bf mpiuni},mpich,mpich2,mpich3,lam,openmpi,user &\tt 32, 64 \\
+Linux   &\tt nvhpc       &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich2,mpich3,mvapich,mvapich2 &\tt 32, 64, \\
+        &                &\footnotesize \tt intelmpi,openmpi,user &\tt x86\_64\_32, \\
+        &                &                              &\tt x86\_64\_small, \\
+        &                &                              &\tt x86\_64\_medium \\
 Linux   &\tt pathscale   &\footnotesize \tt {\bf mpiuni},mpich,mpich2,mpich3,lam,openmpi,user &\tt 32, 64, \\
         &                &                              &\tt x86\_64\_32, \\
         &                &                              &\tt x86\_64\_small, \\

diff --git a/build_config/Darwin.gfortran.default/build_rules.mk b/build_config/Darwin.gfortran.default/build_rules.mk
@@ -118,11 +118,6 @@ ifneq ($(ESMF_CLANGSTR), clang)
 ESMF_CXXOPTFLAG_G       += -Wall -Wextra -Wno-unused
 endif
 
-############################################################
-# Gfortran runtime library on Darwin does not currently seem thread-safe
-#
-ESMF_PTHREADS := OFF
-
 ############################################################
 # Fortran symbol convention
 #

diff --git a/build_config/Darwin.nag.default/build_rules.mk b/build_config/Darwin.nag.default/build_rules.mk
@@ -115,6 +115,12 @@ ESMF_CLANGSTR := $(findstring clang, $(shell $(ESMF_CXXCOMPILER) --version))
 # (e.g., ABORT) are made.
 ESMF_F90COMPILEOPTS += -DESMF_NAG_UNIX_MODULE
 
+############################################################
+# Currently NAG does not support the Fortran2018 assumed type feature
+#
+ESMF_F90COMPILECPPFLAGS += -DESMF_NO_F2018ASSUMEDTYPE
+ESMF_CXXCOMPILECPPFLAGS += -DESMF_NO_F2018ASSUMEDTYPE
+
 ############################################################
 # nag currently does not support OpenMP
 #

diff --git a/build_config/Darwin.pgi.default/build_rules.mk b/build_config/Darwin.pgi.default/build_rules.mk
@@ -134,6 +134,12 @@ ESMF_PGIVERSION_PATCH = $(shell $(ESMF_DIR)/scripts/version.pgi 3 $(ESMF_F90COMP
 ESMF_F90COMPILECPPFLAGS += -DESMF_PGIVERSION_PATCH=$(ESMF_PGIVERSION_PATCH)
 ESMF_CXXCOMPILECPPFLAGS += -DESMF_PGIVERSION_PATCH=$(ESMF_PGIVERSION_PATCH)
 
+############################################################
+# Currently PGI does not support the Fortran2018 assumed type feature
+#
+ESMF_F90COMPILECPPFLAGS += -DESMF_NO_F2018ASSUMEDTYPE
+ESMF_CXXCOMPILECPPFLAGS += -DESMF_NO_F2018ASSUMEDTYPE
+
 ############################################################
 # Construct the ABISTRING
 #

diff --git a/build_config/Linux.nvhpc.default/ESMC_Conf.h b/build_config/Linux.nvhpc.default/ESMC_Conf.h
@@ -0,0 +1,33 @@
+#ifdef ESMC_RCS_HEADER
+"$Id$"
+"Defines the configuration for this machine"
+#endif
+
+#if 0
+Earth System Modeling Framework
+Copyright 2002-2021, University Corporation for Atmospheric Research,
+Massachusetts Institute of Technology, Geophysical Fluid Dynamics
+Laboratory, University of Michigan, National Centers for Environmental
+Prediction, Los Alamos National Laboratory, Argonne National Laboratory,
+NASA Goddard Space Flight Center.
+Licensed under the University of Illinois-NCSA License.
+#endif
+
+#if !defined(INCLUDED_CONF_H)
+#define INCLUDED_CONF_H
+
+#define PARCH_linux
+
+#define FTN_X(func) func##_
+#define FTNX(func) func##_
+
+#if defined (__cplusplus)
+// Typedef to match the data type of the 'hidden' string length
+// argument that Fortran uses when passing CHARACTER strings.
+#include <cstddef>
+typedef size_t ESMCI_FortranStrLenArg;
+#endif
+
+#define ESMC_PRESENT(arg) ( (arg) != 0 )
+
+#endif
diff --git a/build_config/Linux.nvhpc.default/ESMF_Conf.inc b/build_config/Linux.nvhpc.default/ESMF_Conf.inc
@@ -0,0 +1,11 @@
+#if 0
+$Id$
+
+Earth System Modeling Framework
+Copyright 2002-2021, University Corporation for Atmospheric Research,
+Massachusetts Institute of Technology, Geophysical Fluid Dynamics
+Laboratory, University of Michigan, National Centers for Environmental
+Prediction, Los Alamos National Laboratory, Argonne National Laboratory,
+NASA Goddard Space Flight Center.
+Licensed under the University of Illinois-NCSA License.
+#endif
diff --git a/build_config/Linux.nvhpc.default/README b/build_config/Linux.nvhpc.default/README
@@ -0,0 +1,5 @@
+Settings for Linux, using the NVIDIA HPC compilers.
+
+Requires the following environment settings:
+
+ESMF_COMPILER nvhpc