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

Update to GFE v1.2.0 #44

Merged
merged 2 commits into from
May 10, 2022
Merged

Update to GFE v1.2.0 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e02b25a
Update to GFE v1.2.0
mathomp4 May 9, 2022
1c58c5d
Add ifx support updates
mathomp4 May 10, 2022
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
4 changes: 4 additions & 0 deletions Arch.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)),)
Expand Down
17 changes: 17 additions & 0 deletions Base.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -68,6 +74,7 @@
endif
endif
endif
endif
else
ifneq ($(wildcard $(shell which nvfortran 2> /dev/null)),)
FC := nvfortran
Expand Down Expand Up @@ -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
Expand All @@ -146,6 +157,7 @@
endif
endif
endif
endif
else
ifneq ($(wildcard $(shell which gcc 2> /dev/null)),)
CC := gcc
Expand Down Expand Up @@ -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
Expand All @@ -218,6 +234,7 @@
endif
endif
endif
endif
else
ifneq ($(wildcard $(shell which g++ 2> /dev/null)),)
CXX := g++
Expand Down
10 changes: 10 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,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
Expand Down
2 changes: 1 addition & 1 deletion GFE
Open in desktop
Submodule GFE updated 9 files
+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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
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 @@
7.0.0
7.1.0