update tests and settings to use ww3 netcdf restarts

DeniseWorthen · Aug 30, 2024 · 99719e6 · 99719e6
1 parent 5003ad6
commit 99719e6
Show file tree

Hide file tree

Showing 33 changed files with 38 additions and 38 deletions.
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -1036,11 +1036,11 @@ export_ww3() {
   export WW3_IC5='F'
   export WW3_user_histname='false'
   export WW3_historync='false'
-  export WW3_restartnc='false'
+  export WW3_restartnc='true'
   export WW3_restart_from_binary='false'
   # For either history_nc or restart_nc true
   export WW3_PIO_FORMAT='pnetcdf'
-  export WW3_PIO_STRIDE=-99
+  export WW3_PIO_STRIDE=4
   export WW3_PIO_IOTASKS=-99
   export WW3_PIO_REARR='box'
   export WW3_PIO_ROOT=-99
@@ -1456,11 +1456,11 @@ export_hafs_regional ()
   export WW3_OUTPARS="WND HS T01 T02 DIR FP DP PHS PTP PDIR UST CHA USP"
   export WW3_user_histname='false'
   export WW3_historync='false'
-  export WW3_restartnc='false'
+  export WW3_restartnc='true'
   export WW3_restart_from_binary='false'
   # For either history_nc or restart_nc true
   export WW3_PIO_FORMAT='pnetcdf'
-  export WW3_PIO_STRIDE=-99
+  export WW3_PIO_STRIDE=4
   export WW3_PIO_IOTASKS=-99
   export WW3_PIO_REARR='box'
   export WW3_PIO_ROOT=-99

diff --git a/tests/fv3_conf/control_run.IN b/tests/fv3_conf/control_run.IN
@@ -40,7 +40,7 @@ else
       cp  ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} .
       ls -1 ${RFILE}>rpointer.cpl
     fi
-    RFILE=ufs.atmw.ww3.r.${RESTART_FILE_SUFFIX_SECS}
+    RFILE=ufs.atmw.ww3.r.${RESTART_FILE_SUFFIX_SECS}.nc
     cp ../${DEP_RUN}${SUFFIX}/${RFILE} .
   fi
 

diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -149,7 +149,7 @@ else
 
      # WAVE restart file
      if [[ $CPLWAV == .true. ]]; then
-       RFILE=ufs.cpld.ww3.r.${RESTART_FILE_SUFFIX_SECS}
+       RFILE=ufs.cpld.ww3.r.${RESTART_FILE_SUFFIX_SECS}.nc
        cp ../${DEP_RUN}${SUFFIX}/${RFILE} .
      fi
 

diff --git a/tests/tests/atmwav_control_noaero_p8 b/tests/tests/atmwav_control_noaero_p8
@@ -47,7 +47,7 @@ export LIST_FILES="sfcf000.nc \
 		   RESTART/ufs.atmw.cpl.r.2021-03-22-64800.nc \
                    20210322.180000.out_pnt.ww3 \
                    20210322.180000.out_grd.ww3 \
-                   ufs.atmw.ww3.r.2021-03-22-64800"
+                   ufs.atmw.ww3.r.2021-03-22-64800.nc"
 
 export_fv3
 export_tiled
@@ -83,11 +83,11 @@ export WW3_MODDEF=mod_def.glo_1deg
 export MESH_WAV=mesh.glo_1deg.nc
 export WW3_user_histname='false'
 export WW3_historync='false'
-export WW3_restartnc='false'
+export WW3_restartnc='true'
 export WW3_restart_from_binary='false'
 # For either history_nc or restart_nc true
 export WW3_PIO_FORMAT='pnetcdf'
-export WW3_PIO_STRIDE=-99
+export WW3_PIO_STRIDE=4
 export WW3_PIO_IOTASKS=-99
 export WW3_PIO_REARR='box'
 export WW3_PIO_ROOT=-99

diff --git a/tests/tests/cpld_2threads_p8 b/tests/tests/cpld_2threads_p8
@@ -54,7 +54,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   ufs.cpld.ww3.r.2021-03-23-21600 \
+                   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8
@@ -48,7 +48,7 @@ export LIST_FILES="sfcf006.nc \
                    RESTART/20130401.060000.MOM.res_3.nc \
                    RESTART/iced.2013-04-01-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc \
-                   ufs.cpld.ww3.r.2013-04-01-21600 \
+                   ufs.cpld.ww3.r.2013-04-01-21600.nc \
                    20130401.060000.out_pnt.ww3 \
                    20130401.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
@@ -53,7 +53,7 @@ export LIST_FILES="sfcf030.tile1.nc \
                    RESTART/20210323.120000.MOM.res.nc \
                    RESTART/iced.2021-03-23-43200.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc \
-                   ufs.cpld.ww3.r.2021-03-23-43200 \
+                   ufs.cpld.ww3.r.2021-03-23-43200.nc \
                    20210323.120000.out_grd.ww3 \
                    20210323.120000.out_pnt.ww3 "
 

diff --git a/tests/tests/cpld_control_ciceC_p8 b/tests/tests/cpld_control_ciceC_p8
@@ -66,7 +66,7 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   ufs.cpld.ww3.r.2021-03-23-21600 \
+                   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_control_gfsv17 b/tests/tests/cpld_control_gfsv17
@@ -66,7 +66,7 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   ufs.cpld.ww3.r.2021-03-23-21600 \
+                   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_control_gfsv17_iau b/tests/tests/cpld_control_gfsv17_iau
@@ -45,7 +45,7 @@ export LIST_FILES="sfcf024.nc \
                    RESTART/20210323.120000.MOM.res.nc \
                    RESTART/iced.2021-03-23-43200.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc \
-                   ufs.cpld.ww3.r.2021-03-23-43200 \
+                   ufs.cpld.ww3.r.2021-03-23-43200.nc \
                    MOM6_OUTPUT/ocn_2021_03_23_09.nc \
                    history/iceh_06h.2021-03-23-43200.nc \
                    20210323.120000.out_pnt.ww3 \

diff --git a/tests/tests/cpld_control_noaero_p8 b/tests/tests/cpld_control_noaero_p8
@@ -65,7 +65,7 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-		   ufs.cpld.ww3.r.2021-03-23-21600 \
+		   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_control_p8 b/tests/tests/cpld_control_p8
@@ -66,7 +66,7 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-		   ufs.cpld.ww3.r.2021-03-23-21600 \
+		   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_control_p8.v2.sfc b/tests/tests/cpld_control_p8.v2.sfc
@@ -66,7 +66,7 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   ufs.cpld.ww3.r.2021-03-23-21600 \
+                   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_control_p8_faster b/tests/tests/cpld_control_p8_faster
@@ -66,7 +66,7 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   ufs.cpld.ww3.r.2021-03-23-21600 \
+                   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_control_p8_mixedmode b/tests/tests/cpld_control_p8_mixedmode
@@ -66,7 +66,7 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   ufs.cpld.ww3.r.2021-03-23-21600 \
+                   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_control_pdlib_p8 b/tests/tests/cpld_control_pdlib_p8
@@ -65,7 +65,7 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   ufs.cpld.ww3.r.2021-03-23-21600 \
+                   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_control_qr_p8 b/tests/tests/cpld_control_qr_p8
@@ -66,7 +66,7 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   ufs.cpld.ww3.r.2021-03-23-21600 \
+                   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_debug_gfsv17 b/tests/tests/cpld_debug_gfsv17
@@ -53,7 +53,7 @@ export LIST_FILES="sfcf003.tile1.nc \
                    RESTART/20210322.090000.MOM.res.nc \
                    RESTART/iced.2021-03-22-32400.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc \
-                   ufs.cpld.ww3.r.2021-03-22-32400 \
+                   ufs.cpld.ww3.r.2021-03-22-32400.nc \
                    20210322.090000.out_pnt.ww3 \
                    20210322.090000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_debug_noaero_p8 b/tests/tests/cpld_debug_noaero_p8
@@ -53,7 +53,7 @@ export LIST_FILES="sfcf003.tile1.nc \
                    RESTART/20210322.090000.MOM.res.nc \
                    RESTART/iced.2021-03-22-32400.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc \
-                   ufs.cpld.ww3.r.2021-03-22-32400 \
+                   ufs.cpld.ww3.r.2021-03-22-32400.nc \
                    20210322.090000.out_pnt.ww3 \
                    20210322.090000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_debug_p8 b/tests/tests/cpld_debug_p8
@@ -54,7 +54,7 @@ export LIST_FILES="sfcf003.tile1.nc \
                    RESTART/20210322.090000.MOM.res.nc \
                    RESTART/iced.2021-03-22-32400.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc \
-                   ufs.cpld.ww3.r.2021-03-22-32400 \
+                   ufs.cpld.ww3.r.2021-03-22-32400.nc \
                    20210322.090000.out_pnt.ww3 \
                    20210322.090000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_debug_pdlib_p8 b/tests/tests/cpld_debug_pdlib_p8
@@ -53,7 +53,7 @@ export LIST_FILES="sfcf003.tile1.nc \
                    RESTART/20210322.090000.MOM.res.nc \
                    RESTART/iced.2021-03-22-32400.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc \
-                   ufs.cpld.ww3.r.2021-03-22-32400 \
+                   ufs.cpld.ww3.r.2021-03-22-32400.nc \
                    20210322.090000.out_pnt.ww3 \
                    20210322.090000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_decomp_p8 b/tests/tests/cpld_decomp_p8
@@ -54,7 +54,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   ufs.cpld.ww3.r.2021-03-23-21600 \
+                   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_mpi_gfsv17 b/tests/tests/cpld_mpi_gfsv17
@@ -66,7 +66,7 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-		   ufs.cpld.ww3.r.2021-03-23-21600
+		   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_mpi_p8 b/tests/tests/cpld_mpi_p8
@@ -54,7 +54,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   ufs.cpld.ww3.r.2021-03-23-21600 \
+                   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_mpi_pdlib_p8 b/tests/tests/cpld_mpi_pdlib_p8
@@ -65,7 +65,7 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   ufs.cpld.ww3.r.2021-03-23-21600 \
+                   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_restart_bmark_p8 b/tests/tests/cpld_restart_bmark_p8
@@ -48,7 +48,7 @@ export LIST_FILES="sfcf006.nc \
                    RESTART/20130401.060000.MOM.res_3.nc \
                    RESTART/iced.2013-04-01-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc \
-                   ufs.cpld.ww3.r.2013-04-01-21600 \
+                   ufs.cpld.ww3.r.2013-04-01-21600.nc \
                    20130401.060000.out_pnt.ww3 \
                    20130401.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8
@@ -53,7 +53,7 @@ export LIST_FILES="sfcf030.tile1.nc \
                    RESTART/20210323.120000.MOM.res.nc \
                    RESTART/iced.2021-03-23-43200.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc \
-                   ufs.cpld.ww3.r.2021-03-23-43200 \
+                   ufs.cpld.ww3.r.2021-03-23-43200.nc \
                    20210323.120000.out_grd.ww3 \
                    20210323.120000.out_pnt.ww3 "
 

diff --git a/tests/tests/cpld_restart_gfsv17 b/tests/tests/cpld_restart_gfsv17
@@ -55,7 +55,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-		   ufs.cpld.ww3.r.2021-03-23-21600 \
+		   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_restart_p8 b/tests/tests/cpld_restart_p8
@@ -54,7 +54,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   ufs.cpld.ww3.r.2021-03-23-21600 \
+                   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_restart_pdlib_p8 b/tests/tests/cpld_restart_pdlib_p8
@@ -53,7 +53,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   ufs.cpld.ww3.r.2021-03-23-21600 \
+                   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/cpld_restart_qr_p8 b/tests/tests/cpld_restart_qr_p8
@@ -54,7 +54,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   ufs.cpld.ww3.r.2021-03-23-21600 \
+                   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 

diff --git a/tests/tests/hafs_regional_atm_ocn_wav b/tests/tests/hafs_regional_atm_ocn_wav
@@ -14,7 +14,7 @@ export LIST_FILES="atmf006.nc \
                    archs.2019_241_06.a \
                    20190829.060000.out_grd.ww3 \
                    20190829.060000.out_pnt.ww3 \
-                   ufs.hafs.ww3.r.2019-08-29-21600 \
+                   ufs.hafs.ww3.r.2019-08-29-21600.nc \
                    ufs.hafs.cpl.r.2019-08-29-21600.nc"
 
 export_fv3

diff --git a/tests/tests/hafs_regional_atm_wav b/tests/tests/hafs_regional_atm_wav
@@ -12,7 +12,7 @@ export LIST_FILES="atmf006.nc \
                    sfcf006.nc \
                    20190829.060000.out_grd.ww3 \
                    20190829.060000.out_pnt.ww3 \
-                   ufs.hafs.ww3.r.2019-08-29-21600 \
+                   ufs.hafs.ww3.r.2019-08-29-21600.nc \
                    ufs.hafs.cpl.r.2019-08-29-21600.nc"
 
 export_fv3