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

Jump to bottom

Add a cdeps test and update mom6, fv3, and weekly tests #1136

Merged
merged 17 commits into from
Mar 24, 2022
Merged

Add a cdeps test and update mom6, fv3, and weekly tests #1136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 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
8402190
update FV3
binli2337 Mar 22, 2022
be62cba
Merge branch 'develop' into update_mom6_fv3_weekly_tests
binli2337 Mar 22, 2022
74cc090
update rt.sh
binli2337 Mar 22, 2022
61f4f0e
[AutoRT] hera.gnu Job Completed.
BrianCurtis-NOAA Mar 22, 2022
8c34ce1
[AutoRT] orion.intel Job Completed.
BrianCurtis-NOAA Mar 23, 2022
3fc9116
[AutoRT] cheyenne.intel Job Completed.
BrianCurtis-NOAA Mar 23, 2022
16c02b9
[AutoRT] hera.intel Job Completed.
BrianCurtis-NOAA Mar 23, 2022
ec1d0b2
add RegressionTests_jet.intel.log
binli2337 Mar 23, 2022
3a2eac7
update CDEPS-interface/CMakeLists.txt
binli2337 Mar 23, 2022
28c107d
[AutoRT] cheyenne.gnu Job Completed.
BrianCurtis-NOAA Mar 23, 2022
c4d45d6
[AutoRT] gaea.intel Job Completed.
BrianCurtis-NOAA Mar 23, 2022
2e93a84
add RegressionTests_wcoss_cray.log
binli2337 Mar 23, 2022
6f8a28f
update .gitmodules
binli2337 Mar 24, 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
5 changes: 4 additions & 1 deletion CDEPS-interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# CDEPS compiler flags
if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS "-g -fbacktrace -ffree-line-length-none")
if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz")
endif()
set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )
elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
Expand Down Expand Up @@ -69,7 +72,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 FV3
Open in desktop
Submodule FV3 updated 1 files
+1 −1 upp
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
334 changes: 174 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,022 changes: 511 additions & 511 deletions tests/RegressionTests_gaea.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

687 changes: 342 additions & 345 deletions tests/RegressionTests_wcoss_cray.log
View file
Open in desktop

Large diffs are not rendered by default.

1,425 changes: 752 additions & 673 deletions tests/RegressionTests_wcoss_dell_p3.log
View file
Open in desktop

Large diffs are not rendered by default.

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=20220322
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 |
25 changes: 15 additions & 10 deletions tests/rt_weekly.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,22 @@
# Weekly tests #
###################################################################################################################################################################################

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

# CPLD Benchmark 35d tests
# The length of forecast is 5 days for the weekly tests.
COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | + hera.intel | fv3 | |
RUN | cpld_bmark_p8_35d | | fv3 | | 2012010100
RUN | cpld_bmark_p8_35d | | fv3 | | 2012040100
RUN | cpld_bmark_p8_35d | | fv3 | | 2012070100
RUN | cpld_bmark_p8_35d | | fv3 | | 2012100100
RUN | cpld_bmark_p8_35d | | fv3 | | 2013010100
RUN | cpld_bmark_p8_35d | | fv3 | | 2013040100
RUN | cpld_bmark_p8_35d | | fv3 | | 2013070100
RUN | cpld_bmark_p8_35d | | fv3 | | 2013100100
RUN | cpld_bmark_p8_35d | + hera.intel | fv3 | | 2012010100
RUN | cpld_bmark_p8_35d | + hera.intel | fv3 | | 2012040100
RUN | cpld_bmark_p8_35d | + hera.intel | fv3 | | 2012070100
RUN | cpld_bmark_p8_35d | + hera.intel | fv3 | | 2012100100
RUN | cpld_bmark_p8_35d | + hera.intel | fv3 | | 2013010100
RUN | cpld_bmark_p8_35d | + hera.intel | fv3 | | 2013040100
RUN | cpld_bmark_p8_35d | + hera.intel | fv3 | | 2013070100
RUN | cpld_bmark_p8_35d | + hera.intel | 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
junwang-noaa marked this conversation as resolved.
Show resolved Hide resolved

export DAYS=1.5
export FHMAX=36
Expand Down