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

Jump to bottom

Add regression tests with MULTI_GASES #112

Merged
merged 23 commits into from
Jul 7, 2020
Merged

Add regression tests with MULTI_GASES #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3fd9733
Add the option to run regression test with MULTI_GASES=Y
XiaqiongZhou-NOAA Mar 30, 2020
1577985
Add multi_gases CCPP regression test
XiaqiongZhou-NOAA Apr 27, 2020
c9ae4d7
merge ufs-community/ufs
XiaqiongZhou-NOAA Apr 27, 2020
bb8158f
point to FV3 right revision number
XiaqiongZhou-NOAA Apr 28, 2020
5d132c3
point to FV3 right revision number
XiaqiongZhou-NOAA Apr 28, 2020
0f605e9
add CCPP Multi_gases regression tests in the list
XiaqiongZhou-NOAA Apr 28, 2020
d247254
Point to new submodules
XiaqiongZhou-NOAA Jun 22, 2020
ac72b08
Merge remote-tracking branch 'ufscomm/develop' into rt_multigases
XiaqiongZhou-NOAA Jun 23, 2020
a76ac62
Add the multi_gases compiling option for cmake
XiaqiongZhou-NOAA Jun 23, 2020
0b2fa23
Add the multi_gases regression test on Orion
XiaqiongZhou-NOAA Jun 25, 2020
18aaa98
Add the GNU test with the multi_gases opition
XiaqiongZhou-NOAA Jun 26, 2020
f4919de
Point FV3 to a new version
XiaqiongZhou-NOAA Jun 30, 2020
18df462
Merge remote-tracking branch 'ufscomm/develop' into rt_multigases
XiaqiongZhou-NOAA Jun 30, 2020
a746f83
Point FV3 to a new version
XiaqiongZhou-NOAA Jun 30, 2020
31740f7
Change to the new baseline
XiaqiongZhou-NOAA Jul 1, 2020
17ba147
Correct configure files with MULTI_GASES option off
XiaqiongZhou-NOAA Jul 1, 2020
b89530c
Change multi_gases namelist
XiaqiongZhou-NOAA Jul 1, 2020
15dea5e
Point FV3 to a new version
XiaqiongZhou-NOAA Jul 2, 2020
5adab14
Merge remote ufscomm/develop to rt_multigases branch
XiaqiongZhou-NOAA Jul 2, 2020
9e21fc7
Upload log files
XiaqiongZhou-NOAA Jul 2, 2020
56bdc47
Upload log files
XiaqiongZhou-NOAA Jul 2, 2020
94d9f2f
Point FV3 to a new version
XiaqiongZhou-NOAA Jul 6, 2020
3f012fe
Point FV3 to the public version
XiaqiongZhou-NOAA Jul 7, 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 3 files
+1 −1 atmos_cubed_sphere
+1 −1 ccpp/physics
+86 −0 ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml
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
1 change: 1 addition & 0 deletions cmake/configure_wcoss_dell_p3.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 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
1 change: 1 addition & 0 deletions conf/configure.fv3.wcoss_dell_p3
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
Loading