Skip to content

Commit

Permalink
Update CDEPS submodule and CDEPS tests (ufs-community#599)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@binli2337
binli2337 authored May 26, 2021
1 parent c622d7d commit d0f0324
Show file tree
Hide file tree
Showing 19 changed files with 4,767 additions and 4,671 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@
[submodule "CDEPS"]
path = CDEPS-interface/CDEPS
url = https://github.com/NOAA-EMC/CDEPS
branch = emc/develop
branch = develop
2 changes: 1 addition & 1 deletion CDEPS-interface/CDEPS
Submodule CDEPS updated 15 files
+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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
6 changes: 3 additions & 3 deletions cmake/configure_apps.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
208 changes: 104 additions & 104 deletions tests/RegressionTests_cheyenne.gnu.log
View file

Large diffs are not rendered by default.

754 changes: 377 additions & 377 deletions tests/RegressionTests_cheyenne.intel.log
View file

Large diffs are not rendered by default.

756 changes: 378 additions & 378 deletions tests/RegressionTests_gaea.intel.log
View file

Large diffs are not rendered by default.

214 changes: 107 additions & 107 deletions tests/RegressionTests_hera.gnu.log
View file

Large diffs are not rendered by default.

776 changes: 388 additions & 388 deletions tests/RegressionTests_hera.intel.log
View file

Large diffs are not rendered by default.

894 changes: 501 additions & 393 deletions tests/RegressionTests_jet.intel.log
View file

Large diffs are not rendered by default.

4,131 changes: 1,955 additions & 2,176 deletions tests/RegressionTests_orion.intel.log
View file

Large diffs are not rendered by default.

457 changes: 226 additions & 231 deletions tests/RegressionTests_wcoss_cray.log
View file

Large diffs are not rendered by default.

1,206 changes: 710 additions & 496 deletions tests/RegressionTests_wcoss_dell_p3.log
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions tests/compile.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
2 changes: 1 addition & 1 deletion tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
12 changes: 6 additions & 6 deletions tests/rt.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand All @@ -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 |

###################################################################################################################################################################################
Expand Down
2 changes: 1 addition & 1 deletion tests/rt.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/rt_35d.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/rt_gnu.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 |

0 comments on commit d0f0324

Please sign in to comment.