Skip to content

Commit ec5f186

Browse files
theurichtheurich
committed
Merge branch 'release/8.6.0' into main
2 parents 5d4f093 + 658ac7a commit ec5f186

File tree

405 files changed

+19292
-4993
lines changed

Some content is hidden

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

405 files changed

+19292
-4993
lines changed

‎.github/workflows/api-change.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
tag1:
77
description: 'First ESMF Tag'
88
required: true
9-
default: 'v8.3.0'
9+
default: 'v8.5.0'
1010
tag2:
1111
description: 'Second ESMF Tag'
1212
required: true

‎.github/workflows/build-esmf-docs.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ jobs:
4646
uses: actions/checkout@v3
4747
with:
4848
repository: esmf-org/esmf-org.github.io
49-
path: esmf-org.github.io
50-
token: ${{ secrets.ESMF_WEB_TOKEN }}
49+
path: ${{github.workspace}}/esmf-org.github.io
50+
ssh-key: ${{secrets.ESMF_WEB_DEPLOY_KEY}}
5151

5252
- name: Copy docs
5353
run: |
@@ -66,10 +66,10 @@ jobs:
6666
cp -rf ./dev_guide/dev_guide/* ${{ github.workspace }}/esmf-org.github.io/docs/nightly/${{ github.ref_name }}/dev_guide/
6767
6868
- name: Commit and publish docs
69-
uses: actions-js/push@master
70-
with:
71-
repository: esmf-org/esmf-org.github.io
72-
directory: ${{ github.workspace }}/esmf-org.github.io
73-
branch: master
74-
github_token: ${{ secrets.ESMF_WEB_TOKEN }}
75-
message: 'Publish ESMF Docs'
69+
run: |
70+
cd ${{ github.workspace }}/esmf-org.github.io
71+
git config user.name "github-actions[bot]"
72+
git config user.email "github-actions[bot]@users.noreply.github.com"
73+
git add .
74+
git diff-index --quiet HEAD || git commit --message "Publish ESMF Docs"
75+
git push origin

‎.github/workflows/build-esmpy-docs.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ jobs:
4141
with:
4242
name: esmpy-docs
4343
path: ${{ github.workspace }}/artifacts
44-
44+
4545
- name: Checkout esmpy_doc
4646
uses: actions/checkout@v3
4747
with:
4848
repository: esmf-org/esmpy_doc
49-
path: esmpy_doc
50-
token: ${{ secrets.ESMF_WEB_TOKEN }}
49+
path: ${{github.workspace}}/esmpy_doc
50+
ssh-key: ${{secrets.ESMPY_WEB_DEPLOY_KEY}}
5151

5252
- name: Copy docs
5353
run: |
@@ -60,10 +60,10 @@ jobs:
6060
cp -rf latex/ESMPy.pdf ${{ github.workspace }}/esmpy_doc/docs/nightly/${{ github.ref_name }}/
6161
6262
- name: Commit and publish docs
63-
uses: actions-js/push@master
64-
with:
65-
repository: esmf-org/esmpy_doc
66-
directory: ${{ github.workspace }}/esmpy_doc
67-
branch: master
68-
github_token: ${{ secrets.ESMF_WEB_TOKEN }}
69-
message: 'Publish ESMPy Docs'
63+
run: |
64+
cd ${{ github.workspace }}/esmpy_doc
65+
git config user.name "github-actions[bot]"
66+
git config user.email "github-actions[bot]@users.noreply.github.com"
67+
git add .
68+
git diff-index --quiet HEAD || git commit --message "Publish ESMPy Docs"
69+
git push origin

‎.github/workflows/scripts/spack_concretize.sh

+23
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,29 @@ if [[ "$comp" == *"oneapi"* ]]; then
134134
echo "::endgroup::"
135135
fi
136136

137+
# check given gcc compiler is found or not? If not, use newer version
138+
if [[ "$comp" == *"gcc"* ]]; then
139+
echo "::group::Check gcc compiler"
140+
comp_str=${comp/@/@=}
141+
str=`echo $comp_str | awk -F\@ '{print $1}'`
142+
comp_ver=`grep -ir "${str}@=" ~/.spack/linux/compilers.yaml | tr -d "spec: ${str}@=" | sort -n | tail -n 1`
143+
144+
use_latest=0
145+
if [[ "$comp" == *"gcc@latest"* ]]; then
146+
echo "The gcc@latest is set. Trying to find latest available gcc compiler ..."
147+
use_latest=1
148+
elif [ -z "$(cat ~/.spack/linux/compilers.yaml | grep $comp_str)" ]; then
149+
echo "Given compiler ($comp) is not found! Exiting ..."
150+
exit 1
151+
fi
152+
153+
if [[ $use_latest == 1 ]]; then
154+
comp="${str}@$comp_ver"
155+
fi
156+
echo "Using $comp gnu compiler."
157+
echo "::endgroup::"
158+
fi
159+
137160
# create spack.yaml
138161
echo "::group::Create spack.yaml"
139162
echo "spack:" > spack.yaml

‎.github/workflows/test-build-spack.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
name: Build ESMF Using Spack
22

33
env:
4-
compiler: gcc@11.3.0
4+
compiler: gcc@latest
55
esmf_version: 'esmf@develop'
66
nuopc_app_version: 'develop'
77

88
on:
99
workflow_dispatch:
1010
inputs:
11+
compiler:
12+
description: 'Compiler version like gcc@12.3.0 or gcc@latest (latest available version on runner)'
13+
required: false
14+
type: string
15+
default: 'gcc@latest'
1116
esmf_version:
1217
description: 'ESMF version or tag like esmf@develop or esmf@=8.5.0b23'
1318
required: false
@@ -39,7 +44,11 @@ jobs:
3944
echo "ENV : >${{ env.esmf_version }}< >${{ env.nuopc_app_version }}<"
4045
4146
# create matrix JSON file
42-
str1="{\"compiler\": [\"${{ env.compiler }}\"],"
47+
if [ -z "${{ inputs.compiler }}" ]; then
48+
str1="{\"compiler\": [\"${{ env.compiler }}\"],"
49+
else
50+
str1="{\"compiler\": [\"${{ inputs.compiler }}\"],"
51+
fi
4352
if [ -z "${{ inputs.esmf_version }}" ]; then
4453
str2="\"esmf\": [\"${{ env.esmf_version }}+external-parallelio\", \"${{ env.esmf_version }}~external-parallelio\"]}"
4554
echo "nuopc_app_version=${{ env.nuopc_app_version }}" >> $GITHUB_OUTPUT

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ PET*.ESMF_LogFile
1212
# esmf build generated directories #
1313
####################################
1414
/DEFAULTINSTALLDIR/
15+
/apps/
1516
/lib/
1617
/mod/
1718
/obj/

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Pre-built binaries for ESMF and ESMPy are available through a number of channels
3232
```
3333
docker run -it --rm esmf/esmf-build-release:latest
3434
```
35-
Replace `latest` in the above command with a valid version, like `8.5.0`, in order to access a specific ESMF version.
35+
Replace `latest` in the above command with a valid version, like `8.6.0`, in order to access a specific ESMF version.
3636

3737
* [Anaconda Conda-Forge](https://anaconda.org/conda-forge/): Under [conda-forge/esmpy](https://anaconda.org/conda-forge/esmpy). To install locally (_note Windows is not supported_), run:
3838
```

‎build/common.mk

+70-5
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,10 @@ ifndef ESMF_TRACE_LIB_BUILD
215215
export ESMF_TRACE_LIB_BUILD = default
216216
endif
217217

218+
ifndef ESMF_TRACE_PRELOAD_LINKED
219+
export ESMF_TRACE_PRELOAD_LINKED = default
220+
endif
221+
218222
ifndef ESMF_FORTRANSYMBOLS
219223
export ESMF_FORTRANSYMBOLS = default
220224
endif
@@ -445,6 +449,10 @@ ifneq ($(ESMF_TRACE_LIB_BUILD),OFF)
445449
export ESMF_TRACE_LIB_BUILD = ON
446450
endif
447451

452+
ifneq ($(ESMF_TRACE_PRELOAD_LINKED),ON)
453+
export ESMF_TRACE_PRELOAD_LINKED = OFF
454+
endif
455+
448456
ifneq ($(ESMF_TESTCOMPTUNNEL),OFF)
449457
export ESMF_TESTCOMPTUNNEL = ON
450458
endif
@@ -987,6 +995,7 @@ ESMF_F90LINKLIBS = $(ESMF_F90LINKLIBS_ENV)
987995
endif
988996
ESMF_F90LINKLIBS +=
989997
ESMF_F90ESMFLINKLIBS += -lesmf $(ESMF_F90LINKLIBS)
998+
ESMF_F90ESMFPRELOADLINKLIBS += -lesmf $(ESMF_TRACE_DYNAMICLINKLIBS) $(ESMF_F90LINKLIBS)
990999

9911000
# - CXXLINKER
9921001
ifneq ($(origin ESMF_CXXLINKER), environment)
@@ -1794,6 +1803,38 @@ ESMF_F90LINKRPATHSTHIRD += $(ESMF_F90RPATHPREFIX)$(ESMF_BABELTRACE_LIBPATH)
17941803
endif
17951804
endif
17961805

1806+
#-------------------------------------------------------------------------------
1807+
# NVML
1808+
#-------------------------------------------------------------------------------
1809+
ifeq ($(ESMF_NVML),ON)
1810+
ESMF_NVML = standard
1811+
endif
1812+
ifeq ($(ESMF_NVML),standard)
1813+
ifneq ($(origin ESMF_NVML_LIBS), environment)
1814+
ESMF_NVML_LIBS = -lnvidia-ml
1815+
endif
1816+
endif
1817+
1818+
ifdef ESMF_NVML
1819+
ESMF_CPPFLAGS += -DESMF_NVML=1
1820+
ifdef ESMF_NVML_INCLUDE
1821+
ESMF_CXXCOMPILEPATHSTHIRD += -I$(ESMF_NVML_INCLUDE)
1822+
ESMF_F90COMPILEPATHSTHIRD += -I$(ESMF_NVML_INCLUDE)
1823+
endif
1824+
ifdef ESMF_NVML_LIBS
1825+
ESMF_CXXLINKLIBS += $(ESMF_NVML_LIBS)
1826+
ESMF_CXXLINKRPATHSTHIRD += $(addprefix $(ESMF_CXXRPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_NVML_LIBS))))
1827+
ESMF_F90LINKLIBS += $(ESMF_NVML_LIBS)
1828+
ESMF_F90LINKRPATHSTHIRD += $(addprefix $(ESMF_F90RPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_NVML_LIBS))))
1829+
endif
1830+
ifdef ESMF_NVML_LIBPATH
1831+
ESMF_CXXLINKPATHSTHIRD += -L$(ESMF_NVML_LIBPATH)
1832+
ESMF_F90LINKPATHSTHIRD += -L$(ESMF_NVML_LIBPATH)
1833+
ESMF_CXXLINKRPATHSTHIRD += $(ESMF_CXXRPATHPREFIX)$(ESMF_NVML_LIBPATH)
1834+
ESMF_F90LINKRPATHSTHIRD += $(ESMF_F90RPATHPREFIX)$(ESMF_NVML_LIBPATH)
1835+
endif
1836+
endif
1837+
17971838
#-------------------------------------------------------------------------------
17981839
# Set the correct MPIRUN command with appropriate options
17991840
#-------------------------------------------------------------------------------
@@ -1820,7 +1861,11 @@ ifeq ($(ESMF_OPENMP),OFF)
18201861
ESMF_CPPFLAGS += -DESMF_NO_OPENMP
18211862
endif
18221863

1823-
ifeq ($(ESMF_OPENMP),ON)
1864+
ifeq ($(ESMF_OPENMP),OMP4)
1865+
ESMF_CPPFLAGS += -DESMF_OPENMP4
1866+
endif
1867+
1868+
ifneq ($(ESMF_OPENMP),OFF)
18241869
ESMF_F90COMPILEOPTS += $(ESMF_OPENMP_F90COMPILEOPTS)
18251870
ESMF_F90LINKOPTS += $(ESMF_OPENMP_F90LINKOPTS)
18261871
ESMF_CXXCOMPILEOPTS += $(ESMF_OPENMP_CXXCOMPILEOPTS)
@@ -1986,32 +2031,52 @@ ifeq ($(ESMF_TRACE_BUILD_SHARED),ON)
19862031
ESMF_TRACE_LDPRELOAD := $(ESMF_LIBDIR)/libesmftrace_preload.$(ESMF_SL_SUFFIX)
19872032
ESMF_PRELOADSCRIPT = $(ESMF_LIBDIR)/preload.sh
19882033

1989-
ifneq ($(ESMF_OS),Darwin)
1990-
ESMF_ENV_PRELOAD = LD_PRELOAD
2034+
ESMF_SL_PRELOAD_LIBLINKER = $(ESMF_CXXCOMPILER)
2035+
2036+
ifeq ($(ESMF_OS),Darwin)
2037+
ESMF_ENV_PRELOAD = DYLD_INSERT_LIBRARIES
2038+
ESMF_ENV_PRELOAD_DELIMIT = ':'
2039+
ifeq ($(ESMF_COMM),openmpi)
2040+
# make sure to link in the Fortran MPI bindings
2041+
ESMF_SL_PRELOAD_LIBLINKER = $(ESMF_F90COMPILER)
2042+
endif
19912043
else
1992-
ESMF_ENV_PRELOAD = DYLD_INSERT_LIBRARIES
2044+
ESMF_ENV_PRELOAD = LD_PRELOAD
2045+
ESMF_ENV_PRELOAD_DELIMIT = ' '
19932046
endif
19942047

19952048
# MPI implementations do not pick up LD_PRELOAD
19962049
# so we pass a small script to each MPI task
19972050
ifneq (,$(findstring mpich,$(ESMF_COMM)))
19982051
ESMF_PRELOAD_SH = $(ESMF_PRELOADSCRIPT)
19992052
endif
2053+
ifeq ($(ESMF_COMM),openmpi)
2054+
ESMF_PRELOAD_SH = $(ESMF_PRELOADSCRIPT)
2055+
endif
20002056
ifeq ($(ESMF_COMM),mpi)
20012057
ESMF_PRELOAD_SH = $(ESMF_PRELOADSCRIPT)
20022058
endif
20032059
ifeq ($(ESMF_COMM),mpt)
20042060
ESMF_PRELOAD_SH = $(ESMF_PRELOADSCRIPT)
20052061
endif
2062+
ifneq (,$(findstring srun,$(ESMF_MPIRUN)))
2063+
ESMF_PRELOAD_SH = $(ESMF_PRELOADSCRIPT)
2064+
endif
20062065

20072066
endif
20082067

20092068
build_preload_script:
20102069
-@echo "#!/bin/sh" > $(ESMF_PRELOADDIR)/preload.sh
20112070
-@echo "# Script to preload ESMF dynamic trace library" >> $(ESMF_PRELOADDIR)/preload.sh
2012-
-@echo 'env LD_PRELOAD="$$LD_PRELOAD $(ESMF_PRELOADDIR)/libesmftrace_preload.$(ESMF_SL_SUFFIX)" $$*' >> $(ESMF_PRELOADDIR)/preload.sh
2071+
-@echo 'if [ "$$$(ESMF_ENV_PRELOAD)" != "" ]; then' >> $(ESMF_PRELOADDIR)/preload.sh
2072+
-@echo 'env $(ESMF_ENV_PRELOAD)="$$$(ESMF_ENV_PRELOAD)$(ESMF_ENV_PRELOAD_DELIMIT)$(ESMF_PRELOADDIR)/libesmftrace_preload.$(ESMF_SL_SUFFIX)" $$*' >> $(ESMF_PRELOADDIR)/preload.sh
2073+
-@echo 'else' >> $(ESMF_PRELOADDIR)/preload.sh
2074+
-@echo 'env $(ESMF_ENV_PRELOAD)="$(ESMF_PRELOADDIR)/libesmftrace_preload.$(ESMF_SL_SUFFIX)" $$*' >> $(ESMF_PRELOADDIR)/preload.sh
2075+
-@echo 'fi' >> $(ESMF_PRELOADDIR)/preload.sh
20132076
chmod 755 $(ESMF_PRELOADDIR)/preload.sh
20142077

2078+
ESMF_TRACE_DYNAMICLINKLIBS := -lesmftrace_preload
2079+
20152080
ESMF_TRACE_STATICLINKLIBS := -lesmftrace_static
20162081

20172082
ESMF_TRACE_WRAPPERS_IO := write writev pwrite read open

‎build_config/Cygwin.g95.default/build_rules.mk

-6
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ ESMF_F90LINKLIBS += -lpmpich -lmpich
3434
ESMF_CXXDEFAULT = mpiCC
3535
ESMF_CDEFAULT = mpicc
3636
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
37-
ESMF_F90COMPILECPPFLAGS+= -DESMF_NO_MPI3
38-
ESMF_CXXCOMPILECPPFLAGS+= -DESMF_NO_MPI3
3937
else
4038
ifeq ($(ESMF_COMM),mpich2)
4139
# Mpich2 ---------------------------------------------------
@@ -44,8 +42,6 @@ ESMF_CXXDEFAULT = mpicxx
4442
ESMF_CDEFAULT = mpicc
4543
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
4644
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
47-
ESMF_F90COMPILECPPFLAGS+= -DESMF_NO_MPI3
48-
ESMF_CXXCOMPILECPPFLAGS+= -DESMF_NO_MPI3
4945
else
5046
ifeq ($(ESMF_COMM),mpich)
5147
# Mpich3 and up --------------------------------------------
@@ -63,8 +59,6 @@ ESMF_CXXDEFAULT = mpic++
6359
ESMF_CDEFAULT = mpicc
6460
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
6561
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
66-
ESMF_F90COMPILECPPFLAGS+= -DESMF_NO_MPI3
67-
ESMF_CXXCOMPILECPPFLAGS+= -DESMF_NO_MPI3
6862
else
6963
ifeq ($(ESMF_COMM),openmpi)
7064
# OpenMPI --------------------------------------------------

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

-6
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ ESMF_F90LINKLIBS += -lpmpich -lmpich
3434
ESMF_CXXDEFAULT = mpiCC
3535
ESMF_CDEFAULT = mpicc
3636
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
37-
ESMF_F90COMPILECPPFLAGS+= -DESMF_NO_MPI3
38-
ESMF_CXXCOMPILECPPFLAGS+= -DESMF_NO_MPI3
3937
else
4038
ifeq ($(ESMF_COMM),mpich2)
4139
# Mpich2 ---------------------------------------------------
@@ -44,8 +42,6 @@ ESMF_CXXDEFAULT = mpicxx
4442
ESMF_CDEFAULT = mpicc
4543
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
4644
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
47-
ESMF_F90COMPILECPPFLAGS+= -DESMF_NO_MPI3
48-
ESMF_CXXCOMPILECPPFLAGS+= -DESMF_NO_MPI3
4945
else
5046
ifeq ($(ESMF_COMM),mpich)
5147
# Mpich3 and up --------------------------------------------
@@ -63,8 +59,6 @@ ESMF_CXXDEFAULT = mpic++
6359
ESMF_CDEFAULT = mpicc
6460
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
6561
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
66-
ESMF_F90COMPILECPPFLAGS+= -DESMF_NO_MPI3
67-
ESMF_CXXCOMPILECPPFLAGS+= -DESMF_NO_MPI3
6862
else
6963
ifeq ($(ESMF_COMM),msmpi)
7064
# Microsofts version of MPICH2 on CCS 2003 is generally at:

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

-6
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ ESMF_F90DEFAULT = mpif90
3333
ESMF_CXXDEFAULT = mpiCC
3434
ESMF_CDEFAULT = mpicc
3535
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
36-
ESMF_F90COMPILECPPFLAGS+= -DESMF_NO_MPI3
37-
ESMF_CXXCOMPILECPPFLAGS+= -DESMF_NO_MPI3
3836
else
3937
ifeq ($(ESMF_COMM),mpich2)
4038
# Mpich2 ---------------------------------------------------
@@ -43,8 +41,6 @@ ESMF_CXXDEFAULT = mpicxx
4341
ESMF_CDEFAULT = mpicc
4442
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
4543
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
46-
ESMF_F90COMPILECPPFLAGS+= -DESMF_NO_MPI3
47-
ESMF_CXXCOMPILECPPFLAGS+= -DESMF_NO_MPI3
4844
else
4945
ifeq ($(ESMF_COMM),mpich)
5046
# Mpich3 and up --------------------------------------------
@@ -71,8 +67,6 @@ ESMF_CXXDEFAULT = mpic++
7167
ESMF_CDEFAULT = mpicc
7268
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
7369
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
74-
ESMF_F90COMPILECPPFLAGS+= -DESMF_NO_MPI3
75-
ESMF_CXXCOMPILECPPFLAGS+= -DESMF_NO_MPI3
7670
else
7771
ifeq ($(ESMF_COMM),openmpi)
7872
# OpenMPI --------------------------------------------------

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

-6
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ ESMF_F90LINKLIBS += -lpmpich++ -lmpich
3434
ESMF_CXXDEFAULT = mpicxx
3535
ESMF_CDEFAULT = mpicc
3636
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
37-
ESMF_F90COMPILECPPFLAGS+= -DESMF_NO_MPI3
38-
ESMF_CXXCOMPILECPPFLAGS+= -DESMF_NO_MPI3
3937
else
4038
ifeq ($(ESMF_COMM),mpich2)
4139
# Mpich2 ---------------------------------------------------
@@ -44,8 +42,6 @@ ESMF_CXXDEFAULT = mpicxx
4442
ESMF_CDEFAULT = mpicc
4543
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
4644
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
47-
ESMF_F90COMPILECPPFLAGS+= -DESMF_NO_MPI3
48-
ESMF_CXXCOMPILECPPFLAGS+= -DESMF_NO_MPI3
4945
else
5046
ifeq ($(ESMF_COMM),mpich)
5147
# Mpich3 and up --------------------------------------------
@@ -72,8 +68,6 @@ ESMF_CXXDEFAULT = mpic++
7268
ESMF_CDEFAULT = mpicc
7369
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
7470
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
75-
ESMF_F90COMPILECPPFLAGS+= -DESMF_NO_MPI3
76-
ESMF_CXXCOMPILECPPFLAGS+= -DESMF_NO_MPI3
7771
else
7872
ifeq ($(ESMF_COMM),openmpi)
7973
# OpenMPI --------------------------------------------------

0 commit comments

Comments
 (0)