Add regression tests with MULTI_GASES (#112)

* Add the option to run regression test with MULTI_GASES=Y * Add multi_gases CCPP regression test
ufs-community · Jul 7, 2020 · a7b9b6d · a7b9b6d
1 parent b0ee9ff
commit a7b9b6d
Show file tree

Hide file tree

Showing 54 changed files with 97,046 additions and 3,570 deletions.
diff --git a/FV3 b/FV3
diff --git a/cmake/GNU.cmake b/cmake/GNU.cmake
@@ -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()
diff --git a/cmake/Intel.cmake b/cmake/Intel.cmake
@@ -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")
 
@@ -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()
diff --git a/cmake/PGI.cmake b/cmake/PGI.cmake
@@ -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()
+
diff --git a/cmake/configure_cheyenne.gnu.cmake b/cmake/configure_cheyenne.gnu.cmake
@@ -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)
 

diff --git a/cmake/configure_cheyenne.intel-impi.cmake b/cmake/configure_cheyenne.intel-impi.cmake
@@ -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)
 

diff --git a/cmake/configure_cheyenne.intel.cmake b/cmake/configure_cheyenne.intel.cmake
@@ -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)
 

diff --git a/cmake/configure_gaea.cmake b/cmake/configure_gaea.cmake
@@ -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)
 

diff --git a/cmake/configure_hera.gnu.cmake b/cmake/configure_hera.gnu.cmake
@@ -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)
 

diff --git a/cmake/configure_hera.intel.cmake b/cmake/configure_hera.intel.cmake
@@ -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)
 

diff --git a/cmake/configure_jet.intel.cmake b/cmake/configure_jet.intel.cmake
@@ -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)
 

diff --git a/cmake/configure_linux.gnu.cmake b/cmake/configure_linux.gnu.cmake
@@ -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)
 

diff --git a/cmake/configure_linux.intel.cmake b/cmake/configure_linux.intel.cmake
@@ -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)
 

diff --git a/cmake/configure_macosx.gnu.cmake b/cmake/configure_macosx.gnu.cmake
@@ -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)
 

diff --git a/cmake/configure_orion.intel.cmake b/cmake/configure_orion.intel.cmake
@@ -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)
 

diff --git a/cmake/configure_stampede.intel.cmake b/cmake/configure_stampede.intel.cmake
@@ -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)
 

diff --git a/cmake/configure_wcoss_cray.cmake b/cmake/configure_wcoss_cray.cmake
@@ -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)
 

diff --git a/cmake/configure_wcoss_dell_p3.cmake b/cmake/configure_wcoss_dell_p3.cmake
@@ -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)
 

diff --git a/conf/configure.fv3.cheyenne.gnu b/conf/configure.fv3.cheyenne.gnu
@@ -57,6 +57,7 @@ HYDRO = N
 CCPP = N
 SION = N
 QUAD_PRECISION = Y
+MULTI_GASES = N
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)

diff --git a/conf/configure.fv3.cheyenne.intel b/conf/configure.fv3.cheyenne.intel
@@ -57,6 +57,7 @@ HYDRO = N
 CCPP = N
 SION = N
 QUAD_PRECISION = Y
+MULTI_GASES = N
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)

diff --git a/conf/configure.fv3.cheyenne.intel-impi b/conf/configure.fv3.cheyenne.intel-impi
@@ -53,6 +53,7 @@ HYDRO = N
 CCPP = N
 SION = N
 QUAD_PRECISION = Y
+MULTI_GASES = N
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)

diff --git a/conf/configure.fv3.endeavor.intel b/conf/configure.fv3.endeavor.intel
@@ -53,6 +53,7 @@ HYDRO = N
 CCPP = N
 SION = N
 QUAD_PRECISION = Y
+MULTI_GASES = N
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)

diff --git a/conf/configure.fv3.gaea.intel b/conf/configure.fv3.gaea.intel
@@ -32,6 +32,7 @@ AVX2 = Y
 HYDRO = N
 CCPP = N
 QUAD_PRECISION = Y
+MULTI_GASES = N
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)

diff --git a/conf/configure.fv3.hera.gnu b/conf/configure.fv3.hera.gnu
@@ -32,6 +32,7 @@ AVX2 = Y
 HYDRO = N
 CCPP = N
 QUAD_PRECISION = Y
+MULTI_GASES = N
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)

diff --git a/conf/configure.fv3.hera.intel b/conf/configure.fv3.hera.intel
@@ -32,6 +32,7 @@ AVX2 = Y
 HYDRO = N
 CCPP = N
 QUAD_PRECISION = Y
+MULTI_GASES = N
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)

diff --git a/conf/configure.fv3.jet.intel b/conf/configure.fv3.jet.intel
@@ -52,7 +52,7 @@ AVX2 = Y
 HYDRO = N
 CCPP = N
 QUAD_PRECISION = Y
-
+MULTI_GASES = N
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)

diff --git a/conf/configure.fv3.linux.gnu b/conf/configure.fv3.linux.gnu
@@ -57,6 +57,7 @@ HYDRO = N
 CCPP = N
 SION = N
 QUAD_PRECISION = Y
+MULTI_GASES = N
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)

diff --git a/conf/configure.fv3.macosx.gnu b/conf/configure.fv3.macosx.gnu
@@ -57,6 +57,7 @@ HYDRO = N
 CCPP = N
 SION = N
 QUAD_PRECISION = Y
+MULTI_GASES = N
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)

diff --git a/conf/configure.fv3.odin b/conf/configure.fv3.odin
@@ -51,6 +51,7 @@ OPENMP = Y
 AVX2 = Y
 HYDRO = N
 QUAD_PRECISION = Y
+MULTI_GASES = N
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)

diff --git a/conf/configure.fv3.orion.intel b/conf/configure.fv3.orion.intel
@@ -33,6 +33,7 @@ HYDRO = N
 CCPP = N
 STATIC = N
 QUAD_PRECISION = Y
+MULTI_GASES = N
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)

diff --git a/conf/configure.fv3.s4.intel b/conf/configure.fv3.s4.intel
@@ -33,6 +33,7 @@ HYDRO = N
 CCPP = N
 INLINE_POST=N
 QUAD_PRECISION = Y
+MULTI_GASES = N
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)

diff --git a/conf/configure.fv3.stampede.intel b/conf/configure.fv3.stampede.intel
@@ -52,6 +52,7 @@ AVX2 = Y
 HYDRO = N
 CCPP = N
 QUAD_PRECISION = Y
+MULTI_GASES = N
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)

diff --git a/conf/configure.fv3.wcoss_cray b/conf/configure.fv3.wcoss_cray
@@ -22,6 +22,7 @@ AVX2 = Y
 HYDRO = N
 CCPP = N
 QUAD_PRECISION = Y
+MULTI_GASES = N
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)

diff --git a/conf/configure.fv3.wcoss_dell_p3 b/conf/configure.fv3.wcoss_dell_p3
@@ -22,6 +22,7 @@ AVX2 = Y
 HYDRO = N
 CCPP = N
 QUAD_PRECISION = Y
+MULTI_GASES = N
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)