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

Update CDEPS submodule and CDEPS tests #599

Merged
merged 13 commits into from
May 26, 2021
Merged

Update CDEPS submodule and CDEPS tests #599

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9def9dc
* Point CDEPS to develop branch of NOAA-EMC/CDEPS
binli2337 May 25, 2021
0c00e4f
update rt.sh and rt.conf
binli2337 May 26, 2021
03f8a42
add RegressionTests_wcoss_dell_p3.log
binli2337 May 26, 2021
7584d31
update rt_35d.conf
binli2337 May 26, 2021
38d0946
update rt_35d.conf
binli2337 May 26, 2021
07700f6
add RegressionTests_hera.intel.log
binli2337 May 26, 2021
4fe09cd
update rt_gnu.conf
binli2337 May 26, 2021
6d6e9a9
RT JOBS PASSED: gaea.intel. Log file uploaded.
BrianCurtis-NOAA May 26, 2021
61786e5
RT JOBS PASSED: cheyenne.gnu. Log file uploaded.
BrianCurtis-NOAA May 26, 2021
9447697
update compile.sh
binli2337 May 26, 2021
430895a
RT JOBS PASSED: cheyenne.intel. Log file uploaded.
BrianCurtis-NOAA May 26, 2021
39d6b36
add RegressionTests_jet.intel.log
binli2337 May 26, 2021
ccaa2d9
add RegressionTests_orion.intel.log
binli2337 May 26, 2021
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 .gitmodules
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No changes have been made in the NEMS driver to switch these names---it will still use "FRONT_NEMS_DATM" and "FRONT_CDEPS_DATM" which then asks for "model" names nems_datm or datm. It seems we're introducing a lot of inconsistency.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DeniseWorthen You are correct.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DeniseWorthen My understanding is that this is actually to avoid confusion. in NEMS driver we specify the subcomponent models, not the applications names. Using DATM or NEMS_DATM for both subcomponent and application names could be confusing. Here the NG_GODAS is application name, this application will still define the subcomponents DATM (cdeps datm), MOM6 and CICE6 etc. While before we use DATM as application name and use DATM also as DATM subcomponent along with other subcomponents.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are both NG-GODAS and NG-GODAS-NEMSDATM needed? What's the difference?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NG-GODAS refers to "mom6_cice6_cdeps_datm" application.
NG-GODAS-NEMSDATM refers to "mom_6_cice6_nems_datm" application.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK. But do we need both? Didn't we switch to CDEPS, why do we need nems? Are the results different when CDEPS is used compared to NEMS? Are different atm data used?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the future, NEMS_DATM will be removed from ufs-weather-model. See a related issue at #565.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@junwang-noaa I see, thanks. I do see how DATM is being used two ways (app and component) so this is probably better.

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
Open in desktop
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
1,206 changes: 710 additions & 496 deletions tests/RegressionTests_wcoss_dell_p3.log
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 12 additions & 6 deletions tests/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,18 @@ 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"
fi

if [[ "${MAKE_OPT}" == *"APP=DATM_NEMS"* ]]; then
CMAKE_FLAGS="${CMAKE_FLAGS} -DAPP=DATM_NEMS"
#if [[ "${MAKE_OPT}" == *"APP=DATM"* ]]; then
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove the commented lines 152-154 and 159-161 ?

# CMAKE_FLAGS="${CMAKE_FLAGS} -DAPP=DATM"
#fi
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"
#fi
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
2 changes: 1 addition & 1 deletion tests/rt_35d.conf
View file
Open in desktop
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 | |
DeniseWorthen marked this conversation as resolved.
Show resolved Hide resolved
#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 Down