try setting all 3 restart tests

DeniseWorthen · Mar 21, 2022 · ca298e6 · ca298e6
1 parent 7332dd2
commit ca298e6
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 19 deletions.
diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
@@ -1,7 +1,7 @@
 #
-#  cpld_control_c192_p8  test
+#  cpld_control_c192_p8 test
 #
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C192 MX050 - P8 test"
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C192 MX050 - P8 test"
 
 export CNTL_DIR="cpld_control_c192_p8"
 
@@ -17,8 +17,6 @@ export LIST_FILES="sfcf036.tile1.nc \
                    atmf036.tile4.nc \
                    atmf036.tile5.nc \
                    atmf036.tile6.nc \
-                   20210323.180000.out_grd.ww3 \
-                   20210323.180000.out_pnt.ww3 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -53,7 +51,10 @@ export LIST_FILES="sfcf036.tile1.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-64800.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc"
+                   RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc \
+                   gocart.inst_aod.20210323_1800z.nc4 \
+                   20210323.180000.out_grd.ww3 \
+                   20210323.180000.out_pnt.ww3 "
 
 export_fv3
 export_cpl
@@ -72,6 +73,7 @@ export WRTTASK_PER_GROUP=$WPG_cpl_c192
 
 export med_petlist_bounds=$MPB_cpl_c192
 export atm_petlist_bounds=$APB_cpl_c192
+export chm_petlist_bounds=$CHM_cpl_c192
 export ocn_petlist_bounds=$OPB_cpl_c192
 export ice_petlist_bounds=$IPB_cpl_c192
 export wav_petlist_bounds=$WPB_cpl_c192
@@ -130,6 +132,7 @@ export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
 export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 
+export CPLCHM=.true.
 export CPLWAV=.true.
 export CPLWAV2ATM=.true.
 export MOM6_USE_WAVES=True

diff --git a/tests/tests/cpld_control_c384_p8 b/tests/tests/cpld_control_c384_p8
@@ -1,14 +1,12 @@
 #
 #  cpld_control_c384_p8 test
 #
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX025 - P8 test "
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - P8 test "
 
 export CNTL_DIR="cpld_control_c384_p8"
 
 export LIST_FILES="sfcf006.nc \
                    atmf006.nc \
-                   20210322.120000.out_pnt.ww3 \
-                   20210322.120000.out_grd.ww3 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -46,7 +44,10 @@ export LIST_FILES="sfcf006.nc \
                    RESTART/MOM.res_2.nc \
                    RESTART/MOM.res_3.nc \
                    RESTART/iced.2021-03-22-43200.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc"
+                   RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc \
+                   gocart.inst_aod.20210322_1200z.nc4 \
+                   20210322.120000.out_pnt.ww3 \
+                   20210322.120000.out_grd.ww3 "
 
 export_fv3
 export_cpl
@@ -67,6 +68,7 @@ export WRTTASK_PER_GROUP=$WPG_cpl_c384
 
 export med_petlist_bounds=$MPB_cpl_c384
 export atm_petlist_bounds=$APB_cpl_c384
+export chm_petlist_bounds=$CHM_cpl_c384
 export ocn_petlist_bounds=$OPB_cpl_c384
 export ice_petlist_bounds=$IPB_cpl_c384
 export wav_petlist_bounds=$WPB_cpl_c384
@@ -126,6 +128,7 @@ export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
 export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 
+export CPLCHM=.true.
 export CPLWAV=.true.
 export CPLWAV2ATM=.true.
 export MOM6_USE_WAVES=True

diff --git a/tests/tests/cpld_control_c96_p8 b/tests/tests/cpld_control_c96_p8
@@ -2,7 +2,7 @@
 #  cpld_control C96 P8 test
 #
 
-export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS system - C96MX100"
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100"
 
 export CNTL_DIR="cpld_control_c96_p8"
 

diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8
@@ -1,7 +1,7 @@
 #
 #  cpld_restart_c192_p8 test
 #
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C192 MX050 - 24h P8 restart test"
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C192 MX050 - P8 test"
 
 export CNTL_DIR="cpld_control_c192_p8"
 
@@ -17,8 +17,6 @@ export LIST_FILES="sfcf036.tile1.nc \
                    atmf036.tile4.nc \
                    atmf036.tile5.nc \
                    atmf036.tile6.nc \
-                   20210323.180000.out_grd.ww3 \
-                   20210323.180000.out_pnt.ww3 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -53,7 +51,10 @@ export LIST_FILES="sfcf036.tile1.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-64800.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc"
+                   RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc \
+                   gocart.inst_aod.20210323_1800z.nc4 \
+                   20210323.180000.out_grd.ww3 \
+                   20210323.180000.out_pnt.ww3 "
 
 export_fv3
 export_cpl
@@ -77,6 +78,7 @@ export WRTTASK_PER_GROUP=$WPG_cpl_c192
 
 export med_petlist_bounds=$MPB_cpl_c192
 export atm_petlist_bounds=$APB_cpl_c192
+export chm_petlist_bounds=$CHM_cpl_c192
 export ocn_petlist_bounds=$OPB_cpl_c192
 export ice_petlist_bounds=$IPB_cpl_c192
 export wav_petlist_bounds=$WPB_cpl_c192
@@ -155,6 +157,7 @@ export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
 export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 
+export CPLCHM=.true.
 export CPLWAV=.true.
 export CPLWAV2ATM=.true.
 export MOM6_USE_WAVES=True

diff --git a/tests/tests/cpld_restart_c384_p8 b/tests/tests/cpld_restart_c384_p8
@@ -1,14 +1,12 @@
 #
 #  cpld_restart_c384_p8 test
 #
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX025 - P8 restart"
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - P8 test "
 
 export CNTL_DIR="cpld_control_c384_p8"
 
 export LIST_FILES="sfcf006.nc \
                    atmf006.nc \
-                   20210322.120000.out_pnt.ww3 \
-                   20210322.120000.out_grd.ww3 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -46,7 +44,10 @@ export LIST_FILES="sfcf006.nc \
                    RESTART/MOM.res_2.nc \
                    RESTART/MOM.res_3.nc \
                    RESTART/iced.2021-03-22-43200.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc"
+                   RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc \
+                   gocart.inst_aod.20210322_1200z.nc4 \
+                   20210322.120000.out_pnt.ww3 \
+                   20210322.120000.out_grd.ww3 "
 
 export_fv3
 export_cpl
@@ -72,6 +73,7 @@ export WRTTASK_PER_GROUP=$WPG_cpl_c384
 
 export med_petlist_bounds=$MPB_cpl_c384
 export atm_petlist_bounds=$APB_cpl_c384
+export chm_petlist_bounds=$CHM_cpl_c384
 export ocn_petlist_bounds=$OPB_cpl_c384
 export ice_petlist_bounds=$IPB_cpl_c384
 export wav_petlist_bounds=$WPB_cpl_c384
@@ -151,6 +153,7 @@ export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
 export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 
+export CPLCHM=.true.
 export CPLWAV=.true.
 export CPLWAV2ATM=.true.
 export MOM6_USE_WAVES=True

diff --git a/tests/tests/cpld_restart_c96_p8 b/tests/tests/cpld_restart_c96_p8
@@ -2,7 +2,7 @@
 #  cpld_restart C96 P8 test
 #
 
-export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS system - C96MX100"
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100"
 
 export CNTL_DIR="cpld_control_c96_p8"