Update to GFE v1.2.0 (#44)

* Update to GFE v1.2.0 * Add ifx support updates
GEOS-ESM · May 10, 2022 · dd5bf20 · dd5bf20
1 parent c5b13da
commit dd5bf20
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 3 deletions.
diff --git 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
@@ -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
@@ -8,6 +8,16 @@
 ### Removed
 ### Added
 
+## [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

diff --git a/GFE b/GFE
diff --git 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
@@ -1 +1 @@
-7.0.0
+7.1.0
+3 −0		.gitignore
+1 −1		CMakeLists.txt
+26 −0		ChangeLog.md
+4 −4		README.md
+1 −1		gFTL
+1 −1		gFTL-shared
+1 −1		pFUnit
+1 −1		pFlogger
+1 −1		yaFyaml