Merge branch 'develop' into feature/datms2sw

CMakeLists.txt

@@ -76,7 +76,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")
 
@@ -218,8 +219,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/bl_date.conf

@@ -1 +1 @@
-export BL_DATE=20241230
+export BL_DATE=20250107

tests/default_vars.sh

@@ -504,7 +504,6 @@ export FNABSC="'global_mxsnoalb.uariz.t126.384.190.rg.grb'"
 export RF_CUTOFF=30.0
 export FAST_TAU_W_SEC=0.0
 
-export ATMRES=C96
 export TILEDFIX=.false.
 export DO_CA=.false.
 export CA_SGS=.false.
@@ -798,6 +797,7 @@ export HWRF_SAMFDEEP=.false.
 export RAS=.false.
 export RANDOM_CLDS=.false.
 export CNVCLD=.true.
+export XR_CNVCLD=.false.
 export PROGSIGMA=.false.
 export BETASCU=8.0
 export BETAMCU=1.0
@@ -1023,6 +1023,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'
@@ -1193,8 +1194,11 @@ export_ugwpv1() {
   esac
 
   if [[ ${DO_GSL_DRAG_SS} = .true. ]]; then export CDMBGWD=${CDMBGWD_GSL}; fi
-  if [[ ${SEDI_SEMI} = .true. ]]; then export DT_ATMOS=$((DT_ATMOS/2)); fi
-  export DT_INNER=${DT_ATMOS}
+  if [[ ${SEDI_SEMI} = .false. ]]; then 
+    export DT_INNER=$((DT_ATMOS/2))
+  else 
+    export DT_INNER=${DT_ATMOS}
+  fi
   export default_dt_atmos=0
 }
 
@@ -1321,6 +1325,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'
@@ -1761,6 +1766,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=" "