diff --git a/CHANGELOG.md b/CHANGELOG.md index 41dd1aa..480226c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,13 @@ ### Removed ### Added -## [7.3.0] - 2022-0609 +## [7.3.1] - 2022-06-10 + +### Fixed + +- Fixed issue with building ESMF with MPT + +## [7.3.0] - 2022-06-09 ### Updates diff --git a/VERSION b/VERSION index 1502020..643916c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.3.0 +7.3.1 diff --git a/esmf_rules.mk b/esmf_rules.mk index d1af2d3..29b827e 100644 --- a/esmf_rules.mk +++ b/esmf_rules.mk @@ -41,14 +41,16 @@ endif export ESMF_MPILAUNCHOPTIONS endif endif - endif + endif -# ESMF_COMM=mpt expects mpicxx to be icpc -# --------------------------------------- +# ESMF_COMM=mpt expects mpicxx to be icpc and mpicc to be icc +# ----------------------------------------------------------- ifeq ($(ESMF_COMPILER), intel) ifeq ($(ESMF_COMM), mpt) MPICXX_CXX=icpc export MPICXX_CXX + MPICC_CC=icc + export MPICC_CC endif endif @@ -74,7 +76,7 @@ endif $(warning Using $(ESMF_F90COMPILEOPTS) as the ESMF F90COMPILEOPTS) $(warning Using $(ESMF_ABI) as the ESMF ABI) -# ESMF_COMM +# ESMF_COMM # ESMF_ABI # ESMF_OS @@ -100,7 +102,7 @@ endif export ESMF_DIR ESMF_BOPT ESMF_COMPILER ESMF_INSTALL_PREFIX ESMF_OS ESMF_INSTALL_HEADERDIR ESMF_INSTALL_MODDIR ESMF_INSTALL_LIBDIR ESMF_INSTALL_BINDIR ESMF_F90COMPILEOPTS ESMF_ABI -esmf.config config: +esmf.config config: @echo "Customized ESMF build step $@..." @touch esmf.config @@ -171,7 +173,7 @@ esmf.pythoncheck pythoncheck: esmf.install @echo "Customized ESMF build step $@..." @(cd $(ESMF_DIR)/src/addon/ESMPy; export PYTHONPATH=$(ESMF_INSTALL_LIBDIR)/python2.7/site-packages; $(ESMF_PYTHON) setup.py test) -%: +%: @echo "Customized ESMF build step $@..." @(cd $(ESMF_DIR); $(MAKE) -e $@)