Modified tests to compare netcdf parallel output of WW3. Changed WW3 branch to branch with several bug fixes affecting netcdf field output.

.gitmodules

@@ -4,8 +4,9 @@
   branch = develop
 [submodule "WW3"]
   path = WW3
-  url = https://github.com/NOAA-EMC/WW3
-  branch = dev/ufs-weather-model
+  url = https://github.com/kestonsmith-noaa/WW3
+#  branch = NcPIOwFreqDim
+  branch = NetcdfNcPIOfixes
 [submodule "stochastic_physics"]
   path = stochastic_physics
   url = https://github.com/NOAA-PSL/stochastic_physics

tests/test_changes.list

@@ -1,101 +1,3 @@
-cpld_control_p8_mixedmode intel
-cpld_control_gefs intel
-cpld_restart_gefs intel
-cpld_dcp_gefs intel
-cpld_control_gfsv17 intel
-cpld_control_gfsv17_iau intel
-cpld_restart_gfsv17 intel
-cpld_restart_gfsv17_iau intel
-cpld_mpi_gfsv17 intel
-cpld_control_sfs intel
-cpld_debug_gfsv17 intel
-cpld_control_p8 intel
-cpld_control_p8.v2.sfc intel
-cpld_restart_p8 intel
-cpld_control_qr_p8 intel
-cpld_restart_qr_p8 intel
-cpld_2threads_p8 intel
-cpld_decomp_p8 intel
-cpld_mpi_p8 intel
-cpld_control_ciceC_p8 intel
-cpld_control_c192_p8 intel
-cpld_restart_c192_p8 intel
-cpld_control_p8_lnd intel
-cpld_restart_p8_lnd intel
-cpld_s2sa_p8 intel
-cpld_control_noaero_p8 intel
-cpld_control_nowave_noaero_p8 intel
-cpld_debug_p8 intel
-cpld_debug_noaero_p8 intel
-cpld_control_noaero_p8_agrid intel
-cpld_control_p8_faster intel
 cpld_control_pdlib_p8 intel
 cpld_restart_pdlib_p8 intel
 cpld_mpi_pdlib_p8 intel
-cpld_control_c48_5deg intel
-cpld_warmstart_c48_5deg intel
-cpld_restart_c48_5deg intel
-cpld_debug_pdlib_p8 intel
-control_CubedSphereGrid intel
-control_CubedSphereGrid_parallel intel
-control_latlon intel
-control_wrtGauss_netcdf_parallel intel
-control_c48 intel
-control_c48_lnd_iau intel
-control_c192 intel
-control_c384 intel
-control_p8 intel
-control_p8.v2.sfc intel
-control_p8_ugwpv1 intel
-control_p8_ugwpv1_tempo intel
-control_p8_ugwpv1_tempo_aerosol intel
-control_p8_ugwpv1_tempo_aerosol_hail intel
-control_restart_p8 intel
-control_noqr_p8 intel
-control_restart_noqr_p8 intel
-control_decomp_p8 intel
-control_2threads_p8 intel
-control_p8_lndp intel
-control_p8_rrtmgp intel
-control_p8_mynn intel
-merra2_thompson intel
-merra2_hf_thompson intel
-rrfs_v1beta intel
-rrfs_v1nssl intel
-rrfs_v1nssl_nohailnoccn intel
-control_wam intel
-control_p8_faster intel
-control_CubedSphereGrid_debug intel
-control_wrtGauss_netcdf_parallel_debug intel
-control_diag_debug intel
-control_debug_p8 intel
-gnv1_c96_no_nest_debug intel
-control_wam_debug intel
-conus13km_debug intel
-gnv1_nested intel
-atm_ds2s_docn_pcice intel
-atm_ds2s_docn_dice intel
-control_p8_atmlnd intel
-control_restart_p8_atmlnd intel
-control_p8_atmlnd_debug intel
-atmwav_control_noaero_p8 intel
-atmaero_control_p8 intel
-atmaero_control_p8_rad intel
-atmaero_control_p8_rad_micro intel
-cpld_control_gfsv17 intelllvm
-cpld_debug_gfsv17 intelllvm
-cpld_control_sfs intelllvm
-cpld_control_p8 intelllvm
-control_c48 gnu
-control_p8 gnu
-control_p8_ugwpv1 gnu
-rrfs_v1beta gnu
-control_diag_debug gnu
-control_debug_p8 gnu
-gnv1_c96_no_nest_debug gnu
-control_wam_debug gnu
-cpld_control_p8 gnu
-cpld_control_nowave_noaero_p8 gnu
-cpld_debug_p8 gnu
-cpld_control_pdlib_p8 gnu
-cpld_debug_pdlib_p8 gnu

tests/tests/cpld_control_pdlib_p8

@@ -67,7 +67,7 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
                    ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3.nc \
-                   20210323.060000.out_grd.ww3 "
+                   20210323.060000.out_grd.ww3.nc "
 
 export DT_ATMOS=720
 export_fv3
@@ -123,3 +123,6 @@ export N_SPLIT=5
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
 export DO_GSL_DRAG_SS=.false.
+
+#output WW3 history files directly in netcdf format
+export WW3_historync='true'

tests/tests/cpld_debug_pdlib_p8

@@ -55,7 +55,7 @@ export LIST_FILES="sfcf003.tile1.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc \
                    ufs.cpld.ww3.r.2021-03-22-32400.nc \
                    20210322.090000.out_pnt.ww3.nc \
-                   20210322.090000.out_grd.ww3 "
+                   20210322.090000.out_grd.ww3.nc "
 
 export_fv3
 export_ugwpv1
@@ -126,3 +126,6 @@ export N_SPLIT=5
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
 export DO_GSL_DRAG_SS=.false.
+
+#output WW3 history files directly in netcdf format
+export WW3_historync='true'

tests/tests/cpld_mpi_pdlib_p8

@@ -67,7 +67,7 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
                    ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3.nc \
-                   20210323.060000.out_grd.ww3 "
+                   20210323.060000.out_grd.ww3.nc "
 export DT_ATMOS=720
 export_fv3
 export_ugwpv1
@@ -121,3 +121,6 @@ fi
 if [[ $MACHINE_ID = wcoss2 ]]; then
   WLCLK=50
 fi
+
+#output WW3 history files directly in netcdf format
+export WW3_historync='true'

tests/tests/cpld_restart_pdlib_p8

@@ -55,7 +55,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
                    ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3.nc \
-                   20210323.060000.out_grd.ww3 "
+                   20210323.060000.out_grd.ww3.nc "
 export DT_ATMOS=720
 export_fv3
 export_ugwpv1
@@ -118,3 +118,6 @@ export N_SPLIT=5
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
 export DO_GSL_DRAG_SS=.false.
+
+#output WW3 history files directly in netcdf format
+export WW3_historync='true'