Skip to content

Commit cc31a23

Browse files
theurichtheurich
committed
Merge branch 'release/8.8.0' into main
2 parents 6595fe6 + c5a1114 commit cc31a23

File tree

163 files changed

+12375
-3928
lines changed

Some content is hidden

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

163 files changed

+12375
-3928
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.6.0'
9+
default: 'v8.7.0'
1010
tag2:
1111
description: 'Second ESMF Tag'
1212
required: true

‎.github/workflows/development-tests.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ jobs:
7575
sudo apt-get -qq update
7676
sudo apt install -qq -y autoconf automake libtool
7777
elif [[ "${{matrix.config.osys}}" == "macos-"* ]]; then
78+
sudo systemsetup -setusingnetworktime off
79+
sudo rm -rf /etc/ntp.conf
7880
brew install autoconf automake libtool
7981
brew unlink libevent || true
8082
fi
@@ -146,7 +148,7 @@ jobs:
146148
if: matrix.config.comm == 'openmpi'
147149
run: |
148150
if [[ "$CACHE_HIT" != 'true' ]]; then
149-
OPENMPI_URL="https://download.open-mpi.org/release/open-mpi/v5.0/openmpi-5.0.5.tar.gz"
151+
OPENMPI_URL="https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.6.tar.gz"
150152
mkdir ${{runner.temp}}/openmpi
151153
cd ${{runner.temp}}/openmpi
152154
curl -L $OPENMPI_URL | tar --strip-components=1 -xz

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.11205526.svg)](https://doi.org/10.5281/zenodo.11205526)
88

9-
>Copyright (c) 2002-2024 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. All rights reserved.
9+
>Copyright (c) 2002-2025 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. All rights reserved.
1010
1111
Hello and welcome to ESMF.
1212

@@ -34,7 +34,7 @@ Pre-built binaries for ESMF and ESMPy are available through a number of channels
3434
```
3535
docker run -it --rm esmf/esmf-build-release:latest
3636
```
37-
Replace `latest` in the above command with a valid version, like `8.7.0`, in order to access a specific ESMF version.
37+
Replace `latest` in the above command with a valid version, like `8.8.0`, in order to access a specific ESMF version.
3838

3939
* [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:
4040
```

‎build/common.mk

+28-28
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,7 @@ endif
10141014
ifeq ($(origin ESMF_F90LINKLIBS_ENV), environment)
10151015
ESMF_F90LINKLIBS = $(ESMF_F90LINKLIBS_ENV)
10161016
endif
1017-
ESMF_F90LINKLIBS +=
1017+
ESMF_F90LINKLIBS += $(ESMF_F90LINKLIBSTHIRD)
10181018
ESMF_F90ESMFLINKLIBS += -lesmf $(ESMF_F90LINKLIBS)
10191019
ESMF_F90ESMFPRELOADLINKLIBS += -lesmf $(ESMF_TRACE_DYNAMICLINKLIBS) $(ESMF_F90LINKLIBS)
10201020

@@ -1068,7 +1068,7 @@ endif
10681068
ifeq ($(origin ESMF_CXXLINKLIBS_ENV), environment)
10691069
ESMF_CXXLINKLIBS = $(ESMF_CXXLINKLIBS_ENV)
10701070
endif
1071-
ESMF_CXXLINKLIBS +=
1071+
ESMF_CXXLINKLIBS += $(ESMF_CXXLINKLIBSTHIRD)
10721072
ESMF_CXXESMFLINKLIBS += -lesmf $(ESMF_CXXLINKLIBS)
10731073

10741074
# - CLINKER
@@ -1331,9 +1331,9 @@ ESMF_CXXCOMPILEPATHSTHIRD += -I$(ESMF_MOAB_INCLUDE)
13311331
ESMF_F90COMPILEPATHSTHIRD += -I$(ESMF_MOAB_INCLUDE)
13321332
endif
13331333
ifdef ESMF_MOAB_LIBS
1334-
ESMF_CXXLINKLIBS += $(ESMF_MOAB_LIBS)
1334+
ESMF_CXXLINKLIBSTHIRD += $(ESMF_MOAB_LIBS)
13351335
ESMF_CXXLINKRPATHSTHIRD += $(addprefix $(ESMF_CXXRPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_MOAB_LIBS))))
1336-
ESMF_F90LINKLIBS += $(ESMF_MOAB_LIBS)
1336+
ESMF_F90LINKLIBSTHIRD += $(ESMF_MOAB_LIBS)
13371337
ESMF_F90LINKRPATHSTHIRD += $(addprefix $(ESMF_F90RPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_MOAB_LIBS))))
13381338
endif
13391339
ifdef ESMF_MOAB_LIBPATH
@@ -1400,9 +1400,9 @@ ifdef ESMF_LAPACK_INTERNAL
14001400
ESMF_CPPFLAGS += -DESMF_LAPACK_INTERNAL=1
14011401
endif
14021402
ifdef ESMF_LAPACK_LIBS
1403-
ESMF_CXXLINKLIBS += $(ESMF_LAPACK_LIBS)
1403+
ESMF_CXXLINKLIBSTHIRD += $(ESMF_LAPACK_LIBS)
14041404
ESMF_CXXLINKRPATHSTHIRD += $(addprefix $(ESMF_CXXRPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_LAPACK_LIBS))))
1405-
ESMF_F90LINKLIBS += $(ESMF_LAPACK_LIBS)
1405+
ESMF_F90LINKLIBSTHIRD += $(ESMF_LAPACK_LIBS)
14061406
ESMF_F90LINKRPATHSTHIRD += $(addprefix $(ESMF_F90RPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_LAPACK_LIBS))))
14071407
endif
14081408
ifdef ESMF_LAPACK_LIBPATH
@@ -1446,9 +1446,9 @@ ESMF_CXXCOMPILEPATHSTHIRD += -I$(ESMF_ACC_SOFTWARE_STACK_INCLUDE)
14461446
ESMF_F90COMPILEPATHSTHIRD += -I$(ESMF_ACC_SOFTWARE_STACK_INCLUDE)
14471447
endif
14481448
ifdef ESMF_ACC_SOFTWARE_STACK_LIBS
1449-
ESMF_CXXLINKLIBS += $(ESMF_ACC_SOFTWARE_STACK_LIBS)
1449+
ESMF_CXXLINKLIBSTHIRD += $(ESMF_ACC_SOFTWARE_STACK_LIBS)
14501450
ESMF_CXXLINKRPATHSTHIRD += $(addprefix $(ESMF_CXXRPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_ACC_SOFTWARE_STACK_LIBS))))
1451-
ESMF_F90LINKLIBS += $(ESMF_ACC_SOFTWARE_STACK_LIBS)
1451+
ESMF_F90LINKLIBSTHIRD += $(ESMF_ACC_SOFTWARE_STACK_LIBS)
14521452
ESMF_F90LINKRPATHSTHIRD += $(addprefix $(ESMF_F90RPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_ACC_SOFTWARE_STACK_LIBS))))
14531453
endif
14541454
ifdef ESMF_ACC_SOFTWARE_STACK_LIBPATH
@@ -1580,12 +1580,12 @@ ifdef ESMF_NETCDF
15801580
ESMF_F90COMPILEPATHSTHIRD += -I$(ESMF_NETCDFF_INCLUDE)
15811581
endif
15821582
ifdef ESMF_NETCDF_LIBS
1583-
ESMF_CXXLINKLIBS += $(ESMF_NETCDF_LIBS)
1584-
ESMF_F90LINKLIBS += $(ESMF_NETCDF_LIBS)
1583+
ESMF_CXXLINKLIBSTHIRD += $(ESMF_NETCDF_LIBS)
1584+
ESMF_F90LINKLIBSTHIRD += $(ESMF_NETCDF_LIBS)
15851585
endif
15861586
ifdef ESMF_NETCDFF_LIBS
1587-
ESMF_CXXLINKLIBS += $(ESMF_NETCDFF_LIBS)
1588-
ESMF_F90LINKLIBS += $(ESMF_NETCDFF_LIBS)
1587+
ESMF_CXXLINKLIBSTHIRD += $(ESMF_NETCDFF_LIBS)
1588+
ESMF_F90LINKLIBSTHIRD += $(ESMF_NETCDFF_LIBS)
15891589
endif
15901590
ifdef ESMF_NETCDF_LIBPATH
15911591
ESMF_CXXLINKPATHSTHIRD += $(addprefix -L,$(ESMF_NETCDF_LIBPATH))
@@ -1623,9 +1623,9 @@ ESMF_CXXCOMPILEPATHSTHIRD += -I$(ESMF_PNETCDF_INCLUDE)
16231623
ESMF_F90COMPILEPATHSTHIRD += -I$(ESMF_PNETCDF_INCLUDE)
16241624
endif
16251625
ifdef ESMF_PNETCDF_LIBS
1626-
ESMF_CXXLINKLIBS += $(ESMF_PNETCDF_LIBS)
1626+
ESMF_CXXLINKLIBSTHIRD += $(ESMF_PNETCDF_LIBS)
16271627
ESMF_CXXLINKRPATHSTHIRD += $(addprefix $(ESMF_CXXRPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_PNETCDF_LIBS))))
1628-
ESMF_F90LINKLIBS += $(ESMF_PNETCDF_LIBS)
1628+
ESMF_F90LINKLIBSTHIRD += $(ESMF_PNETCDF_LIBS)
16291629
ESMF_F90LINKRPATHSTHIRD += $(addprefix $(ESMF_F90RPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_PNETCDF_LIBS))))
16301630
endif
16311631
ifdef ESMF_PNETCDF_LIBPATH
@@ -1652,9 +1652,9 @@ ESMF_CXXCOMPILEPATHSTHIRD += -I$(ESMF_XERCES_INCLUDE)
16521652
ESMF_F90COMPILEPATHSTHIRD += -I$(ESMF_XERCES_INCLUDE)
16531653
endif
16541654
ifdef ESMF_XERCES_LIBS
1655-
ESMF_CXXLINKLIBS += $(ESMF_XERCES_LIBS)
1655+
ESMF_CXXLINKLIBSTHIRD += $(ESMF_XERCES_LIBS)
16561656
ESMF_CXXLINKRPATHSTHIRD += $(addprefix $(ESMF_CXXRPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_XERCES_LIBS))))
1657-
ESMF_F90LINKLIBS += $(ESMF_XERCES_LIBS)
1657+
ESMF_F90LINKLIBSTHIRD += $(ESMF_XERCES_LIBS)
16581658
ESMF_F90LINKRPATHSTHIRD += $(addprefix $(ESMF_F90RPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_XERCES_LIBS))))
16591659
endif
16601660
ifdef ESMF_XERCES_LIBPATH
@@ -1690,9 +1690,9 @@ ESMF_CXXCOMPILEPATHSTHIRD += -I$(ESMF_YAMLCPP_INCLUDE)
16901690
ESMF_F90COMPILEPATHSTHIRD += -I$(ESMF_YAMLCPP_INCLUDE)
16911691
endif
16921692
ifdef ESMF_YAMLCPP_LIBS
1693-
ESMF_CXXLINKLIBS += $(ESMF_YAMLCPP_LIBS)
1693+
ESMF_CXXLINKLIBSTHIRD += $(ESMF_YAMLCPP_LIBS)
16941694
ESMF_CXXLINKRPATHSTHIRD += $(addprefix $(ESMF_CXXRPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_YAMLCPP_LIBS))))
1695-
ESMF_F90LINKLIBS += $(ESMF_YAMLCPP_LIBS)
1695+
ESMF_F90LINKLIBSTHIRD += $(ESMF_YAMLCPP_LIBS)
16961696
ESMF_F90LINKRPATHSTHIRD += $(addprefix $(ESMF_F90RPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_YAMLCPP_LIBS))))
16971697
endif
16981698
ifdef ESMF_YAMLCPP_LIBPATH
@@ -1737,9 +1737,9 @@ ESMF_CXXCOMPILEPATHSTHIRD += -I$(ESMF_PIO_INCLUDE)
17371737
ESMF_F90COMPILEPATHSTHIRD += -I$(ESMF_PIO_INCLUDE)
17381738
endif
17391739
ifdef ESMF_PIO_LIBS
1740-
ESMF_CXXLINKLIBS += $(ESMF_PIO_LIBS)
1740+
ESMF_CXXLINKLIBSTHIRD += $(ESMF_PIO_LIBS)
17411741
ESMF_CXXLINKRPATHSTHIRD += $(addprefix $(ESMF_CXXRPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_PIO_LIBS))))
1742-
ESMF_F90LINKLIBS += $(ESMF_PIO_LIBS)
1742+
ESMF_F90LINKLIBSTHIRD += $(ESMF_PIO_LIBS)
17431743
ESMF_F90LINKRPATHSTHIRD += $(addprefix $(ESMF_F90RPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_PIO_LIBS))))
17441744
endif
17451745
ifdef ESMF_PIO_LIBPATH
@@ -1776,9 +1776,9 @@ ESMF_CXXCOMPILEPATHSTHIRD += -I$(ESMF_PROJ4_INCLUDE)
17761776
ESMF_F90COMPILEPATHSTHIRD += -I$(ESMF_PROJ4_INCLUDE)
17771777
endif
17781778
ifdef ESMF_PROJ4_LIBS
1779-
ESMF_CXXLINKLIBS += $(ESMF_PROJ4_LIBS)
1779+
ESMF_CXXLINKLIBSTHIRD += $(ESMF_PROJ4_LIBS)
17801780
ESMF_CXXLINKRPATHSTHIRD += $(addprefix $(ESMF_CXXRPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_PROJ4_LIBS))))
1781-
ESMF_F90LINKLIBS += $(ESMF_PROJ4_LIBS)
1781+
ESMF_F90LINKLIBSTHIRD += $(ESMF_PROJ4_LIBS)
17821782
ESMF_F90LINKRPATHSTHIRD += $(addprefix $(ESMF_F90RPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_PROJ4_LIBS))))
17831783
endif
17841784
ifdef ESMF_PROJ4_LIBPATH
@@ -1805,9 +1805,9 @@ ESMF_CXXCOMPILEPATHSTHIRD += -I$(ESMF_BABELTRACE_INCLUDE)
18051805
ESMF_F90COMPILEPATHSTHIRD += -I$(ESMF_BABELTRACE_INCLUDE)
18061806
endif
18071807
ifdef ESMF_BABELTRACE_LIBS
1808-
ESMF_CXXLINKLIBS += $(ESMF_BABELTRACE_LIBS)
1808+
ESMF_CXXLINKLIBSTHIRD += $(ESMF_BABELTRACE_LIBS)
18091809
ESMF_CXXLINKRPATHSTHIRD += $(addprefix $(ESMF_CXXRPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_BABELTRACE_LIBS))))
1810-
ESMF_F90LINKLIBS += $(ESMF_BABELTRACE_LIBS)
1810+
ESMF_F90LINKLIBSTHIRD += $(ESMF_BABELTRACE_LIBS)
18111811
ESMF_F90LINKRPATHSTHIRD += $(addprefix $(ESMF_F90RPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_BABELTRACE_LIBS))))
18121812
endif
18131813
ifdef ESMF_BABELTRACE_LIBPATH
@@ -1841,9 +1841,9 @@ ESMF_CXXCOMPILEPATHSTHIRD += -I$(ESMF_NUMA_INCLUDE)
18411841
ESMF_F90COMPILEPATHSTHIRD += -I$(ESMF_NUMA_INCLUDE)
18421842
endif
18431843
ifdef ESMF_NUMA_LIBS
1844-
ESMF_CXXLINKLIBS += $(ESMF_NUMA_LIBS)
1844+
ESMF_CXXLINKLIBSTHIRD += $(ESMF_NUMA_LIBS)
18451845
ESMF_CXXLINKRPATHSTHIRD += $(addprefix $(ESMF_CXXRPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_NUMA_LIBS))))
1846-
ESMF_F90LINKLIBS += $(ESMF_NUMA_LIBS)
1846+
ESMF_F90LINKLIBSTHIRD += $(ESMF_NUMA_LIBS)
18471847
ESMF_F90LINKRPATHSTHIRD += $(addprefix $(ESMF_F90RPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_NUMA_LIBS))))
18481848
endif
18491849
ifdef ESMF_NUMA_LIBPATH
@@ -1877,9 +1877,9 @@ ESMF_CXXCOMPILEPATHSTHIRD += -I$(ESMF_NVML_INCLUDE)
18771877
ESMF_F90COMPILEPATHSTHIRD += -I$(ESMF_NVML_INCLUDE)
18781878
endif
18791879
ifdef ESMF_NVML_LIBS
1880-
ESMF_CXXLINKLIBS += $(ESMF_NVML_LIBS)
1880+
ESMF_CXXLINKLIBSTHIRD += $(ESMF_NVML_LIBS)
18811881
ESMF_CXXLINKRPATHSTHIRD += $(addprefix $(ESMF_CXXRPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_NVML_LIBS))))
1882-
ESMF_F90LINKLIBS += $(ESMF_NVML_LIBS)
1882+
ESMF_F90LINKLIBSTHIRD += $(ESMF_NVML_LIBS)
18831883
ESMF_F90LINKRPATHSTHIRD += $(addprefix $(ESMF_F90RPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_NVML_LIBS))))
18841884
endif
18851885
ifdef ESMF_NVML_LIBPATH

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ ESMF_F90LINKOPTS += -march=k8 -m64 -mcmodel=medium
142142
endif
143143

144144
############################################################
145-
# Need this until the file convention is fixed (then remove these two lines)
145+
# Explicit flags for handling specific format and cpp combos
146146
#
147147
ESMF_F90COMPILEFREENOCPP = -ffree-form
148148
ESMF_F90COMPILEFIXCPP = -cpp -ffixed-form

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ ESMF_OPENMP_F90LINKOPTS += -fopenmp
150150
ESMF_OPENMP_CXXLINKOPTS += -fopenmp
151151

152152
############################################################
153-
# Need this until the file convention is fixed (then remove these two lines)
153+
# Explicit flags for handling specific format and cpp combos
154154
#
155155
ESMF_F90COMPILEFREENOCPP = -ffree-form
156156
ESMF_F90COMPILEFIXCPP = -cpp -ffixed-form

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ ESMF_CXXLINKOPTS += -pthread
178178
endif
179179

180180
############################################################
181-
# Need this until the file convention is fixed (then remove these two lines)
181+
# Explicit flags for handling specific format and cpp combos
182182
#
183183
ESMF_F90COMPILEFREENOCPP = -ffree
184184
ESMF_F90COMPILEFIXCPP = -ffixed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ ESMF_CXXLINKOPTS += -pthread
186186
endif
187187

188188
############################################################
189-
# Need this until the file convention is fixed (then remove these two lines)
189+
# Explicit flags for handling specific format and cpp combos
190190
#
191191
ESMF_F90COMPILEFREENOCPP = -ffree-form
192192
ESMF_F90COMPILEFIXCPP = -cpp -ffixed-form

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ ESMF_OPENACC_F90LINKOPTS += -fopenacc
201201
ESMF_OPENACC_CXXLINKOPTS += -fopenacc
202202

203203
############################################################
204-
# Need this until the file convention is fixed (then remove these two lines)
204+
# Explicit flags for handling specific format and cpp combos
205205
#
206206
ESMF_F90COMPILEFREENOCPP = -ffree-form
207207
ESMF_F90COMPILEFIXCPP = -cpp -ffixed-form

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ ESMF_OPENMP_F90LINKOPTS += -fopenmp
209209
ESMF_OPENMP_CXXLINKOPTS += -Xpreprocessor -fopenmp
210210

211211
############################################################
212-
# Need this until the file convention is fixed (then remove these two lines)
212+
# Explicit flags for handling specific format and cpp combos
213213
#
214214
ESMF_F90COMPILEFREENOCPP = -ffree-form
215215
ESMF_F90COMPILEFIXCPP = -cpp -ffixed-form

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ ESMF_F90LINKOPTS += -thread_safe
148148
endif
149149

150150
############################################################
151-
# Need this until the file convention is fixed (then remove these two lines)
151+
# Explicit flags for handling specific format and cpp combos
152152
#
153153
ESMF_F90COMPILEFREECPP = -free -fpp
154154
ESMF_F90COMPILEFREENOCPP = -free

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ ESMF_OPENACC_F90LINKOPTS += -acc -Minfo
214214
ESMF_OPENACC_CXXLINKOPTS += -acc -Minfo
215215

216216
############################################################
217-
# Need this until the file convention is fixed (then remove these two lines)
217+
# Explicit flags for handling specific format and cpp combos
218218
#
219219
ESMF_F90COMPILEFREENOCPP = -Mfreeform
220220
ESMF_F90COMPILEFIXCPP = -Mpreprocess -Mnofreeform

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ ESMF_PIO = OFF
181181
ESMF_F90IMOD = -p
182182

183183
############################################################
184-
# Need this until the file convention is fixed (then remove these two lines)
184+
# Explicit flags for handling specific format and cpp combos
185185
#
186186
ESMF_F90COMPILEFREENOCPP = -ffree
187187
ESMF_F90COMPILEFIXCPP = -ffixed

‎build_config/Linux.absoftintel.default/build_rules.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ endif
177177
endif
178178

179179
############################################################
180-
# Need this until the file convention is fixed (then remove these two lines)
180+
# Explicit flags for handling specific format and cpp combos
181181
#
182182
ESMF_F90COMPILEFREENOCPP = -ffree
183183
ESMF_F90COMPILEFIXCPP = -ffixed

‎build_config/Linux.aocc.default/build_rules.mk

+2-11
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ESMF_CPPDEFAULT = clang -E -P -x c
1313

1414
ESMF_CXXCOMPILECPPFLAGS += -x c++
1515

16+
# Need this until __aocc__ macro shows up in Fortran preprocessing
1617
ESMF_CPPFLAGS += -DESMF_COMPILER_AOCC
1718

1819
############################################################
@@ -80,15 +81,6 @@ ESMF_CDEFAULT = mpicc
8081
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
8182
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
8283
else
83-
ifeq ($(ESMF_COMM),lam)
84-
# LAM (assumed to be built with gfortran) -----------------------
85-
ESMF_CXXCOMPILECPPFLAGS+= -DESMF_NO_SIGUSR2
86-
ESMF_F90DEFAULT = mpif77
87-
ESMF_CXXDEFAULT = mpic++
88-
ESMF_CDEFAULT = mpicc
89-
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
90-
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
91-
else
9284
ifeq ($(ESMF_COMM),openmpi)
9385
# OpenMPI --------------------------------------------------
9486
ifeq ($(shell $(ESMF_DIR)/scripts/available mpifort),mpifort)
@@ -116,7 +108,6 @@ endif
116108
endif
117109
endif
118110
endif
119-
endif
120111

121112
############################################################
122113
# Print compiler version string
@@ -228,7 +219,7 @@ ESMF_OPENMP_F90LINKOPTS += -fopenmp
228219
ESMF_OPENMP_CXXLINKOPTS += -fopenmp
229220

230221
############################################################
231-
# Need this until the file convention is fixed (then remove these two lines)
222+
# Explicit flags for handling specific format and cpp combos
232223
#
233224
ESMF_F90COMPILEFREENOCPP = -ffree-form
234225
ESMF_F90COMPILEFIXCPP = -cpp -ffixed-form

‎build_config/Linux.arm.default/build_rules.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ ESMF_OPENMP=OFF
226226
# ESMF_OPENMP_CXXLINKOPTS += -fopenmp
227227

228228
############################################################
229-
# Need this until the file convention is fixed (then remove these two lines)
229+
# Explicit flags for handling specific format and cpp combos
230230
#
231231
ESMF_F90COMPILEFREENOCPP = -ffree-form
232232
ESMF_F90COMPILEFIXCPP = -cpp -ffixed-form

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ ESMF_OPENMP_F90LINKOPTS += -fopenmp
195195
ESMF_OPENMP_CXXLINKOPTS += -fopenmp
196196

197197
############################################################
198-
# Need this until the file convention is fixed (then remove these two lines)
198+
# Explicit flags for handling specific format and cpp combos
199199
#
200200
ESMF_F90COMPILEFREENOCPP = -ffree-form
201201
ESMF_F90COMPILEFIXCPP = -cpp -ffixed-form

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ ESMF_OPENACC_F90LINKOPTS += -fopenacc
232232
ESMF_OPENACC_CXXLINKOPTS += -fopenacc
233233

234234
############################################################
235-
# Need this until the file convention is fixed (then remove these two lines)
235+
# Explicit flags for handling specific format and cpp combos
236236
#
237237
ESMF_F90COMPILEFREENOCPP = -ffree-form
238238
ESMF_F90COMPILEFIXCPP = -cpp -ffixed-form

‎build_config/Linux.gfortranclang.default/build_rules.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ ESMF_OPENMP_F90LINKOPTS += -fopenmp
219219
ESMF_OPENMP_CXXLINKOPTS += -fopenmp
220220

221221
############################################################
222-
# Need this until the file convention is fixed (then remove these two lines)
222+
# Explicit flags for handling specific format and cpp combos
223223
#
224224
ESMF_F90COMPILEFREENOCPP = -ffree-form
225225
ESMF_F90COMPILEFIXCPP = -cpp -ffixed-form

‎build_config/Linux.intelgcc.default/build_rules.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ ESMF_OPENMP_CXXCOMPILEOPTS += -fopenmp
213213
ESMF_OPENMP_CXXLINKOPTS += -fopenmp
214214

215215
############################################################
216-
# Need this until the file convention is fixed (then remove these two lines)
216+
# Explicit flags for handling specific format and cpp combos
217217
#
218218
ESMF_F90COMPILEFREENOCPP = -fpp0 -FR
219219
ESMF_F90COMPILEFIXCPP = -fpp

‎build_config/Linux.lahey.default/build_rules.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ ESMF_OPENMP_F90LINKOPTS += -fopenmp
125125
ESMF_OPENMP_CXXLINKOPTS += -fopenmp
126126

127127
############################################################
128-
# Need this until the file convention is fixed (then remove these two lines)
128+
# Explicit flags for handling specific format and cpp combos
129129
#
130130
ESMF_F90COMPILEFREENOCPP = --nfix
131131
ESMF_F90COMPILEFIXCPP = --fix -Cpp

0 commit comments

Comments
 (0)