From e02b25ae1f1cd7eb24491a5712f8028c465811f8 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 9 May 2022 08:59:15 -0400 Subject: [PATCH 1/2] Update to GFE v1.2.0 --- CHANGELOG.md | 6 ++++++ GFE | 2 +- README.md | 2 +- VERSION | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a25441..e3a169d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ ### Removed ### Added +## [7.1.0] - 2022-05-09 + +### Updates + +- GFE v1.2.0 + ## [7.0.0] - 2022-04-21 ### Removed diff --git a/GFE b/GFE index d58429a..614e7d0 160000 --- a/GFE +++ b/GFE @@ -1 +1 @@ -Subproject commit d58429af0226321ea2be9bd3d17ca327b2212ed4 +Subproject commit 614e7d01ff7af43023735cb88901b3bc5384edfd diff --git a/README.md b/README.md index 11ae37d..7664c3d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ NASA/GSFC. | [netCDF C++](https://github.com/Unidata/netcdf-cxx4) | 4.3.1 | | [HDF5](https://portal.hdfgroup.org/display/support) | 1.10.8 | | [HDF4](https://portal.hdfgroup.org/display/support) | 4.2.15 | -| [GFE](https://github.com/Goddard-Fortran-Ecosystem/GFE) | v1.1.0 | +| [GFE](https://github.com/Goddard-Fortran-Ecosystem/GFE) | v1.2.0 | | [antlr2](https://www.antlr2.org/) | 2.7.7 | | [GSL](https://www.gnu.org/software/gsl/) | 2.7 | | [jpeg](http://www.ijg.org/) | 9e | diff --git a/VERSION b/VERSION index 66ce77b..a3fcc71 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.0 +7.1.0 From 1c58c5daa3e30ccf7357c5e9b7596cf243260bd4 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 10 May 2022 09:30:50 -0400 Subject: [PATCH 2/2] Add ifx support updates --- Arch.mk | 4 ++++ Base.mk | 17 +++++++++++++++++ CHANGELOG.md | 6 +++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Arch.mk b/Arch.mk index 01c64df..e3e1b98 100644 --- a/Arch.mk +++ b/Arch.mk @@ -21,6 +21,10 @@ CPPFLAGS += -DpgiFortran endif + ifneq ($(wildcard $(shell which ifx 2> /dev/null)),) + CPPFLAGS += -DpgiFortran + endif + # PGI # --- ifneq ($(wildcard $(shell which nvfortran 2> /dev/null)),) diff --git a/Base.mk b/Base.mk index 234c85b..5754b7a 100644 --- a/Base.mk +++ b/Base.mk @@ -45,6 +45,12 @@ FLAP_COMPILER := nag FC_FROM_ENV := TRUE else + ifeq ($(findstring ifx,$(notdir $(FC))),ifx) + ES_FC := $(FC) + ESMF_COMPILER := intelifx + FLAP_COMPILER := intel + FC_FROM_ENV := TRUE + else ifeq ($(findstring ifort,$(notdir $(FC))),ifort) ES_FC := $(FC) ESMF_COMPILER := intel @@ -68,6 +74,7 @@ endif endif endif + endif else ifneq ($(wildcard $(shell which nvfortran 2> /dev/null)),) FC := nvfortran @@ -129,6 +136,10 @@ ES_CC := $(CC) CC_FROM_ENV := TRUE else + ifeq ($(findstring icx,$(notdir $(CC))),icx) + ES_CC := $(CC) + CC_FROM_ENV := TRUE + else ifeq ($(findstring icc,$(notdir $(CC))),icc) ES_CC := $(CC) CC_FROM_ENV := TRUE @@ -146,6 +157,7 @@ endif endif endif + endif else ifneq ($(wildcard $(shell which gcc 2> /dev/null)),) CC := gcc @@ -201,6 +213,10 @@ ES_CXX := $(CXX) CXX_FROM_ENV := TRUE else + ifeq ($(findstring icpx,$(notdir $(CXX))),icpx) + ES_CXX := $(CXX) + CXX_FROM_ENV := TRUE + else ifeq ($(findstring icpc,$(notdir $(CXX))),icpc) ES_CXX := $(CXX) CXX_FROM_ENV := TRUE @@ -218,6 +234,7 @@ endif endif endif + endif else ifneq ($(wildcard $(shell which g++ 2> /dev/null)),) CXX := g++ diff --git a/CHANGELOG.md b/CHANGELOG.md index e3a169d..399de94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,16 @@ ### Removed ### Added -## [7.1.0] - 2022-05-09 +## [7.1.0] - 2022-05-10 ### Updates - GFE v1.2.0 +### Added + +- Added preliminary ifx support to `Arch.mk` and `Base.mk` + ## [7.0.0] - 2022-04-21 ### Removed