Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for ESMF with MPT (v6 branch) #54

Merged
merged 1 commit into from
Jun 10, 2022
Merged

Fixes for ESMF with MPT (v6 branch) #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
### Removed
### Added

## [6.3.1] - 2022-06-10

### Fixed

- Fixed issue with building ESMF with MPT

## [6.3.0] - 2022-06-09

### Updates
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.3.0
6.3.1
14 changes: 8 additions & 6 deletions esmf_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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 $@)