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

Add a new CDEPS test to use GSFv16 data mode in CDEPS ,update rt_weekly.conf and update MOM6 to main branch (20211220) #976

Merged
merged 20 commits into from
Dec 29, 2021
Merged

Add a new CDEPS test to use GSFv16 data mode in CDEPS ,update rt_weekly.conf and update MOM6 to main branch (20211220) #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fe31b3a
added a new cdeps test using GFS data mode
binli2337 Dec 23, 2021
b1bde3e
update rt_weekly.conf to include cpld_bmark_p7_35d tests
binli2337 Dec 23, 2021
6b23de1
Merge branch 'ufs-community:develop' into add_cfsr_3072x1536
binli2337 Dec 23, 2021
fdcc0a2
modify cpld_bmark_p7_35d
binli2337 Dec 24, 2021
2cf244b
update rt.sh
binli2337 Dec 25, 2021
7ff53b5
modify tests/datm_cdeps_3072x1536_cfsr
binli2337 Dec 27, 2021
e62d800
Merge branch 'ufs-community:develop' into add_cfsr_3072x1536
binli2337 Dec 27, 2021
1a02498
modify datm_cdeps_3072x1536_cfsr
binli2337 Dec 28, 2021
15ebc55
Merge branch 'ufs-community:develop' into add_cfsr_3072x1536
binli2337 Dec 28, 2021
517a286
Merge branch 'ufs-community:develop' into add_cfsr_3072x1536
binli2337 Dec 28, 2021
415c61f
pointing MOM6 to testing branch, modify MOM6 cmake file to reflect ch…
jiandewang Dec 28, 2021
31909af
modify datm_cdeps_3072x1536_cfsr
binli2337 Dec 29, 2021
205b5b0
add hera.intel log file
binli2337 Dec 29, 2021
0fd862f
add orion.intel log file
binli2337 Dec 29, 2021
5966b92
add jet.intel log file
binli2337 Dec 29, 2021
54417e5
RT JOBS PASSED: hera.gnu. Log file uploaded.
BrianCurtis-NOAA Dec 29, 2021
e37f3d2
RT JOBS PASSED: gaea.intel. Log file uploaded.
BrianCurtis-NOAA Dec 29, 2021
19fcad3
RT JOBS PASSED: hera.gnu. Log file uploaded.
BrianCurtis-NOAA Dec 29, 2021
11b973e
add wcoss_dell_p3 log file
binli2337 Dec 29, 2021
fb021c1
update MOM6 and .gitmodules
binli2337 Dec 29, 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
1 change: 1 addition & 0 deletions MOM6-interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ target_include_directories(mom6_nuopc_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURR
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
target_link_libraries(mom6_nuopc_obj PRIVATE mom6_obj
fms
stochastic_physics
esmf)
# OpenMP is disabled in MOM6
#if(OpenMP_Fortran_FOUND)
Expand Down
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Open in desktop
Submodule MOM6 updated 6 files
+6 −14 config_src/drivers/nuopc_cap/mom_cap.F90
+17 −8 config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90
+0 −68 config_src/external/OCEAN_stochastic_phyiscs/MOM_stochastics_stub.F90
+68 −0 config_src/external/stochastic_physics/stochastic_physics.F90
+12 −23 src/parameterizations/stochastic/MOM_stochastics.F90
+2 −2 src/parameterizations/vertical/MOM_energetic_PBL.F90
3 changes: 2 additions & 1 deletion MOM6-interface/mom6_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ list(APPEND mom6_src_files
MOM6/src/parameterizations/CVmix/cvmix_tidal.F90
MOM6/src/parameterizations/CVmix/cvmix_utils.F90

MOM6/src/parameterizations/stochastic/MOM_stochastics.F90

MOM6/src/tracer/DOME_tracer.F90

MOM6/src/tracer/ISOMIP_tracer.F90
Expand Down Expand Up @@ -255,7 +257,6 @@ list(APPEND mom6_src_files
MOM6/config_src/external/ODA_hooks/ocean_da_core.F90
MOM6/config_src/external/ODA_hooks/ocean_da_types.F90
MOM6/config_src/external/ODA_hooks/write_ocean_obs.F90
MOM6/config_src/external/OCEAN_stochastic_phyiscs/MOM_stochastics.F90

MOM6/config_src/infra/FMS1/MOM_coms_infra.F90
MOM6/config_src/infra/FMS1/MOM_constants.F90
Expand Down
691 changes: 352 additions & 339 deletions tests/RegressionTests_gaea.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

717 changes: 365 additions & 352 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

647 changes: 330 additions & 317 deletions tests/RegressionTests_jet.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

699 changes: 356 additions & 343 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

776 changes: 409 additions & 367 deletions tests/RegressionTests_wcoss_dell_p3.log
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions tests/parm/datm.streams.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ tInterpAlgo01: linear
readMode01: single
dtlimit01: 1.0
stream_offset01: 0
yearFirst01: 2011
yearLast01: 2011
yearAlign01: 2011
yearFirst01: @[SYEAR]
yearLast01: @[SYEAR]
yearAlign01: @[SYEAR]
stream_vectors01: "u:v"
stream_mesh_file01: @[MESH_ATM]
stream_lev_dimname01: null
Expand Down
1 change: 1 addition & 0 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ RUN | datm_cdeps_mx025_cfsr
RUN | datm_cdeps_mx025_gefs | - wcoss_cray | fv3 |

RUN | datm_cdeps_multiple_files_cfsr | - wcoss_cray | |
RUN | datm_cdeps_3072x1536_cfsr | - wcoss_cray | fv3 |

COMPILE | -DAPP=NG-GODAS -DDEBUG=ON | - 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 @@ -461,7 +461,7 @@ if [[ $SINGLE_NAME != '' ]]; then
rt_single
fi

if [[ $TESTS_FILE =~ '35d' ]]; then
if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
TEST_35D=true
fi

Expand Down
16 changes: 14 additions & 2 deletions tests/rt_weekly.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,17 @@
# 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 | | fv3 |
RUN | control_c768 | - wcoss_cray | fv3 |

# CPLD Benchmark 35d tests
# The length of forecast is one day for the weekly tests.
COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1 | + hera.intel | fv3 | |
RUN | cpld_bmark_p7_35d | | fv3 | | 2012010100
RUN | cpld_bmark_p7_35d | | fv3 | | 2012040100
RUN | cpld_bmark_p7_35d | | fv3 | | 2012070100
RUN | cpld_bmark_p7_35d | | fv3 | | 2012100100
RUN | cpld_bmark_p7_35d | | fv3 | | 2013010100
RUN | cpld_bmark_p7_35d | | fv3 | | 2013040100
RUN | cpld_bmark_p7_35d | | fv3 | | 2013070100
RUN | cpld_bmark_p7_35d | | fv3 | | 2013100100
6 changes: 3 additions & 3 deletions tests/tests/cpld_bmark_p7_35d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ export SHOUR=00
export SECS=`expr $SHOUR \* 3600`
export BMIC=.true.

export DAYS=35
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you mean to change to DAYS=1 and FHMAX=24? If commented out, what values are 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.

DAYS=1

export FHMAX=840
#export DAYS=35
#export FHMAX=840
export RESTART_N=`expr ${FHMAX} - ${FHROT}`
export WLCLK=480
#export WLCLK=480

export TASKS=1700
export TPN=$TPN_cpl_thrd
Expand Down
28 changes: 28 additions & 0 deletions tests/tests/datm_cdeps_3072x1536_cfsr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#
# DATM_CDEPS_MOM6_CICE_CMEPS_CFSR_3072x1536 test
#

export TEST_DESCR="DATM_CDEPS-MOM6-CICE-CMEPS_CFSR_3072x1536 - control "

export CNTL_DIR="datm_cdeps_3072x1536_cfsr"

export LIST_FILES="RESTART/MOM.res.nc \
RESTART/iced.2011-10-02-00000.nc \
RESTART/DATM_CFSR3072x1536.cpl.r.2011-10-02-00000.nc"

export_datm_cdeps
export DATM_SRC="CFSR3072x1536"
export FILENAME_BASE='cfsr.'
export WLCLK=15
export IATM=3072
export JATM=1536
export ATM_NX_GLB=$IATM
export ATM_NY_GLB=$JATM
export ATMRES=3072x1536
export mesh_file=gfs_mesh.nc
export MESH_ATM=DATM_INPUT/${mesh_file}
export atm_datamode=GFS
export RESTART_N=12
export stream_files="DATM_INPUT/cfsr.2011100100_3072x1536.nc DATM_INPUT/cfsr.2011100106_3072x1536.nc DATM_INPUT/cfsr.2011100112_3072x1536.nc DATM_INPUT/cfsr.2011100118_3072x1536.nc DATM_INPUT/cfsr.2011100200_3072x1536.nc"
export eps_imesh='2.5e-1'
export FV3_RUN=cpld_datm_cdeps.IN