Skip to content

add three weekly tests and build cdeps with gnu compiler #1132

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

Closed
binli2337 wants to merge 6 commits into from
Closed

add three weekly tests and build cdeps with gnu compiler #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b31d033
add three weekly tests
binli2337 Mar 20, 2022
396afe2
update tests/rt_gnu.conf
binli2337 Mar 21, 2022
2cc3c24
point MOM6 to test branch (#3)
jiandewang Mar 22, 2022
1c863ef
point to my fv3 branch (#4)
WenMeng-NOAA Mar 22, 2022
7d61c95
Merge remote-tracking branch 'upstream/develop' into feature/weekly_t…
binli2337 Mar 22, 2022
059e15c
Revert "Merge remote-tracking branch 'upstream/develop' into feature/…
binli2337 Mar 22, 2022
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
10 changes: 6 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
url = https://github.com/WenMeng-NOAA/fv3atm
branch = upp_update_rrfs
# url = https://github.com/NOAA-EMC/fv3atm
# branch = develop
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand All @@ -24,8 +26,8 @@
branch = emc/develop
[submodule "MOM6"]
path = MOM6-interface/MOM6
url = https://github.com/NOAA-EMC/MOM6
branch = dev/emc
url = https://github.com/jiandewang/MOM6
branch = feature/update-to-main-20220317
[submodule "CICE"]
path = CICE-interface/CICE
url = https://github.com/NOAA-EMC/CICE
Expand Down
2 changes: 1 addition & 1 deletion CDEPS-interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ add_dependencies(docn share streams dshr)
set_target_properties(docn PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
target_include_directories(docn PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
target_link_libraries(docn PRIVATE dshr share streams)
target_link_libraries(docn PRIVATE esmf)
target_link_libraries(docn PRIVATE esmf PIO::PIO_Fortran)

# CDEPS/drof
add_library(drof OBJECT ${cdeps_drof_files})
Expand Down
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 ATMAERO ATMW S2S S2SA S2SW S2SWA HAFS HAFSW HAFS-ALL NG-GODAS)
list(APPEND VALID_APPS ATM ATMAERO ATMW S2S S2SW HAFS HAFSW HAFS-ALL NG-GODAS)
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
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated from 2b988f to 7c0dee
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Open in desktop
Submodule MOM6 updated 1 files
+3 −0 src/initialization/MOM_state_initialization.F90
18 changes: 5 additions & 13 deletions cmake/configure_apps.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,19 @@ if(APP MATCHES "^(NG-GODAS)$")
message("Configuring UFS app in (CDEPS) Data Atmosphere mode")
endif()

if(APP MATCHES "^(S2S|S2SA|S2SW|S2SWA)$")
set(APP_MSG "Configuring UFS app in S2S")
if(APP MATCHES "^(S2S|S2SW)$")
set(CMEPS ON CACHE BOOL "Enable CMEPS" FORCE)
set(FMS ON CACHE BOOL "Enable FMS" FORCE)
set(FV3 ON CACHE BOOL "Enable FV3" FORCE)
set(MOM6 ON CACHE BOOL "Enable MOM6" FORCE)
set(CICE6 ON CACHE BOOL "Enable CICE6" FORCE)
set(STOCH_PHYS ON CACHE BOOL "Enable Stochastic Physics" FORCE)
if(APP MATCHES "^S2SW")
if(APP MATCHES "S2SW")
set(WW3 ON CACHE BOOL "Enable WAVEWATCH III" FORCE)
string(CONCAT APP_MSG ${APP_MSG} " with Waves")
endif()
if(APP MATCHES "A$")
set(UFS_GOCART ON CACHE BOOL "Enable GOCART" FORCE)
if(WW3)
string(CONCAT APP_MSG ${APP_MSG} " and Aerosols")
else()
string(CONCAT APP_MSG ${APP_MSG} " with Aerosols")
endif()
message("Configuring UFS app in S2S with Waves mode")
else()
message("Configuring UFS app in S2S mode")
endif()
message("${APP_MSG} mode")
endif()

if(APP MATCHES "^(HAFS|HAFSW|HAFS-ALL)$")
Expand Down
1 change: 0 additions & 1 deletion doc/UsersGuide/source/InputsOutputs.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,7 +1206,6 @@ shows the following parameters that can be set in *model_configure* at run-time.
- history file output forecast hours or history file output frequency if the second elelment is -1
- real
- -1 (negative: turn off the option, otherwise overwritten nfhout/nfhout_fh; 6 -1: output every 6 hoursr; 6 9: output history files at fh=6 and 9)
- -1 (negative: turn off the option, otherwise overwritten nfhout/nfhout_fh; 6 -1: output every 6 hoursr; 6 9: output history files at fh=6 and 9. Note: output_fh can only take 277 elements)

:numref:`Table %s <ModelConfigParamsNotChanged>` shows the following parameters in *model_configure* that
are not usually changed.
Expand Down
320 changes: 160 additions & 160 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

1,036 changes: 518 additions & 518 deletions tests/RegressionTests_cheyenne.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,070 changes: 537 additions & 533 deletions tests/RegressionTests_gaea.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

318 changes: 159 additions & 159 deletions tests/RegressionTests_hera.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

1,048 changes: 524 additions & 524 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

932 changes: 466 additions & 466 deletions tests/RegressionTests_jet.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,032 changes: 516 additions & 516 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

688 changes: 344 additions & 344 deletions tests/RegressionTests_wcoss_cray.log
View file
Open in desktop

Large diffs are not rendered by default.

1,117 changes: 548 additions & 569 deletions tests/RegressionTests_wcoss_dell_p3.log
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# S2S tests #
###################################################################################################################################################################################

COMPILE | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp,FV3_GFS_v17_coupled_p8 | - wcoss_cray | fv3 |
COMPILE | -DAPP=S2SW -DUFS_GOCART=ON -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp,FV3_GFS_v17_coupled_p8 | - wcoss_cray | fv3 |
RUN | cpld_control_p8 | - wcoss_cray | fv3 |
RUN | cpld_2threads_p8 | - wcoss_cray | |
RUN | cpld_decomp_p8 | - wcoss_cray jet.intel | |
Expand All @@ -24,7 +24,7 @@ RUN | cpld_restart_c192_p8
RUN | cpld_control_c384_p8 | - wcoss_cray jet.intel | fv3 |
RUN | cpld_restart_c384_p8 | - wcoss_cray jet.intel | | cpld_control_c384_p8

COMPILE | -DAPP=S2SA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | - wcoss_cray | fv3 |
COMPILE | -DAPP=S2S -DDEBUG=ON -DUFS_GOCART=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | - wcoss_cray | fv3 |
RUN | cpld_debug_p8 | - 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 @@ -485,7 +485,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
TEST_35D=true
fi

BL_DATE=20220321
BL_DATE=20220318
if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
else
Expand Down
7 changes: 7 additions & 0 deletions tests/rt_gnu.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,10 @@ RUN | cpld_control_c96_noaero_p8

COMPILE | -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 |
RUN | cpld_debug_noaero_p8 | | fv3 |

##################################################################################################################################################################
# CDEPS Data Atmosphere test #
##################################################################################################################################################################

COMPILE | -DAPP=NG-GODAS | | fv3 |
RUN | datm_cdeps_control_cfsr | | fv3 |
7 changes: 6 additions & 1 deletion tests/rt_weekly.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
###################################################################################################################################################################################

COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_nsstNoahmpUGWPv1 -D32BIT=ON | | fv3 |
RUN | control_c768 | - wcoss_cray | fv3 |
RUN | control_c768 | + hera.intel | fv3 |

# CPLD Benchmark 35d tests
# The length of forecast is 5 days for the weekly tests.
Expand All @@ -16,3 +16,8 @@ RUN | cpld_bmark_p8_35d
RUN | cpld_bmark_p8_35d | | fv3 | | 2013040100
RUN | cpld_bmark_p8_35d | | fv3 | | 2013070100
RUN | cpld_bmark_p8_35d | | fv3 | | 2013100100
# The coupled p8 tests
COMPILE | -DAPP=S2SW -DUFS_GOCART=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | + jet.intel | fv3 |
RUN | cpld_bmark_p8 | + jet.intel | fv3 |
RUN | cpld_control_c192_p8 | + jet.intel | fv3 |
RUN | cpld_control_c384_p8 | + jet.intel | fv3 |
1 change: 1 addition & 0 deletions tests/tests/cpld_control_c192_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export LIST_FILES="sfcf036.tile1.nc \

export_fv3
export_cpl
export WLCLK=48

export DAYS=1.5
export FHMAX=36
Expand Down