Add a new CDEPS test to use GSFv16 data mode in CDEPS ,update rt_week…

…ly.conf and update MOM6 to main branch (20211220) (#976) * add a new cdeps test using GFS data mode * update rt_weekly.conf to include cpld_bmark_p7_35d tests * update MOM6 Co-authored-by: jiandewang <jiande.wang@noaa.gov>
ufs-community · Dec 29, 2021 · 629be05 · 629be05
1 parent e9155a9
commit 629be05
Show file tree

Hide file tree

Showing 15 changed files with 1,970 additions and 1,833 deletions.
diff --git a/MOM6-interface/CMakeLists.txt b/MOM6-interface/CMakeLists.txt
@@ -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)

diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/MOM6-interface/mom6_files.cmake b/MOM6-interface/mom6_files.cmake
@@ -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
@@ -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

diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/parm/datm.streams.IN b/tests/parm/datm.streams.IN
@@ -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

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -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 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -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
 

diff --git a/tests/rt_weekly.conf b/tests/rt_weekly.conf
@@ -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
diff --git a/tests/tests/cpld_bmark_p7_35d b/tests/tests/cpld_bmark_p7_35d
@@ -17,10 +17,10 @@ export SHOUR=00
 export SECS=`expr $SHOUR \* 3600`
 export BMIC=.true.
 
-export DAYS=35
-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

diff --git a/tests/tests/datm_cdeps_3072x1536_cfsr b/tests/tests/datm_cdeps_3072x1536_cfsr
@@ -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
+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