Update CDEPS submodule and CDEPS tests (#599)

* Point CDEPS to develop branch of NOAA-EMC/CDEPS * Change application name "DATM" to "NG-GODAS" * Change application name "DATM-NEMS" to "NG-GODAS-NEMSDATM" * Use a mesh file in MOM6 cap instead of a grid file
ufs-community · May 26, 2021 · d0f0324 · d0f0324
1 parent c622d7d
commit d0f0324
Show file tree

Hide file tree

Showing 19 changed files with 4,767 additions and 4,671 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -37,4 +37,4 @@
 [submodule "CDEPS"]
   path = CDEPS-interface/CDEPS
   url = https://github.com/NOAA-EMC/CDEPS
-  branch = emc/develop
+  branch = develop
diff --git a/CDEPS-interface/CDEPS b/CDEPS-interface/CDEPS
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules/Modules)
 ###############################################################################
 
 # Valid applications and choices
-list(APPEND VALID_APPS ATM ATMW S2S S2SW DATM DATM_NEMS)
+list(APPEND VALID_APPS ATM ATMW S2S S2SW NG-GODAS NG-GODAS-NEMSDATM)
 set(APP NONE CACHE BOOL "Application Name")
 if(NOT (APP IN_LIST VALID_APPS))
   message(FATAL_ERROR "${APP} is not a valid application.\nValid Applications are: ${VALID_APPS}")

diff --git a/cmake/configure_apps.cmake b/cmake/configure_apps.cmake
@@ -25,15 +25,15 @@ if(APP MATCHES "^(ATM|ATMW)$")
   endif()
 endif()
 
-if(APP MATCHES "^(DATM|DATM_NEMS)$")
+if(APP MATCHES "^(NG-GODAS|NG-GODAS-NEMSDATM)$")
   set(CMEPS      ON  CACHE BOOL "Enable CMEPS"               FORCE)
   set(FMS        ON  CACHE BOOL "Enable FMS"                 FORCE)
   set(MOM6       ON  CACHE BOOL "Enable MOM6"                FORCE)
   set(CICE6      ON  CACHE BOOL "Enable CICE6"               FORCE)
-  if(APP MATCHES "DATM_NEMS")
+  if(APP MATCHES "NG-GODAS-NEMSDATM")
     set(NEMSdatm ON  CACHE BOOL "Enable NEMS DataAtm"        FORCE)
     message("Configuring UFS app in (NEMS) Data Atmosphere mode")
-  elseif(APP MATCHES "DATM")
+  elseif(APP MATCHES "NG-GODAS")
     set(CDEPS    ON  CACHE BOOL "Enable CDEPS"               FORCE)
     message("Configuring UFS app in (CDEPS) Data Atmosphere mode")
   endif()

diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/compile.sh b/tests/compile.sh
@@ -149,12 +149,12 @@ if [[ "${MAKE_OPT}" == *"APP=S2SW"* ]]; then
     CMAKE_FLAGS="${CMAKE_FLAGS} -DAPP=S2SW -DMOM6SOLO=ON"
 fi
 
-if [[ "${MAKE_OPT}" == *"APP=DATM"* ]]; then
-    CMAKE_FLAGS="${CMAKE_FLAGS} -DAPP=DATM"
+if [[ "${MAKE_OPT}" == *"APP=NG-GODAS"* ]]; then
+    CMAKE_FLAGS="${CMAKE_FLAGS} -DAPP=NG-GODAS"
 fi
 
-if [[ "${MAKE_OPT}" == *"APP=DATM_NEMS"* ]]; then
-    CMAKE_FLAGS="${CMAKE_FLAGS} -DAPP=DATM_NEMS"
+if [[ "${MAKE_OPT}" == *"APP=NG-GODAS-NEMSDATM"* ]]; then
+    CMAKE_FLAGS="${CMAKE_FLAGS} -DAPP=NG-GODAS-NEMSDATM"
 fi
 
 CMAKE_FLAGS=$(trim "${CMAKE_FLAGS}")

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -895,7 +895,7 @@ export RESTART_N=${FHMAX}
 export CPLMODE='nems_orig_data'
 export cap_dbug_flag="0"
 export use_coldstart="false"
-export use_mommesh="false"
+export use_mommesh="true"
 export RUNTYPE='startup'
 export flux_convergence='0.0'
 export flux_iteration='2'

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -173,7 +173,7 @@ RUN     | fv3_gfs_v16_ras_debug
 # NEMS Data Atmosphere tests                                                                                                                                                      #
 ###################################################################################################################################################################################
 
-COMPILE | APP=DATM_NEMS                                                                                                           | - wcoss_cray                            | fv3 |
+COMPILE | APP=NG-GODAS-NEMSDATM                                                                                                   | - wcoss_cray                            | fv3 |
 RUN     | datm_control_cfsr                                                                                                       | - wcoss_cray                            | fv3 |
 RUN     | datm_restart_cfsr                                                                                                       | - wcoss_cray                            |     | datm_control_cfsr
 RUN     | datm_control_gefs                                                                                                       | - wcoss_cray                            | fv3 |
@@ -184,27 +184,27 @@ RUN     | datm_bulk_gefs
 RUN     | datm_mx025_cfsr                                                                                                         | - wcoss_cray  gaea.intel                | fv3 |
 RUN     | datm_mx025_gefs                                                                                                         | - wcoss_cray                            | fv3 |
 
-COMPILE | APP=DATM_NEMS DEBUG=Y                                                                                                   | - wcoss_cray                            | fv3 |
+COMPILE | APP=NG-GODAS-NEMSDATM DEBUG=Y                                                                                           | - wcoss_cray                            | fv3 |
 RUN     | datm_debug_cfsr                                                                                                         | - wcoss_cray                            | fv3 |
 
 ###################################################################################################################################################################################
 # CDEPS Data Atmosphere tests                                                                                                                                                     #
 ###################################################################################################################################################################################
 
-COMPILE | APP=DATM                                                                                                                | - wcoss_cray                            | fv3 |
+COMPILE | APP=NG-GODAS                                                                                                            | - wcoss_cray                            | fv3 |
 RUN     | datm_cdeps_control_cfsr                                                                                                 | - wcoss_cray                            | fv3 |
 RUN     | datm_cdeps_restart_cfsr                                                                                                 | - wcoss_cray                            |     | datm_cdeps_control_cfsr
 RUN     | datm_cdeps_control_gefs                                                                                                 | - wcoss_cray                            | fv3 |
 
 RUN     | datm_cdeps_bulk_cfsr                                                                                                    | - wcoss_cray                            | fv3 |
 RUN     | datm_cdeps_bulk_gefs                                                                                                    | - wcoss_cray                            | fv3 |
 
-RUN     | datm_cdeps_mx025_cfsr                                                                                                   | - wcoss_cray  gaea.intel                | fv3 |
+RUN     | datm_cdeps_mx025_cfsr                                                                                                   | - wcoss_cray gaea.intel wcoss_dell_p3 orion.intel   | fv3 |
 RUN     | datm_cdeps_mx025_gefs                                                                                                   | - wcoss_cray                            | fv3 |
 
-RUN     | datm_cdeps_multiple_files_cfsr                                                                                          | - wcoss_cray                            | fv3 |
+RUN     | datm_cdeps_multiple_files_cfsr                                                                                          | - wcoss_cray                            |     |
 
-COMPILE | APP=DATM DEBUG=Y                                                                                                        | - wcoss_cray                            | fv3 |
+COMPILE | APP=NG-GODAS DEBUG=Y                                                                                                    | - wcoss_cray                            | fv3 |
 RUN     | datm_cdeps_debug_cfsr                                                                                                   | - wcoss_cray                            | fv3 |
 
 ###################################################################################################################################################################################

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -413,7 +413,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20210524
+BL_DATE=20210526
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else

diff --git a/tests/rt_35d.conf b/tests/rt_35d.conf
@@ -2,7 +2,7 @@
 # CPLD Benchmark 35d tests                                                                                                                                                        #
 ###############################################################################################################################################################################
 
-#COMPILE | APP=S2SW SUITES=FV3_GFS_v16_coupled FV3_GFS_v16_coupled_noahmp,FV3_GFS_v16_coupled_nsstNoahmp                       | + hera.intel orion.intel | fv3 |  |
+COMPILE | APP=S2SW SUITES=FV3_GFS_v16_coupled,FV3_GFS_v16_coupled_noahmp,FV3_GFS_v16_coupled_nsstNoahmp                       | + hera.intel orion.intel | fv3 |  |
 #RUN     | cpld_bmarkfrac_wave_v16_35d                                                                                         |                          | fv3 |  | 2012010100
 #RUN     | cpld_bmarkfrac_wave_v16_35d                                                                                         |                          | fv3 |  | 2012040100
 #RUN     | cpld_bmarkfrac_wave_v16_35d                                                                                         |                          | fv3 |  | 2012070100
@@ -12,7 +12,7 @@
 #RUN     | cpld_bmarkfrac_wave_v16_35d                                                                                         |                          | fv3 |  | 2013070100
 #RUN     | cpld_bmarkfrac_wave_v16_35d                                                                                         |                          | fv3 |  | 2013100100
 
-COMPILE | APP=S2SW SUITES=FV3_GFS_v16_coupled FV3_GFS_v16_coupled_noahmp,FV3_GFS_v16_coupled_nsstNoahmp                       | + hera.intel orion.intel +gaea.intel | fv3 |  |
+COMPILE | APP=S2SW SUITES=FV3_GFS_v16_coupled,FV3_GFS_v16_coupled_noahmp,FV3_GFS_v16_coupled_nsstNoahmp                       | + hera.intel orion.intel +gaea.intel | fv3 |  |
 RUN     | cpld_bmarkfrac_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2012010100
 RUN     | cpld_bmarkfrac_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2012040100
 RUN     | cpld_bmarkfrac_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2012070100

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -66,4 +66,4 @@ COMPILE | APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_
 # Data Atmosphere tests                                                                                                                                          #
 ##################################################################################################################################################################
 
-COMPILE | APP=DATM_NEMS                                                                                                           |                | fv3         |
+COMPILE | APP=NG-GODAS-NEMSDATM                                                                                                   |                | fv3         |
+5 −5		.github/PULL_REQUEST_TEMPLATE.md
+21 −5		cime_config/stream_cdeps.py
+0 −0		cime_config/stream_definition_v2.0.xsd
+81 −0		cime_config/streams.xsd
+10 −4		datm/cime_config/buildnml
+9 −2		datm/cime_config/config_component.xml
+9 −9		datm/cime_config/stream_definition_datm.xml
+8 −8		datm/cime_config/testdefs/testlist_datm.xml
+12 −0		datm/cime_config/testdefs/testmods_dirs/datm/1PT/shell_commands
+14 −6		dice/cime_config/buildnml
+16 −6		dlnd/cime_config/buildnml
+12 −3		docn/cime_config/buildnml
+14 −6		drof/cime_config/buildnml
+14 −6		dwav/cime_config/buildnml
+2 −2		streams/dshr_stream_mod.F90