update with fv3 & ccpp/physics updates in order to turn the NSST mode…

…l on in the coupled model (Replace PR NOAA-EMC#453) (NOAA-EMC#483) * point to fv3 branch * Add one more test cpld_control_nsst to test added ccpp suite (FV3_GFS_v15p2_couplednsst) * Modify rt.conf to add FV3_GFS_v15p2_couplednsst * Modify rt.conf to add a new test, cpld_bmarkfrac_v16_nsst, remove test cpld_control_nsst * Modify tests/tests/cpld_bmarkfrac_v16_nsst: 1. cpld_bmarkfrac_v16 to cpld_bmarkfrac_v16_nsst. 2. export NSTF_NAME=2,1,0,0,0 to export nstf_name=2,1,0,0,0. * Modify input.benchmark_v16.nml.IN & cpld_bmarkfrac_v16_nsst for a consistent definition of nstf_name namelist * Modify cpld_bmarkfrac_v16_nsst by moving the NSTF_NAME to the namelist field updates section * RegressionTests_orion.intel.log of the rt run and BL_DATE=20210406 in rt.sh * RT JOBS PASSED: hera.intel. Log file uploaded. * run-ci, commit 7 RegressionTest log files * Push RegressionTests_wcoss_dell_p3.log Co-authored-by: Brian Curtis <[email protected]>
SamuelTrahanNOAA · Apr 9, 2021 · b78797f · b78797f
1 parent b8ed338
commit b78797f
Show file tree

Hide file tree

Showing 14 changed files with 3,078 additions and 2,504 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
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_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/parm/input.benchmark_v16.nml.IN b/tests/parm/input.benchmark_v16.nml.IN
@@ -181,8 +181,8 @@
   iopt_tbot    = 2
   iopt_stc     = 1
   debug        = .false.
-  nstf_name    = 0,0,0,0,0
   frac_grid    = @[FRAC_GRID]
+  nstf_name    = @[NSTF_NAME]
   nst_anl      = .false.
   psautco      = 0.0008,0.0005
   prautco      = 0.00015,0.00015

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -128,7 +128,7 @@ RUN     | fv3_gfs_v16_ras_debug
 # CPLD tests                                                                                                                                                                      #
 ###################################################################################################################################################################################
 
-COMPILE | APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled             | - wcoss_cray jet.intel                  | fv3 |
+COMPILE | APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled,FV3_GFS_v16_couplednsst             | - wcoss_cray jet.intel                  | fv3 |
 RUN     | cpld_control                                                                                                            | - wcoss_cray jet.intel                  | fv3 |
 RUN     | cpld_restart                                                                                                            | - wcoss_cray jet.intel                  |     | cpld_control
 RUN     | cpld_controlfrac                                                                                                        | - wcoss_cray jet.intel                  | fv3 |
@@ -158,6 +158,7 @@ RUN     | cpld_restart_bmarkfrac
 #6h/6h/12h restart test
 # test fails on gaea with esmfpio error
 RUN     | cpld_bmarkfrac_v16                                                                                                      | - wcoss_cray gaea.intel jet.intel       | fv3 |
+RUN     | cpld_bmarkfrac_v16_nsst                                                                                                 | - wcoss_cray gaea.intel jet.intel       | fv3 |
 RUN     | cpld_restart_bmarkfrac_v16                                                                                              | - wcoss_cray gaea.intel jet.intel       |     | cpld_bmarkfrac_v16
 
 COMPILE | APP=S2SW SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled            | - wcoss_cray gaea.intel jet.intel       | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -413,7 +413,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20210401
+BL_DATE=20210406
 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

diff --git a/tests/tests/cpld_bmarkfrac_v16_nsst b/tests/tests/cpld_bmarkfrac_v16_nsst
@@ -0,0 +1,150 @@
+#
+#  cpld_bmarkfrac_v16_nsst test
+#
+
+export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX025 - Benchmark test - frac grid - v16"
+
+export CNTL_DIR="cpld_bmarkfrac_v16_nsst"
+
+export LIST_FILES="phyf012.tile1.nc \
+                   phyf012.tile2.nc \
+                   phyf012.tile3.nc \
+                   phyf012.tile4.nc \
+                   phyf012.tile5.nc \
+                   phyf012.tile6.nc \
+                   dynf012.tile1.nc \
+                   dynf012.tile2.nc \
+                   dynf012.tile3.nc \
+                   dynf012.tile4.nc \
+                   dynf012.tile5.nc \
+                   dynf012.tile6.nc \
+                   RESTART/coupler.res \
+                   RESTART/fv_core.res.nc \
+                   RESTART/fv_core.res.tile1.nc \
+                   RESTART/fv_core.res.tile2.nc \
+                   RESTART/fv_core.res.tile3.nc \
+                   RESTART/fv_core.res.tile4.nc \
+                   RESTART/fv_core.res.tile5.nc \
+                   RESTART/fv_core.res.tile6.nc \
+                   RESTART/fv_srf_wnd.res.tile1.nc \
+                   RESTART/fv_srf_wnd.res.tile2.nc \
+                   RESTART/fv_srf_wnd.res.tile3.nc \
+                   RESTART/fv_srf_wnd.res.tile4.nc \
+                   RESTART/fv_srf_wnd.res.tile5.nc \
+                   RESTART/fv_srf_wnd.res.tile6.nc \
+                   RESTART/fv_tracer.res.tile1.nc \
+                   RESTART/fv_tracer.res.tile2.nc \
+                   RESTART/fv_tracer.res.tile3.nc \
+                   RESTART/fv_tracer.res.tile4.nc \
+                   RESTART/fv_tracer.res.tile5.nc \
+                   RESTART/fv_tracer.res.tile6.nc \
+                   RESTART/phy_data.tile1.nc \
+                   RESTART/phy_data.tile2.nc \
+                   RESTART/phy_data.tile3.nc \
+                   RESTART/phy_data.tile4.nc \
+                   RESTART/phy_data.tile5.nc \
+                   RESTART/phy_data.tile6.nc \
+                   RESTART/sfc_data.tile1.nc \
+                   RESTART/sfc_data.tile2.nc \
+                   RESTART/sfc_data.tile3.nc \
+                   RESTART/sfc_data.tile4.nc \
+                   RESTART/sfc_data.tile5.nc \
+                   RESTART/sfc_data.tile6.nc \
+                   RESTART/MOM.res.nc \
+                   RESTART/MOM.res_1.nc \
+                   RESTART/MOM.res_2.nc \
+                   RESTART/MOM.res_3.nc \
+                   RESTART/iced.2013-04-01-43200.nc \
+                   RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc"
+
+export_fv3
+export_cpl
+
+export SYEAR="2013"
+export SMONTH="04"
+export SDAY="01"
+export SHOUR="00"
+
+export DAYS="0.5"
+export FHMAX="12"
+export RESTART_INTERVAL="6"
+export RESTART_N=${RESTART_INTERVAL}
+
+export TASKS=$TASKS_cpl_bmrk
+export TPN=$TPN_cpl_bmrk
+export INPES=$INPES_cpl_bmrk
+export JNPES=$JNPES_cpl_bmrk
+export THRD=$THRD_cpl_bmrk
+export WRTTASK_PER_GROUP=$WPG_cpl_bmrk
+
+export med_petlist_bounds=$MPB_cpl_bmrk
+export atm_petlist_bounds=$APB_cpl_bmrk
+export ocn_petlist_bounds=$OPB_cpl_bmrk
+export ice_petlist_bounds=$IPB_cpl_bmrk
+
+# atm/ocn/ice resolution
+export ATMRES='C384'
+export NPX=385
+export NPY=385
+export IMO=1536
+export JMO=768
+
+export OCNRES='025'
+export ICERES='0.25'
+export NX_GLB=1440
+export NY_GLB=1080
+export NPROC_ICE='48'
+
+# resolution dependent setting
+export CDMBWD=${CDMBWD_c384}
+
+# set component and coupling timesteps
+export DT_ATMOS='225'
+export DT_CICE=${DT_ATMOS}
+export DT_DYNAM_MOM6='900'
+export DT_THERM_MOM6='1800'
+export CPL_SLOW=${DT_THERM_MOM6}
+export CPL_FAST=${DT_ATMOS}
+
+# nems.configure
+export coupling_interval_slow_sec=${CPL_SLOW}
+export coupling_interval_fast_sec=${CPL_FAST}
+
+export FRAC_GRID='.T.'
+export CPLMODE='nems_frac'
+
+export NPZ=127
+export NPZP=128
+export PSM_BC=1
+export DDDMP=0.2
+export NSTF_NAME=2,1,0,0,0
+
+# resolution dependent files
+export MOM_INPUT="MOM_input_template_${OCNRES}"
+export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
+export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
+export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
+export CHLCLIM="seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc"
+export FRUNOFF="runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc"
+
+export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
+export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
+export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
+export FNSMCC="'global_soilmgldas.statsgo.t766.1536.768.grb',"
+export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
+
+export OZ_PHYS_NEW=".T."
+
+export MOM6_RIVER_RUNOFF='True'
+export MOM6_RESTART_SETTING="r"
+export MOM6_REPRO_LA='True'
+
+export RUNID="cpcice"
+
+export INPUT_NML=input.benchmark_v16.nml.IN
+
+export FIELD_TABLE="field_table_gfsv16"
+export DIAG_TABLE="diag_table_bmark_v16_template"
+export SUITE_NAME="FV3_GFS_v16_couplednsst"
+
+export FV3_RUN=cpld_bmark_run.IN