diff --git a/.gitmodules b/.gitmodules
index a3775fc12d..55909a388a 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/addflds4schism
 [submodule "stochastic_physics"]
   path = stochastic_physics
   url = https://github.com/NOAA-PSL/stochastic_physics
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5fdd1e83a..dc67a69789 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,7 +71,8 @@ set(OPENMP          ON  CACHE BOOL "Enable OpenMP threading")
 set(PARALLEL_NETCDF OFF CACHE BOOL "Enable parallel NetCDF")
 set(JEDI_DRIVER     OFF CACHE BOOL "Enable JEDI as top level driver")
 set(CMEPS_AOFLUX    OFF CACHE BOOL "Enable atmosphere-ocean flux calculation in mediator")
-set(PDLIB           OFF CACHE BOOL "Enable Domain Decomposition in WW3 via PDLIB")
+set(PDLIB           OFF CACHE BOOL "Enable Domain Decomposition in WW3 via PDLIB with BT1")
+set(PDLIB_BT4       OFF CACHE BOOL "Enable Domain Decomposition in WW3 via PDLIB with BT4")
 set(CDEPS_INLINE    OFF CACHE BOOL "Enable CDEPS inline capability")
 set(HYDRO           OFF CACHE BOOL "Enable hydrostatic set")
 
@@ -213,8 +214,12 @@ if(WW3)
     set(UFS_CAP "MULTI_ESMF" CACHE STRING "Build with MULTI_ESMF cap")
     list(APPEND _ufs_defs_private FRONT_WW3=WMESMFMD)
   else()
+    if(PDLIB OR PDLIB_BT4)
     if(PDLIB)
       set(SWITCH "meshcap_pdlib" CACHE STRING "NUOPC mesh cap")
+      else()
+	set(SWITCH "meshcap_pdlib_bt4" CACHE STRING "NUOPC mesh cap")
+      endif()
     else()
       set(SWITCH "meshcap" CACHE STRING "NUOPC mesh cap")
     endif()
diff --git a/WW3 b/WW3
index 7f548c795a..cb2e58b934 160000
--- a/WW3
+++ b/WW3
@@ -1 +1 @@
-Subproject commit 7f548c795a348bbb0fe4967dd25692c79036dc73
+Subproject commit cb2e58b93456aa6131a37c829a1a781e62dbd966
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 18bd2e1e11..4dedb35d60 100644
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -848,6 +848,7 @@ export RST_BEG=${RUN_BEG}
 export RST_2_BEG=${RUN_BEG}
 export RST_END=${RUN_END}
 export RST_2_END=${RUN_END}
+export WW3_WLEV='F'
 export WW3_CUR='F'
 export WW3_ICE='F'
 export WW3_IC1='F'
@@ -1030,6 +1031,7 @@ export_ww3() {
   WW3_DTPNT="$(printf "%02d" $(( WW3_OUTDTHR*3600 )) )"
   export WW3_DTFLD
   export WW3_DTPNT
+  export WW3_WLEV='F'
   export WW3_CUR='C'
   export WW3_ICE='C'
   export WW3_IC1='F'
@@ -1443,6 +1445,7 @@ export_hafs_regional ()
   # default hafs with no ice
   export WW3_DOMAIN=natl_6m
   export WW3_MODDEF=mod_def.${WW3_DOMAIN}
+  export WW3_WLEV='F'
   export WW3_ICE='F'
   export WW3_OUTPARS="WND HS T01 T02 DIR FP DP PHS PTP PDIR UST CHA USP"
 
diff --git a/tests/parm/fd_ufs.yaml b/tests/parm/fd_ufs.yaml
index edfca0beed..0afddf78e9 100644
--- a/tests/parm/fd_ufs.yaml
+++ b/tests/parm/fd_ufs.yaml
@@ -917,6 +917,61 @@ field_dictionary:
     - standard_name: Sw_z0
       alias: z0rlen
     #
+    - standard_name: Sw_hs
+      alias: sea_surface_wave_significant_height
+      canonical_units: m
+      description: ww3 export - significant wave height
+    #
+    - standard_name: Sw_bhd
+      alias: sea_water_waves_effect_on_currents_bernoulli_head_adjustment
+      canonical_units: m2 s-2
+      description: ww3 export - Bernoulli head (J term)
+    #
+    - standard_name: Sw_tauox
+      alias: sea_surface_x_stress_due_to_waves
+      canonical_units: m2 s-2
+      description: ww3 export - wave to ocean momentum flux x
+    #
+    - standard_name: Sw_tauoy
+      alias: sea_surface_y_stress_due_to_waves
+      canonical_units: m2 s-2
+      description: ww3 export - wave to ocean momentum flux y
+    #
+    - standard_name: Sw_taubblx
+      alias: sea_bottom_upward_x_stress_due_to_waves
+      canonical_units: m2 s-2
+      description: ww3 export - momentum flux due to bottom friction x
+    #
+    - standard_name: Sw_taubbly
+      alias: sea_bottom_upward_y_stress_due_to_waves
+      canonical_units: m2 s-2
+      description: ww3 export - momentum flux due to bottom friction y
+    #
+    - standard_name: Sw_ubrx
+      alias: sea_bed_orbital_x_velocity_due_to_waves
+      canonical_units: m s-1
+      description: ww3 export - near bottom rms wave velocities x
+    #
+    - standard_name: Sw_ubry
+      alias: sea_bed_orbital_y_velocity_due_to_waves
+      canonical_units: m s-1
+      description: ww3 export - near bottom rms wave velocities y
+    #
+    - standard_name: Sw_thm
+      alias: sea_surface_wave_mean_direction
+      canonical_units: deg
+      description: ww3 export - mean wave direction
+    #
+    - standard_name: Sw_t0m1
+      alias: sea_surface_wave_mean_period
+      canonical_units: s
+      description: ww3 export - mean wave period
+    #
+    - standard_name: Sw_wnmean
+      alias: sea_surface_wave_mean_number
+      canonical_units: m-1
+      description: ww3 export - mean wave number
+    #
     - standard_name: Sw_pstokes_x
       alias: eastward_partitioned_stokes_drift_current
       canonical_units: m s-1
@@ -965,27 +1020,6 @@ field_dictionary:
     - standard_name: Sw_vstokes
       alias: ussy
     #
-    - standard_name: Sw_wbcuru
-      alias: eastward_wave_bottom_current
-      canonical_units: m s-1
-      description: ww3 export
-    - standard_name: Sw_wbcuru
-      alias: wbcuru
-    #
-    - standard_name: Sw_wbcurv
-      alias: northward_wave_bottom_current
-      canonical_units: m s-1
-      description: ww3 export
-    - standard_name: Sw_wbcurv
-      alias: wbcurv
-    #
-    - standard_name: Sw_wbcurp
-      alias: wave_bottom_current_period
-      canonical_units: s
-      description: ww3 export
-    - standard_name: Sw_wbcurp
-      alias: wbcurp
-    #
     - standard_name: Sw_wavsuu
       alias: eastward_wave_radiation_stress
       canonical_units: N m-1
diff --git a/tests/parm/ww3_shel.nml.IN b/tests/parm/ww3_shel.nml.IN
index 4921a6d9ad..69d83ce0c4 100644
--- a/tests/parm/ww3_shel.nml.IN
+++ b/tests/parm/ww3_shel.nml.IN
@@ -1,4 +1,5 @@
 &input_nml
+  input%forcing%water_levels	= '@[WW3_WLEV]'
   input%forcing%winds      = 'C'
   input%forcing%currents   = '@[WW3_CUR]'
   input%forcing%ice_conc   = '@[WW3_ICE]'
diff --git a/tests/test_changes.list b/tests/test_changes.list
index a2ab4baa0f..7cf23b290b 100644
--- a/tests/test_changes.list
+++ b/tests/test_changes.list
@@ -1,29 +1,2 @@
-cpld_control_p8_mixedmode intel
-cpld_control_gfsv17 intel
-cpld_control_gfsv17_iau intel
-cpld_restart_gfsv17 intel
-cpld_mpi_gfsv17 intel
-cpld_control_sfs 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_bmark_p8 intel
-cpld_restart_bmark_p8 intel
-cpld_s2sa_p8 intel
-cpld_control_noaero_p8 intel
-cpld_control_nowave_noaero_p8 intel
-cpld_control_noaero_p8_agrid intel
-cpld_control_c48 intel
-cpld_warmstart_c48 intel
-cpld_restart_c48 intel
-cpld_control_p8_faster intel
-cpld_control_pdlib_p8 intel
-cpld_restart_pdlib_p8 intel
-cpld_mpi_pdlib_p8 intel
-hafs_regional_storm_following_1nest_atm_ocn_wav_mom6 intel
+hafs_regional_atm_wav intel
+atmwav_control_noaero_p8 intel
\ No newline at end of file