Modifications for ufs-coastal app

.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
@@ -24,8 +26,10 @@
   branch = emc/develop
 [submodule "MOM6"]
   path = MOM6-interface/MOM6
-  url = https://github.com/NOAA-EMC/MOM6
-  branch = dev/emc
+  #url = https://github.com/NOAA-EMC/MOM6
+  #branch = dev/emc
+  url = https://github.com/jiandewang/MOM6
+  branch = feature/update-to-main-20241127
 [submodule "CICE"]
   path = CICE-interface/CICE
   url = https://github.com/NOAA-EMC/CICE

CMakeLists.txt

@@ -75,7 +75,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")
 
@@ -217,8 +218,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()

MOM6-interface/mom6_files.cmake

@@ -54,7 +54,9 @@ list(APPEND mom6_src_files
   MOM6/src/diagnostics/MOM_PointAccel.F90
   MOM6/src/diagnostics/MOM_debugging.F90
   MOM6/src/diagnostics/MOM_spatial_means.F90
+  MOM6/src/diagnostics/MOM_diagnose_MLD.F90
   MOM6/src/diagnostics/MOM_diagnostics.F90
+  MOM6/src/diagnostics/MOM_harmonic_analysis.F90
   MOM6/src/diagnostics/MOM_obsolete_diagnostics.F90
   MOM6/src/diagnostics/MOM_obsolete_params.F90
   MOM6/src/diagnostics/MOM_sum_output.F90
@@ -168,6 +170,7 @@ list(APPEND mom6_src_files
   MOM6/src/parameterizations/lateral/MOM_tidal_forcing.F90
   MOM6/src/parameterizations/lateral/MOM_Zanna_Bolton.F90
   MOM6/src/parameterizations/lateral/MOM_self_attr_load.F90
+  MOM6/src/parameterizations/lateral/MOM_streaming_filter.F90
 
   MOM6/src/parameterizations/vertical/MOM_ALE_sponge.F90
   MOM6/src/parameterizations/vertical/MOM_CVMix_KPP.F90
@@ -312,7 +315,9 @@ list(APPEND mom6_nuopc_src_files
   MOM6/config_src/drivers/unit_tests/test_MOM_mixedlayer_restrat.F90
   MOM6/config_src/drivers/unit_tests/test_MOM_string_functions.F90
   MOM6/config_src/drivers/unit_tests/test_MOM_EOS.F90
+  MOM6/config_src/drivers/unit_tests/test_MOM_remapping.F90
   MOM6/config_src/drivers/timing_tests/time_MOM_EOS.F90
+  MOM6/config_src/drivers/timing_tests/time_MOM_remapping.F90
 )
 
 list(APPEND mom6_nuopc_src_files

tests/default_vars.sh

@@ -1020,6 +1020,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'
@@ -1321,6 +1322,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'
@@ -1760,6 +1762,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"
   export WW3_RSTFLDS=" "

tests/parm/fd_ufs.yaml

@@ -919,6 +919,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
@@ -967,27 +1022,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

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