Skip to content

Update gsd/develop from NOAA-EMC develop 2020/07/07 #33

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

Merged
DomHeinzeller merged 5 commits into from
Jul 8, 2020
Merged

Update gsd/develop from NOAA-EMC develop 2020/07/07 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b0ee9ff
Update develop from gsd/develop 2020/06/30 (#156)
climbfuji Jul 2, 2020
a7b9b6d
Add regression tests with MULTI_GASES (#112)
XiaqiongZhou-NOAA Jul 7, 2020
b6d2cf2
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Jul 7, 2020
c3ce449
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Jul 7, 2020
dfeb111
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Jul 8, 2020
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
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated from fb4cc4 to 0db926
7 changes: 7 additions & 0 deletions cmake/GNU.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,10 @@ if(QUAD_PRECISION)
else()
message("QUAD_PRECISION is disabled")
endif()

if(MULTI_GASES)
message("MULTI_GASES is ENABLED")
add_definitions(-DMULTI_GASES)
else()
message("MULTI_GASES is disabled")
endif()
9 changes: 9 additions & 0 deletions cmake/Intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ if(QUAD_PRECISION)
add_definitions(-DENABLE_QUAD_PRECISION)
endif()

if(MULTI_GASES)
add_definitions(-DMULTI_GASES)
endif()


set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__IFC -sox -fp-model source")

Expand Down Expand Up @@ -99,3 +103,8 @@ if(QUAD_PRECISION)
else()
message("QUAD_PRECISION is disabled")
endif()
if(MULTI_GASES)
message("MULTI_GASES is ENABLED")
else()
message("MULTI_GASES is disabled")
endif()
8 changes: 8 additions & 0 deletions cmake/PGI.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,11 @@ if(QUAD_PRECISION)
else()
message("QUAD_PRECISION is disabled")
endif()

if(MULTI_GASES)
message("MULTI_GASES is ENABLED")
add_definitions(-DMULTI_GASES)
else()
message("MULTI_GASES is disabled")
endif()

1 change: 1 addition & 0 deletions cmake/configure_cheyenne.gnu.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" OFF)
option(QUAD_PRECISION "Enable QUAD_PRECISION (for certain grid metric terms in dycore)" ON)
option(MULTI_GASES "Enable MULTI_GASES" OFF)

option(INLINE_POST "Enable inline post" OFF)

Expand Down
1 change: 1 addition & 0 deletions cmake/configure_cheyenne.intel-impi.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" ON)
option(QUAD_PRECISION "Enable QUAD_PRECISION (for certain grid metric terms in dycore)" ON)
option(MULTI_GASES "Enable MULTI_GASES" OFF)

option(INLINE_POST "Enable inline post" OFF)

Expand Down
1 change: 1 addition & 0 deletions cmake/configure_cheyenne.intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" ON)
option(QUAD_PRECISION "Enable QUAD_PRECISION (for certain grid metric terms in dycore)" ON)
option(MULTI_GASES "Enable MULTI_GASES" OFF)

option(INLINE_POST "Enable inline post" OFF)

Expand Down
1 change: 1 addition & 0 deletions cmake/configure_gaea.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" ON)
option(QUAD_PRECISION "Enable QUAD_PRECISION (for certain grid metric terms in dycore)" ON)
option(MULTI_GASES "Enable MULTI_GASES" OFF)

option(INLINE_POST "Enable inline post" OFF)

Expand Down
1 change: 1 addition & 0 deletions cmake/configure_hera.gnu.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" OFF)
option(QUAD_PRECISION "Enable QUAD_PRECISION (for certain grid metric terms in dycore)" ON)
option(MULTI_GASES "Enable MULTI_GASES" OFF)

option(INLINE_POST "Enable inline post" OFF)

Expand Down
1 change: 1 addition & 0 deletions cmake/configure_hera.intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" ON)
option(QUAD_PRECISION "Enable QUAD_PRECISION (for certain grid metric terms in dycore)" ON)
option(MULTI_GASES "Enable MULTI_GASES" OFF)

option(INLINE_POST "Enable inline post" ON)

Expand Down
1 change: 1 addition & 0 deletions cmake/configure_jet.intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" OFF)
option(QUAD_PRECISION "Enable QUAD_PRECISION (for certain grid metric terms in dycore)" ON)
option(MULTI_GASES "Enable MULTI_GASES" OFF)

option(INLINE_POST "Enable inline post" OFF)

Expand Down
1 change: 1 addition & 0 deletions cmake/configure_linux.gnu.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" OFF)
option(QUAD_PRECISION "Enable QUAD_PRECISION (for certain grid metric terms in dycore)" ON)
option(MULTI_GASES "Enable MULTI_GASES" OFF)

option(INLINE_POST "Enable inline post" OFF)

Expand Down
1 change: 1 addition & 0 deletions cmake/configure_linux.intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" OFF)
option(QUAD_PRECISION "Enable QUAD_PRECISION (for certain grid metric terms in dycore)" ON)
option(MULTI_GASES "Enable MULTI_GASES" OFF)

option(INLINE_POST "Enable inline post" OFF)

Expand Down
1 change: 1 addition & 0 deletions cmake/configure_macosx.gnu.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ option(OPENMP "Enable OpenMP threading" ON)
endif()
option(AVX2 "Enable AVX2 instruction set" OFF)
option(QUAD_PRECISION "Enable QUAD_PRECISION (for certain grid metric terms in dycore)" ON)
option(MULTI_GASES "Enable MULTI_GASES" OFF)

option(INLINE_POST "Enable inline post" OFF)

Expand Down
1 change: 1 addition & 0 deletions cmake/configure_orion.intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" ON)
option(QUAD_PRECISION "Enable QUAD_PRECISION (for certain grid metric terms in dycore)" ON)
option(MULTI_GASES "Enable MULTI_GASES" OFF)

option(INLINE_POST "Enable inline post" ON)

Expand Down
2 changes: 2 additions & 0 deletions cmake/configure_stampede.intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ option(VERBOSE "Enable VERBOSE mode" OFF)
option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" ON)
option(QUAD_PRECISION "Enable QUAD_PRECISION (for certain grid metric terms in dycore)" ON)
option(MULTI_GASES "Enable MULTI_GASES" OFF)

option(INLINE_POST "Enable inline post" OFF)

Expand Down
1 change: 1 addition & 0 deletions cmake/configure_wcoss_cray.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" ON)
option(QUAD_PRECISION "Enable QUAD_PRECISION (for certain grid metric terms in dycore)" ON)
option(MULTI_GASES "Enable MULTI_GASES" OFF)

option(INLINE_POST "Enable inline post" ON)

Expand Down
3 changes: 2 additions & 1 deletion cmake/configure_wcoss_dell_p3.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ option(REPRO "Enable REPRO mode" OFF)
option(VERBOSE "Enable VERBOSE mode" OFF)
option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" OFF)
option(AVX2 "Enable AVX2 instruction set" ON)
option(QUAD_PRECISION "Enable QUAD_PRECISION (for certain grid metric terms in dycore)" ON)
option(MULTI_GASES "Enable MULTI_GASES" OFF)

option(INLINE_POST "Enable inline post" ON)

Expand Down
1 change: 1 addition & 0 deletions conf/configure.fv3.cheyenne.gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ HYDRO = N
CCPP = N
SION = N
QUAD_PRECISION = Y
MULTI_GASES = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down
1 change: 1 addition & 0 deletions conf/configure.fv3.cheyenne.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ HYDRO = N
CCPP = N
SION = N
QUAD_PRECISION = Y
MULTI_GASES = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down
1 change: 1 addition & 0 deletions conf/configure.fv3.cheyenne.intel-impi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ HYDRO = N
CCPP = N
SION = N
QUAD_PRECISION = Y
MULTI_GASES = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down
1 change: 1 addition & 0 deletions conf/configure.fv3.endeavor.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ HYDRO = N
CCPP = N
SION = N
QUAD_PRECISION = Y
MULTI_GASES = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down
1 change: 1 addition & 0 deletions conf/configure.fv3.gaea.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ AVX2 = Y
HYDRO = N
CCPP = N
QUAD_PRECISION = Y
MULTI_GASES = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down
1 change: 1 addition & 0 deletions conf/configure.fv3.hera.gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ AVX2 = Y
HYDRO = N
CCPP = N
QUAD_PRECISION = Y
MULTI_GASES = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down
1 change: 1 addition & 0 deletions conf/configure.fv3.hera.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ AVX2 = Y
HYDRO = N
CCPP = N
QUAD_PRECISION = Y
MULTI_GASES = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down
2 changes: 1 addition & 1 deletion conf/configure.fv3.jet.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ AVX2 = Y
HYDRO = N
CCPP = N
QUAD_PRECISION = Y

MULTI_GASES = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down
1 change: 1 addition & 0 deletions conf/configure.fv3.linux.gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ HYDRO = N
CCPP = N
SION = N
QUAD_PRECISION = Y
MULTI_GASES = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down
1 change: 1 addition & 0 deletions conf/configure.fv3.macosx.gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ HYDRO = N
CCPP = N
SION = N
QUAD_PRECISION = Y
MULTI_GASES = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down
1 change: 1 addition & 0 deletions conf/configure.fv3.odin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ OPENMP = Y
AVX2 = Y
HYDRO = N
QUAD_PRECISION = Y
MULTI_GASES = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down
1 change: 1 addition & 0 deletions conf/configure.fv3.orion.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ HYDRO = N
CCPP = N
STATIC = N
QUAD_PRECISION = Y
MULTI_GASES = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down
1 change: 1 addition & 0 deletions conf/configure.fv3.s4.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ HYDRO = N
CCPP = N
INLINE_POST=N
QUAD_PRECISION = Y
MULTI_GASES = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down
1 change: 1 addition & 0 deletions conf/configure.fv3.stampede.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ AVX2 = Y
HYDRO = N
CCPP = N
QUAD_PRECISION = Y
MULTI_GASES = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down
1 change: 1 addition & 0 deletions conf/configure.fv3.wcoss_cray
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ AVX2 = Y
HYDRO = N
CCPP = N
QUAD_PRECISION = Y
MULTI_GASES = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down
12 changes: 10 additions & 2 deletions conf/configure.fv3.wcoss_dell_p3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@ LD = mpiifort
#########
# flags #
#########
# default is 64-bit OpenMP non-hydrostatic build using AVX2
DEBUG =
REPRO =
VERBOSE =
OPENMP = Y
AVX2 = Y
HYDRO = N
CCPP = N
QUAD_PRECISION = Y
MULTI_GASES = N

include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)
Expand Down Expand Up @@ -68,8 +71,13 @@ ifeq ($(REPRO),Y)
FFLAGS += -qno-opt-dynamic-align
CFLAGS += -qno-opt-dynamic-align
else
FFLAGS += -xHOST -qno-opt-dynamic-align
CFLAGS += -xHOST -qno-opt-dynamic-align
ifeq ($(AVX2),Y)
FFLAGS += -xCORE-AVX2 -qno-opt-dynamic-align
CFLAGS += -xCORE-AVX2 -qno-opt-dynamic-align
else
FFLAGS += -qno-opt-dynamic-align
CFLAGS += -qno-opt-dynamic-align
endif
endif

ifeq ($(MULTI_GASES),Y)
Expand Down
Loading