diff --git a/.gitmodules b/.gitmodules
index a3775fc12d..a70150bb39 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,8 +4,10 @@
   branch = develop
 [submodule "WW3"]
   path = WW3
-  url = https://github.com/NOAA-EMC/WW3
-  branch = dev/ufs-weather-model
+  #url = https://github.com/NOAA-EMC/WW3
+  #branch = dev/ufs-weather-model
+  url = https://github.com/DeniseWorthen/WW3
+  branch = feature/restartnc
 [submodule "stochastic_physics"]
   path = stochastic_physics
   url = https://github.com/NOAA-PSL/stochastic_physics
diff --git a/WW3 b/WW3
index 7f548c795a..29992909ba 160000
--- a/WW3
+++ b/WW3
@@ -1 +1 @@
-Subproject commit 7f548c795a348bbb0fe4967dd25692c79036dc73
+Subproject commit 29992909ba4acfaa859a03425611b47885e7d905
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index bfa6815354..f1c0b931d9 100644
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -1033,7 +1033,17 @@ export_ww3() {
   export WW3_ICE='C'
   export WW3_IC1='F'
   export WW3_IC5='F'
-  export WW3_user_sets_restname="true"
+  export WW3_user_sets_histname='false'
+  export WW3_historync='false'
+  export WW3_user_sets_restname='true'
+  export WW3_restartnc='false'
+  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_IOTASKS=-99
+  export WW3_PIO_REARR='box'
+  export WW3_PIO_ROOT=-99
 }
 
 # Defaults for the coupled 5-component
@@ -1113,7 +1123,7 @@ export NY_GLB=320
 export NPZ=127
 export NPZP=128
 
-# Use updated omega calculations if 
+# Use updated omega calculations if
 #   hydrostatic is set to false
 if [[ "${HYDROSTATIC}" == .false. ]]; then
   export UPDATE_FULL_OMEGA=.true.
@@ -1444,6 +1454,17 @@ export_hafs_regional ()
   export WW3_MODDEF=mod_def.${WW3_DOMAIN}
   export WW3_ICE='F'
   export WW3_OUTPARS="WND HS T01 T02 DIR FP DP PHS PTP PDIR UST CHA USP"
+  export WW3_user_sets_histname='false'
+  export WW3_historync='false'
+  export WW3_user_sets_restname='true'
+  export WW3_restartnc='false'
+  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_IOTASKS=-99
+  export WW3_PIO_REARR='box'
+  export WW3_PIO_ROOT=-99
 
   # Set CMEPS component defaults
   export_cmeps
diff --git a/tests/parm/ufs.configure.atmw.IN b/tests/parm/ufs.configure.atmw.IN
index bd1c554ecc..6c9dbd7d61 100644
--- a/tests/parm/ufs.configure.atmw.IN
+++ b/tests/parm/ufs.configure.atmw.IN
@@ -35,7 +35,16 @@ WAV_attributes::
   Verbosity = 0
   OverwriteSlice = false
   mesh_wav = @[MESH_WAV]
-  user_sets_restname = true
+  user_sets_histname=@[WW3_user_sets_histname]
+  use__historync=@[WW3_historync]
+  user_sets_restname = @[WW3_user_sets_restname]
+  use_restartnc = @[WW3_restartnc]
+  restart_from_binary = @[WW3_restart_from_binary]
+  pio_typename = @[WW3_PIO_FORMAT]
+  pio_numiotasks = @[WW3_PIO_IOTASKS]
+  pio_stride = @[WW3_PIO_STRIDE]
+  pio_rearranger = @[WW3_PIO_REARR]
+  pio_root = @[WW3_PIO_ROOT]
 ::
 
 
diff --git a/tests/parm/ufs.configure.hafs_atm_ocn_wav.IN b/tests/parm/ufs.configure.hafs_atm_ocn_wav.IN
index c9cc9d0fe2..9e45e77874 100644
--- a/tests/parm/ufs.configure.hafs_atm_ocn_wav.IN
+++ b/tests/parm/ufs.configure.hafs_atm_ocn_wav.IN
@@ -86,7 +86,16 @@ WAV_attributes::
   OverwriteSlice = false
   merge_import = .true.
   mesh_wav = @[MESH_WAV]
-  user_sets_restname = true
+  user_sets_histname=@[WW3_user_sets_histname]
+  use__historync=@[WW3_historync]
+  user_sets_restname = @[WW3_user_sets_restname]
+  use_restartnc = @[WW3_restartnc]
+  restart_from_binary = @[WW3_restart_from_binary]
+  pio_typename = @[WW3_PIO_FORMAT]
+  pio_numiotasks = @[WW3_PIO_IOTASKS]
+  pio_stride = @[WW3_PIO_STRIDE]
+  pio_rearranger = @[WW3_PIO_REARR]
+  pio_root = @[WW3_PIO_ROOT]
 ::
 
 # Run Sequence #
diff --git a/tests/parm/ufs.configure.hafs_atm_ocn_wav_inline.IN b/tests/parm/ufs.configure.hafs_atm_ocn_wav_inline.IN
index f1b2bd18ca..a63ac2f137 100644
--- a/tests/parm/ufs.configure.hafs_atm_ocn_wav_inline.IN
+++ b/tests/parm/ufs.configure.hafs_atm_ocn_wav_inline.IN
@@ -88,7 +88,16 @@ WAV_attributes::
   OverwriteSlice = false
   merge_import = .false.
   mesh_wav = @[MESH_WAV]
-  user_sets_restname = true
+  user_sets_histname=@[WW3_user_sets_histname]
+  use__historync=@[WW3_historync]
+  user_sets_restname = @[WW3_user_sets_restname]
+  use_restartnc = @[WW3_restartnc]
+  restart_from_binary = @[WW3_restart_from_binary]
+  pio_typename = @[WW3_PIO_FORMAT]
+  pio_numiotasks = @[WW3_PIO_IOTASKS]
+  pio_stride = @[WW3_PIO_STRIDE]
+  pio_rearranger = @[WW3_PIO_REARR]
+  pio_root = @[WW3_PIO_ROOT]
 ::
 
 # Run Sequence #
diff --git a/tests/parm/ufs.configure.hafs_atm_ocn_wav_mom6.IN b/tests/parm/ufs.configure.hafs_atm_ocn_wav_mom6.IN
index 2a57c59cf3..42efeb1f8c 100644
--- a/tests/parm/ufs.configure.hafs_atm_ocn_wav_mom6.IN
+++ b/tests/parm/ufs.configure.hafs_atm_ocn_wav_mom6.IN
@@ -74,7 +74,16 @@ WAV_attributes::
   OverwriteSlice = false
   merge_import = .false.
   mesh_wav = @[MESH_WAV]
-  user_sets_restname = true
+  user_sets_histname=@[WW3_user_sets_histname]
+  use__historync=@[WW3_historync]
+  user_sets_restname = @[WW3_user_sets_restname]
+  use_restartnc = @[WW3_restartnc]
+  restart_from_binary = @[WW3_restart_from_binary]
+  pio_typename = @[WW3_PIO_FORMAT]
+  pio_numiotasks = @[WW3_PIO_IOTASKS]
+  pio_stride = @[WW3_PIO_STRIDE]
+  pio_rearranger = @[WW3_PIO_REARR]
+  pio_root = @[WW3_PIO_ROOT]
 ::
 
 # Run Sequence #
diff --git a/tests/parm/ufs.configure.hafs_atm_wav.IN b/tests/parm/ufs.configure.hafs_atm_wav.IN
index 9adfb9ed85..e4f1b3894f 100644
--- a/tests/parm/ufs.configure.hafs_atm_wav.IN
+++ b/tests/parm/ufs.configure.hafs_atm_wav.IN
@@ -55,7 +55,16 @@ WAV_attributes::
   OverwriteSlice = false
   merge_import = .true.
   mesh_wav = @[MESH_WAV]
-  user_sets_restname = true
+  user_sets_histname=@[WW3_user_sets_histname]
+  use__historync=@[WW3_historync]
+  user_sets_restname = @[WW3_user_sets_restname]
+  use_restartnc = @[WW3_restartnc]
+  restart_from_binary = @[WW3_restart_from_binary]
+  pio_typename = @[WW3_PIO_FORMAT]
+  pio_numiotasks = @[WW3_PIO_IOTASKS]
+  pio_stride = @[WW3_PIO_STRIDE]
+  pio_rearranger = @[WW3_PIO_REARR]
+  pio_root = @[WW3_PIO_ROOT]
 ::
 
 # Run Sequence #
diff --git a/tests/parm/ufs.configure.s2sw.IN b/tests/parm/ufs.configure.s2sw.IN
index 1ccf32fe09..12ab47a080 100644
--- a/tests/parm/ufs.configure.s2sw.IN
+++ b/tests/parm/ufs.configure.s2sw.IN
@@ -62,7 +62,16 @@ WAV_attributes::
   Verbosity = 0
   OverwriteSlice = false
   mesh_wav = @[MESH_WAV]
+  user_sets_histname=@[WW3_user_sets_histname]
+  use__historync=@[WW3_historync]
   user_sets_restname = @[WW3_user_sets_restname]
+  use_restartnc = @[WW3_restartnc]
+  restart_from_binary = @[WW3_restart_from_binary]
+  pio_typename = @[WW3_PIO_FORMAT]
+  pio_numiotasks = @[WW3_PIO_IOTASKS]
+  pio_stride = @[WW3_PIO_STRIDE]
+  pio_rearranger = @[WW3_PIO_REARR]
+  pio_root = @[WW3_PIO_ROOT]
 ::
 
 # CMEPS warm run sequence
diff --git a/tests/parm/ufs.configure.s2sw_esmf.IN b/tests/parm/ufs.configure.s2sw_esmf.IN
index a9eed48546..3e86de6f8a 100644
--- a/tests/parm/ufs.configure.s2sw_esmf.IN
+++ b/tests/parm/ufs.configure.s2sw_esmf.IN
@@ -67,7 +67,16 @@ WAV_attributes::
   Verbosity = 0
   OverwriteSlice = false
   mesh_wav = @[MESH_WAV]
+  user_sets_histname=@[WW3_user_sets_histname]
+  use__historync=@[WW3_historync]
   user_sets_restname = @[WW3_user_sets_restname]
+  use_restartnc = @[WW3_restartnc]
+  restart_from_binary = @[WW3_restart_from_binary]
+  pio_typename = @[WW3_PIO_FORMAT]
+  pio_numiotasks = @[WW3_PIO_IOTASKS]
+  pio_stride = @[WW3_PIO_STRIDE]
+  pio_rearranger = @[WW3_PIO_REARR]
+  pio_root = @[WW3_PIO_ROOT]
 ::
 
 # CMEPS warm run sequence
diff --git a/tests/parm/ufs.configure.s2sw_fast_esmf.IN b/tests/parm/ufs.configure.s2sw_fast_esmf.IN
index 3d7df9de69..16a4a74b80 100644
--- a/tests/parm/ufs.configure.s2sw_fast_esmf.IN
+++ b/tests/parm/ufs.configure.s2sw_fast_esmf.IN
@@ -67,7 +67,16 @@ WAV_attributes::
   Verbosity = 0
   OverwriteSlice = false
   mesh_wav = @[MESH_WAV]
+  user_sets_histname=@[WW3_user_sets_histname]
+  use__historync=@[WW3_historync]
   user_sets_restname = @[WW3_user_sets_restname]
+  use_restartnc = @[WW3_restartnc]
+  restart_from_binary = @[WW3_restart_from_binary]
+  pio_typename = @[WW3_PIO_FORMAT]
+  pio_numiotasks = @[WW3_PIO_IOTASKS]
+  pio_stride = @[WW3_PIO_STRIDE]
+  pio_rearranger = @[WW3_PIO_REARR]
+  pio_root = @[WW3_PIO_ROOT]
 ::
 
 # CMEPS warm run sequence
diff --git a/tests/parm/ufs.configure.s2swa.IN b/tests/parm/ufs.configure.s2swa.IN
index a1bb9f95a6..a4d22ae09f 100644
--- a/tests/parm/ufs.configure.s2swa.IN
+++ b/tests/parm/ufs.configure.s2swa.IN
@@ -69,7 +69,16 @@ WAV_attributes::
   Verbosity = 0
   OverwriteSlice = false
   mesh_wav = @[MESH_WAV]
+  user_sets_histname=@[WW3_user_sets_histname]
+  use__historync=@[WW3_historync]
   user_sets_restname = @[WW3_user_sets_restname]
+  use_restartnc = @[WW3_restartnc]
+  restart_from_binary = @[WW3_restart_from_binary]
+  pio_typename = @[WW3_PIO_FORMAT]
+  pio_numiotasks = @[WW3_PIO_IOTASKS]
+  pio_stride = @[WW3_PIO_STRIDE]
+  pio_rearranger = @[WW3_PIO_REARR]
+  pio_root = @[WW3_PIO_ROOT]
 ::
 
 # CMEPS warm run sequence
diff --git a/tests/parm/ufs.configure.s2swa_esmf.IN b/tests/parm/ufs.configure.s2swa_esmf.IN
index 820da8ee0f..76a79f835d 100644
--- a/tests/parm/ufs.configure.s2swa_esmf.IN
+++ b/tests/parm/ufs.configure.s2swa_esmf.IN
@@ -75,7 +75,16 @@ WAV_attributes::
   Verbosity = 0
   OverwriteSlice = false
   mesh_wav = @[MESH_WAV]
+  user_sets_histname=@[WW3_user_sets_histname]
+  use__historync=@[WW3_historync]
   user_sets_restname = @[WW3_user_sets_restname]
+  use_restartnc = @[WW3_restartnc]
+  restart_from_binary = @[WW3_restart_from_binary]
+  pio_typename = @[WW3_PIO_FORMAT]
+  pio_numiotasks = @[WW3_PIO_IOTASKS]
+  pio_stride = @[WW3_PIO_STRIDE]
+  pio_rearranger = @[WW3_PIO_REARR]
+  pio_root = @[WW3_PIO_ROOT]
 ::
 
 # CMEPS warm run sequence
diff --git a/tests/parm/ufs.configure.s2swa_fast_esmf.IN b/tests/parm/ufs.configure.s2swa_fast_esmf.IN
index e77f9266bc..6288f6abe6 100644
--- a/tests/parm/ufs.configure.s2swa_fast_esmf.IN
+++ b/tests/parm/ufs.configure.s2swa_fast_esmf.IN
@@ -74,7 +74,16 @@ WAV_attributes::
   Verbosity = 0
   OverwriteSlice = false
   mesh_wav = @[MESH_WAV]
+  user_sets_histname=@[WW3_user_sets_histname]
+  use__historync=@[WW3_historync]
   user_sets_restname = @[WW3_user_sets_restname]
+  use_restartnc = @[WW3_restartnc]
+  restart_from_binary = @[WW3_restart_from_binary]
+  pio_typename = @[WW3_PIO_FORMAT]
+  pio_numiotasks = @[WW3_PIO_IOTASKS]
+  pio_stride = @[WW3_PIO_STRIDE]
+  pio_rearranger = @[WW3_PIO_REARR]
+  pio_root = @[WW3_PIO_ROOT]
 ::
 
 # CMEPS warm run sequence
diff --git a/tests/tests/atmwav_control_noaero_p8 b/tests/tests/atmwav_control_noaero_p8
index 19a8523c93..5108b79349 100644
--- a/tests/tests/atmwav_control_noaero_p8
+++ b/tests/tests/atmwav_control_noaero_p8
@@ -81,6 +81,17 @@ export wav_model=ww3
 export WW3_MULTIGRID=false
 export WW3_MODDEF=mod_def.glo_1deg
 export MESH_WAV=mesh.glo_1deg.nc
+export WW3_user_sets_histname='false'
+export WW3_historync='false'
+export WW3_user_sets_restname='true'
+export WW3_restartnc='false'
+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_IOTASKS=-99
+export WW3_PIO_REARR='box'
+export WW3_PIO_ROOT=-99
 
 # ufs.configure
 export coupling_interval_sec=${DT_ATMOS}