add changes to test uwm w/ coastal changes

.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

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()

tests/default_vars.sh

@@ -843,6 +843,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'
@@ -1018,6 +1019,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'
@@ -1431,6 +1433,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"
 

tests/parm/fd_ufs.yaml

@@ -917,6 +917,50 @@
      - standard_name: Sw_z0
        alias: z0rlen
      #
+     - standard_name: Sw_hs
+       canonical_units: m
+       description: ww3 export - significant wave height
+     #
+     - standard_name: Sw_bhd
+       canonical_units: m2 s-2
+       description: ww3 export - Bernoulli head (J term)
+     #
+     - standard_name: Sw_tauox
+       canonical_units: m2 s-2
+       description: ww3 export - wave to ocean momentum flux x
+     #
+     - standard_name: Sw_tauoy
+       canonical_units: m2 s-2
+       description: ww3 export - wave to ocean momentum flux y
+     #
+     - standard_name: Sw_taubblx
+       canonical_units: m2 s-2
+       description: ww3 export - momentum flux due to bottom friction x
+     #
+     - standard_name: Sw_taubbly
+       canonical_units: m2 s-2
+       description: ww3 export - momentum flux due to bottom friction y
+     #
+     - standard_name: Sw_ubrx
+       canonical_units: m s-1
+       description: ww3 export - near bottom rms wave velocities x
+     #
+     - standard_name: Sw_ubry
+       canonical_units: m s-1
+       description: ww3 export - near bottom rms wave velocities y
+     #
+     - standard_name: Sw_thm
+       canonical_units: deg
+       description: ww3 export - mean wave direction
+     #
+     - standard_name: Sw_t0m1
+       canonical_units: s
+       description: ww3 export - mean wave period
+     #
+     - standard_name: Sw_wnmean
+       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,26 +1009,26 @@
      - 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_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

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]'