Skip to content

Commit 5c6ca08

Browse files
theurichtheurich
committed
Merge branch 'release/8.2.0' into main
2 parents c2f8297 + 304824b commit 5c6ca08

File tree

203 files changed

+15776
-7192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+15776
-7192
lines changed

‎.circleci/config.yml‎

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ jobs:
2626
- run:
2727
name: Docker Push esmf-doc-base
2828
command: bash esmf/.circleci/sh/docker-push-generic.sh "esmf/esmf-doc-base"
29-
- run:
30-
name: Docker Build esmpy-doc-base
31-
command: docker build -t "esmf/esmpy-doc-base" --file "ESCOMP-Containers/ESMF/doc/esmpy-doc-base/Dockerfile" --build-arg DOCKER_NAMESPACE="esmf" .
32-
- run:
33-
name: Docker Push esmpy-doc-base
34-
command: bash esmf/.circleci/sh/docker-push-generic.sh "esmf/esmpy-doc-base"
3529

3630
build-escomp-esmf:
3731
docker:
@@ -141,7 +135,7 @@ jobs:
141135
- run:
142136
name: "Removing slash from branch name "
143137
command: |
144-
echo 'export CIRCLE_BRANCH_NEW=`echo ${CIRCLE_BRANCH} | sed 's#/#_#'`' >> $BASH_ENV
138+
echo 'export CIRCLE_BRANCH_NEW=`echo ${CIRCLE_BRANCH} | sed 's:/:_:g'`' >> $BASH_ENV
145139
echo $CIRCLE_BRANCH_NEW
146140
source $BASH_ENV
147141
- run:
@@ -187,7 +181,7 @@ jobs:
187181
- run:
188182
name: "Removing slash from branch name "
189183
command: |
190-
echo 'export CIRCLE_BRANCH_NEW=`echo ${CIRCLE_BRANCH} | sed 's#/#_#'`' >> $BASH_ENV
184+
echo 'export CIRCLE_BRANCH_NEW=`echo ${CIRCLE_BRANCH} | sed 's:/:_:g'`' >> $BASH_ENV
191185
echo $CIRCLE_BRANCH_NEW
192186
source $BASH_ENV
193187
- run:
@@ -233,7 +227,7 @@ jobs:
233227
- run:
234228
name: "Removing slash from branch name "
235229
command: |
236-
echo 'export CIRCLE_BRANCH_NEW=`echo ${CIRCLE_BRANCH} | sed 's#/#_#'`' >> $BASH_ENV
230+
echo 'export CIRCLE_BRANCH_NEW=`echo ${CIRCLE_BRANCH} | sed 's:/:_:g'`' >> $BASH_ENV
237231
echo $CIRCLE_BRANCH_NEW
238232
source $BASH_ENV
239233
- run:
@@ -244,7 +238,7 @@ jobs:
244238
command: git clone --branch $CIRCLE_BRANCH https://github.com/esmf-org/esmf.git
245239
- run:
246240
name: Docker Run API Changes
247-
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 .
241+
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 .
248242
- run:
249243
name: Extract API Changes
250244
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:
296290
- run:
297291
name: "Removing slash from branch name "
298292
command: |
299-
echo 'export CIRCLE_BRANCH_NEW=`echo ${CIRCLE_BRANCH} | sed 's#/#_#'`' >> $BASH_ENV
293+
echo 'export CIRCLE_BRANCH_NEW=`echo ${CIRCLE_BRANCH} | sed 's:/:_:g'`' >> $BASH_ENV
300294
echo $CIRCLE_BRANCH_NEW
301295
source $BASH_ENV
302296
- run:
303297
name: Checkout Code (ESCOMP-Containers)
304298
command: git clone --depth 1 https://github.com/ESCOMP/ESCOMP-Containers.git
305-
# command: git clone --depth 1 --branch esmpy-doc-base-to-ubuntu https://github.com/esmf-org/ESCOMP-Containers.git
306299
- run:
307300
name: Checkout Code (ESMF)
308301
command: git clone --branch $CIRCLE_BRANCH --depth 1 https://github.com/esmf-org/esmf.git
309302
- run:
310303
name: Docker Build esmpy-doc
311-
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 .
304+
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 .
312305
- run:
313306
name: Extract Doc Artifacts
314307
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:
386379
- run:
387380
name: Checkout Code (ESCOMP-Containers)
388381
command: git clone --depth 1 https://github.com/ESCOMP/ESCOMP-Containers.git
389-
# command: git clone --depth 1 --branch esmpy-doc-base-to-ubuntu https://github.com/esmf-org/ESCOMP-Containers.git
390382
- run:
391383
name: Checkout Code (ESMF)
392384
command: git clone --branch $CIRCLE_BRANCH --depth 1 https://github.com/esmf-org/esmf.git
@@ -481,21 +473,23 @@ workflows:
481473

482474
docs-commit:
483475
jobs:
484-
- should-build-docs:
485-
type: approval
486-
- build-esmf-docs:
487-
requires:
488-
- should-build-docs
476+
# - should-build-docs:
477+
# type: approval
478+
# - build-esmf-docs:
479+
# requires:
480+
# - should-build-docs
481+
- build-esmf-docs
489482
- publish-esmf-docs:
490483
requires:
491484
- build-esmf-docs
492-
# filters:
493-
# branches:
494-
# only:
495-
# - develop
496-
- build-esmpy-docs:
497-
requires:
498-
- should-build-docs
485+
filters:
486+
branches:
487+
only:
488+
- develop
489+
- /^release/.*$/
490+
- build-esmpy-docs
491+
# requires:
492+
# - should-build-docs
499493
- publish-esmpy-docs:
500494
requires:
501495
- build-esmpy-docs
@@ -540,3 +534,4 @@ workflows:
540534
# - osx-esmf:
541535
# requires:
542536
# - should-run-osx
537+

‎.circleci/sh/doc-push-esmpy.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#!/usr/bin/env bash
22
set -Eeuxo pipefail
33

4-
git config --global user.email "himanshu@ucar.edu"
4+
git config --global user.email "dunlap@ucar.edu"
55
git config --global user.name "esmf-orgbot"
66

77
cd
8+
89
git clone --depth 1 git@github.com:esmf-org/esmpy_doc.git
910

1011
cd esmpy_doc/

‎.circleci/sh/doc-push.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -Eeuxo pipefail
33

44
DOC_ARTIFACTS="/tmp/artifacts/artifacts"
55

6-
git config --global user.email "himanshu@ucar.edu"
6+
git config --global user.email "dunlap@ucar.edu"
77
git config --global user.name "esmf-orgbot"
88

99
cd

‎.circleci/sh/test_coverage-push.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ DOC_ARTIFACTS="/tmp/artifacts/artifacts"
55

66
cd
77

8-
git config --global user.email "himanshu@ucar.edu"
8+
git config --global user.email "dunlap@ucar.edu"
99
git config --global user.name "esmf-orgbot"
1010

1111

@@ -25,9 +25,12 @@ cp -rf ${DOC_ARTIFACTS}/* ~/esmf-test-artifacts/${CIRCLE_BRANCH}/platform_indepe
2525

2626
cd ~/esmf-test-artifacts/
2727
git add .
28-
git commit -a -m " Test Coverage pushed in the artifacts `date` [ci skip] "
28+
git commit -a -m " `echo ${CIRCLE_BRANCH}` Test Coverage pushed in the artifacts `date` [ci skip] "
2929

3030
# Push the changes ------------------------------------------------------------
3131

3232
git remote prune origin
33+
34+
# helps to avoid failures due to commits than come in between
35+
git pull --no-edit
3336
git push origin main

‎build/common.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ export ESMF_VERSION_STRING_GIT := $(shell $(ESMF_DIR)/scripts/esmfversiongit)
707707
endif
708708

709709
ifdef ESMF_VERSION_STRING_GIT
710-
ESMF_CPPFLAGS += -DESMFVERSIONGIT='"$(ESMF_VERSION_STRING_GIT)"'
710+
ESMF_CPPFLAGS += -DESMF_VERSION_STRING_GIT='"$(ESMF_VERSION_STRING_GIT)"'
711711
endif
712712

713713
#-------------------------------------------------------------------------------

‎build/doc/user_arch.tex‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
combinations of environment variable settings used by the ESMF
88
build system. The exact configurations tested for this release
99
are available online in the Supported Platform Table:
10-
\htmladdnormallink{http://earthsystemmodeling.org/release/platforms\_8\_1\_0}
11-
{http://earthsystemmodeling.org/release/platforms_8_1_0}.
10+
\htmladdnormallink{http://earthsystemmodeling.org/release/platforms\_8\_2\_0}
11+
{http://earthsystemmodeling.org/release/platforms_8_2_0}.
1212

1313
All possible combinations of {\tt ESMF\_OS}, {\tt ESMF\_COMPILER}, {\tt ESMF\_COMM},
1414
and {\tt ESMF\_ABI} build environment variables are listed in the following table.
@@ -67,6 +67,10 @@
6767
Linux &\tt lahey &\footnotesize \tt {\bf mpiuni},mpich,mpich2,mpich3,mvapich2,lam,openmpi,user &\tt 32, 64 \\
6868
Linux &\tt nag &\footnotesize \tt {\bf mpiuni},mpich,mpich2,mpich3,mvapich2,lam,openmpi,user &\tt 32, 64 \\
6969
Linux &\tt nagintel &\footnotesize \tt {\bf mpiuni},mpich,mpich2,mpich3,lam,openmpi,user &\tt 32, 64 \\
70+
Linux &\tt nvhpc &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich2,mpich3,mvapich,mvapich2 &\tt 32, 64, \\
71+
& &\footnotesize \tt intelmpi,openmpi,user &\tt x86\_64\_32, \\
72+
& & &\tt x86\_64\_small, \\
73+
& & &\tt x86\_64\_medium \\
7074
Linux &\tt pathscale &\footnotesize \tt {\bf mpiuni},mpich,mpich2,mpich3,lam,openmpi,user &\tt 32, 64, \\
7175
& & &\tt x86\_64\_32, \\
7276
& & &\tt x86\_64\_small, \\

‎build_config/Darwin.gfortran.default/build_rules.mk‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,6 @@ ifneq ($(ESMF_CLANGSTR), clang)
118118
ESMF_CXXOPTFLAG_G += -Wall -Wextra -Wno-unused
119119
endif
120120

121-
############################################################
122-
# Gfortran runtime library on Darwin does not currently seem thread-safe
123-
#
124-
ESMF_PTHREADS := OFF
125-
126121
############################################################
127122
# Fortran symbol convention
128123
#

‎build_config/Darwin.nag.default/build_rules.mk‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,12 @@ ESMF_CLANGSTR := $(findstring clang, $(shell $(ESMF_CXXCOMPILER) --version))
115115
# (e.g., ABORT) are made.
116116
ESMF_F90COMPILEOPTS += -DESMF_NAG_UNIX_MODULE
117117

118+
############################################################
119+
# Currently NAG does not support the Fortran2018 assumed type feature
120+
#
121+
ESMF_F90COMPILECPPFLAGS += -DESMF_NO_F2018ASSUMEDTYPE
122+
ESMF_CXXCOMPILECPPFLAGS += -DESMF_NO_F2018ASSUMEDTYPE
123+
118124
############################################################
119125
# nag currently does not support OpenMP
120126
#

‎build_config/Darwin.pgi.default/build_rules.mk‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,12 @@ ESMF_PGIVERSION_PATCH = $(shell $(ESMF_DIR)/scripts/version.pgi 3 $(ESMF_F90COMP
134134
ESMF_F90COMPILECPPFLAGS += -DESMF_PGIVERSION_PATCH=$(ESMF_PGIVERSION_PATCH)
135135
ESMF_CXXCOMPILECPPFLAGS += -DESMF_PGIVERSION_PATCH=$(ESMF_PGIVERSION_PATCH)
136136

137+
############################################################
138+
# Currently PGI does not support the Fortran2018 assumed type feature
139+
#
140+
ESMF_F90COMPILECPPFLAGS += -DESMF_NO_F2018ASSUMEDTYPE
141+
ESMF_CXXCOMPILECPPFLAGS += -DESMF_NO_F2018ASSUMEDTYPE
142+
137143
############################################################
138144
# Construct the ABISTRING
139145
#

‎build_config/Linux.nvhpc.default/ESMC_Conf.h‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#ifdef ESMC_RCS_HEADER
2+
"$Id$"
3+
"Defines the configuration for this machine"
4+
#endif
5+
6+
#if 0
7+
Earth System Modeling Framework
8+
Copyright 2002-2021, University Corporation for Atmospheric Research,
9+
Massachusetts Institute of Technology, Geophysical Fluid Dynamics
10+
Laboratory, University of Michigan, National Centers for Environmental
11+
Prediction, Los Alamos National Laboratory, Argonne National Laboratory,
12+
NASA Goddard Space Flight Center.
13+
Licensed under the University of Illinois-NCSA License.
14+
#endif
15+
16+
#if !defined(INCLUDED_CONF_H)
17+
#define INCLUDED_CONF_H
18+
19+
#define PARCH_linux
20+
21+
#define FTN_X(func) func##_
22+
#define FTNX(func) func##_
23+
24+
#if defined (__cplusplus)
25+
// Typedef to match the data type of the 'hidden' string length
26+
// argument that Fortran uses when passing CHARACTER strings.
27+
#include <cstddef>
28+
typedef size_t ESMCI_FortranStrLenArg;
29+
#endif
30+
31+
#define ESMC_PRESENT(arg) ( (arg) != 0 )
32+
33+
#endif

0 commit comments

Comments
 (0)