rename tests

* create remaining control (c96) tests for decomp etc but compare against existing baseline name (control_c96). * update rt.wave_aero for new tests
DeniseWorthen · Mar 23, 2022 · baca83b · baca83b
1 parent 4583940
commit baca83b
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 73 deletions.
diff --git a/tests/rt.wave_aero b/tests/rt.wave_aero
@@ -3,8 +3,11 @@
 ###################################################################################################################################################################################
 
 COMPILE | -DAPP=S2SW -DUFS_GOCART=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                         | - wcoss_cray                            | fv3 |
-RUN     | cpld_control_c96_p8                                                                                                     | - wcoss_cray                            | fv3 |
-RUN     | cpld_restart_c96_p8                                                                                                     | - wcoss_cray                            |     | cpld_control_c96_p8
+RUN     | cpld_control_p8                                                                                                         | - wcoss_cray                            | fv3 |
+RUN     | cpld_restart_p8                                                                                                         | - wcoss_cray                            |     | cpld_control_p8
+RUN     | cpld_2threads_p8                                                                                                        | - wcoss_cray                            |     |
+RUN     | cpld_decomp_p8                                                                                                          | - wcoss_cray jet.intel                  |     |
+RUN     | cpld_mpi_p8                                                                                                             | - wcoss_cray                            |     |
 
 RUN     | cpld_control_c192_p8                                                                                                    | - wcoss_cray                            | fv3 |
 RUN     | cpld_restart_c192_p8                                                                                                    | - wcoss_cray                            |     | cpld_control_c192_p8
@@ -13,7 +16,7 @@ RUN     | cpld_control_c384_p8
 RUN     | cpld_restart_c384_p8                                                                                                    | - wcoss_cray                            |     | cpld_control_c384_p8
 
 COMPILE | -DAPP=S2SW -DUFS_GOCART=ON -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                              | - wcoss_cray                            | fv3 |
-RUN     | cpld_debug_c96_p8                                                                                                       | - wcoss_cray                            | fv3 |
+RUN     | cpld_debug_p8                                                                                                           | - wcoss_cray                            | fv3 |
 ###################################################################################################################################################################################
 # HAFS tests                                                                                                                                                                      #
 ###################################################################################################################################################################################

diff --git a/tests/tests/cpld_2threads_p8 b/tests/tests/cpld_2threads_p8
@@ -4,7 +4,8 @@
 
 export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 - 2 threads"
 
-export CNTL_DIR="cpld_control_p8"
+export CNTL_DIR="cpld_control_c96_p8"
+#export CNTL_DIR="cpld_control_p8"
 
 export LIST_FILES="sfcf024.tile1.nc \
                    sfcf024.tile2.nc \
@@ -18,6 +19,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    atmf024.tile4.nc \
                    atmf024.tile5.nc \
                    atmf024.tile6.nc \
+                   gocart.inst_aod.20210323_0600z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -53,10 +55,10 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   gocart.inst_aod.20210323_0600z.nc4 \
-                   20210323.060000.out_grd.glo_1deg \
-                   20210323.060000.out_pnt.points \
-                   20210323.060000.restart.glo_1deg"
+                   20210323.060000.out_pnt.ww3 \
+                   20210323.060000.out_grd.ww3 "
+
+#TODO: add comparison of CA restart files?
 
 export_fv3
 export_cpl
@@ -83,10 +85,8 @@ export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
 
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
-export CPLCHM=.true.
-export NEMS_CONFIGURE=nems.configure.cpld_aero_wave.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
-
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_control_p8 b/tests/tests/cpld_control_p8
@@ -4,7 +4,8 @@
 
 export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100"
 
-export CNTL_DIR="cpld_control_p8"
+export CNTL_DIR="cpld_control_c96_p8"
+#export CNTL_DIR="cpld_control_p8"
 
 export LIST_FILES="sfcf021.tile1.nc \
                    sfcf021.tile2.nc \
@@ -30,6 +31,7 @@ export LIST_FILES="sfcf021.tile1.nc \
                    atmf024.tile4.nc \
                    atmf024.tile5.nc \
                    atmf024.tile6.nc \
+                   gocart.inst_aod.20210323_0600z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -65,10 +67,10 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   gocart.inst_aod.20210323_0600z.nc4 \
-                   20210323.060000.out_grd.glo_1deg \
-                   20210323.060000.out_pnt.points \
-                   20210323.060000.restart.glo_1deg"
+                   20210323.060000.out_pnt.ww3 \
+                   20210323.060000.out_grd.ww3 "
+
+#TODO: add comparison of CA restart files?
 
 export_fv3
 export_cpl
@@ -77,10 +79,8 @@ export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
 export OUTPUT_FH='0 21 24'
 
-export CPLCHM=.true.
-export NEMS_CONFIGURE=nems.configure.cpld_aero_wave.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
-
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_debug_p8 b/tests/tests/cpld_debug_p8
@@ -2,9 +2,10 @@
 #  cpld_debug_p8 test
 #
 
-export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS system - C96MX100 - P8 debug"
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 P8 debug"
 
-export CNTL_DIR="cpld_debug_p8"
+export CNTL_DIR="cpld_debug_c96_p8"
+#export CNTL_DIR="cpld_debug_p8"
 
 export LIST_FILES="sfcf003.tile1.nc \
                    sfcf003.tile2.nc \
@@ -18,7 +19,6 @@ export LIST_FILES="sfcf003.tile1.nc \
                    atmf003.tile4.nc \
                    atmf003.tile5.nc \
                    atmf003.tile6.nc \
-                   gocart.inst_aod.20210322_0900z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -57,40 +57,19 @@ export LIST_FILES="sfcf003.tile1.nc \
                    20210322.090000.out_pnt.ww3 \
                    20210322.090000.out_grd.ww3 "
 
+# TODO: need fix to produce at fhmax
+#                   gocart.inst_aod.20210322_0900z.nc4 \
+
 export_fv3
 export_cpl
 
-export DAYS=0.125
 export FHMAX=3
+export DAYS=0.125
+export RESTART_N=${FHMAX}
 export OUTPUT_FH="3 -1"
 
-export RESTART_N=${FHMAX}
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
-export TASKS=$TASKS_cpl_c96
-export TPN=$TPN_cpl_c96
-export INPES=$INPES_cpl_c96
-export JNPES=$JNPES_cpl_c96
-export THRD=$THRD_cpl_c96
-export WRTTASK_PER_GROUP=$WPG_cpl_c96
-
-export NPROC_ICE=$NPROC_ICE_cpl_c96
-export np2=`expr $NPROC_ICE / 2`
-export BLCKX=`expr $NX_GLB / $np2`
-export BLCKY=`expr $NY_GLB / 2`
-
-export med_petlist_bounds=$MPB_cpl_c96
-export atm_petlist_bounds=$APB_cpl_c96
-export chm_petlist_bounds=$CHM_cpl_c96
-export ocn_petlist_bounds=$OPB_cpl_c96
-export ice_petlist_bounds=$IPB_cpl_c96
-
-export CPLWAV=.false.
-export CPLWAV2ATM=.false.
-export MOM6_USE_WAVES=False
-
-export CPLCHM=.true.
-export NEMS_CONFIGURE=nems.configure.cpld_aero.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
-
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_decomp_p8 b/tests/tests/cpld_decomp_p8
@@ -1,10 +1,11 @@
 #
-#  cpld_decomp P8 test
+#  cpld_control P8 test
 #
 
 export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 - decomp test"
 
-export CNTL_DIR="cpld_control_p8"
+export CNTL_DIR="cpld_control_c96_p8"
+#export CNTL_DIR="cpld_control_p8"
 
 export LIST_FILES="sfcf024.tile1.nc \
                    sfcf024.tile2.nc \
@@ -18,6 +19,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    atmf024.tile4.nc \
                    atmf024.tile5.nc \
                    atmf024.tile6.nc \
+                   gocart.inst_aod.20210323_0600z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -53,10 +55,10 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   gocart.inst_aod.20210323_0600z.nc4 \
-                   20210323.060000.out_grd.glo_1deg \
-                   20210323.060000.out_pnt.points \
-                   20210323.060000.restart.glo_1deg"
+                   20210323.060000.out_pnt.ww3 \
+                   20210323.060000.out_grd.ww3 "
+
+#TODO: add comparison of CA restart files?
 
 export_fv3
 export_cpl
@@ -83,10 +85,8 @@ export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
 
-export CPLCHM=.true.
-export NEMS_CONFIGURE=nems.configure.cpld_aero_wave.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
-
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_mpi_p8 b/tests/tests/cpld_mpi_p8
@@ -2,9 +2,10 @@
 #  cpld_mpi P8 test
 #
 
-export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 - change mpi task test"
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 MPI-task test"
 
-export CNTL_DIR="cpld_control_p8"
+export CNTL_DIR="cpld_control_c96_p8"
+#export CNTL_DIR="cpld_control_p8"
 
 export LIST_FILES="sfcf024.tile1.nc \
                    sfcf024.tile2.nc \
@@ -18,6 +19,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    atmf024.tile4.nc \
                    atmf024.tile5.nc \
                    atmf024.tile6.nc \
+                   gocart.inst_aod.20210323_0600z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -53,10 +55,10 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   gocart.inst_aod.20210323_0600z.nc4 \
-                   20210323.060000.out_grd.glo_1deg \
-                   20210323.060000.out_pnt.points \
-                   20210323.060000.restart.glo_1deg"
+                   20210323.060000.out_pnt.ww3 \
+                   20210323.060000.out_grd.ww3 "
+
+#TODO: add comparison of CA restart files?
 
 export_fv3
 export_cpl
@@ -83,10 +85,8 @@ export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
 
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
-export CPLCHM=.true.
-export NEMS_CONFIGURE=nems.configure.cpld_aero_wave.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
-
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_restart_c96_p8 → tests/tests/cpld_restart_p8 b/tests/tests/cpld_restart_c96_p8 → tests/tests/cpld_restart_p8
@@ -1,10 +1,11 @@
 #
-#  cpld_restart C96 P8 test
+#  cpld_restart P8 test
 #
 
 export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100"
 
 export CNTL_DIR="cpld_control_c96_p8"
+#export CNTL_DIR="cpld_control_p8"
 
 export LIST_FILES="sfcf024.tile1.nc \
                    sfcf024.tile2.nc \

diff --git a/tests/tests/cpld_control_c96_p8 → tests/tests/x.cpld_control_c96_p8 b/tests/tests/cpld_control_c96_p8 → tests/tests/x.cpld_control_c96_p8
diff --git a/tests/tests/cpld_debug_c96_p8 → tests/tests/x.cpld_debug_c96_p8 b/tests/tests/cpld_debug_c96_p8 → tests/tests/x.cpld_debug_c96_p8