Sync WW3 develop -> dev/ufs-weather-model

.gitmodules

@@ -4,8 +4,9 @@
   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/jessicameixner-NOAA/WW3
 [submodule "stochastic_physics"]
   path = stochastic_physics
   url = https://github.com/NOAA-PSL/stochastic_physics
@@ -28,8 +29,8 @@
   branch = dev/emc
 [submodule "CICE"]
   path = CICE-interface/CICE
-  url = https://github.com/NOAA-EMC/CICE
-  branch = develop
+  url = https://github.com/NickSzapiro-NOAA/CICE
+  branch = sync_cice_2025-07
 [submodule "CDEPS"]
   path = CDEPS-interface/CDEPS
   url = https://github.com/NOAA-EMC/CDEPS

CICE-interface/cice_files.cmake

@@ -69,6 +69,7 @@ list(APPEND icepack_files
   CICE/icepack/columnphysics/icepack_itd.F90
   CICE/icepack/columnphysics/icepack_kinds.F90
   CICE/icepack/columnphysics/icepack_mechred.F90
+  CICE/icepack/columnphysics/icepack_meltpond_sealvl.F90
   CICE/icepack/columnphysics/icepack_meltpond_lvl.F90
   CICE/icepack/columnphysics/icepack_meltpond_topo.F90
   CICE/icepack/columnphysics/icepack_mushy_physics.F90

tests/parm/ice_in.IN

@@ -87,6 +87,8 @@
     restart_pond_topo = .false.
     tr_pond_lvl  = @[CICE_TR_POND_LVL]
     restart_pond_lvl  = @[CICE_RESTART_POND_LVL]
+    tr_pond_sealvl = .false.
+    restart_pond_sealvl = .false.
     tr_aero      = .false.
     restart_aero = .false.
     tr_fsd       = .false.
@@ -125,6 +127,8 @@
     coriolis        = 'latitude'
     kridge          = 1
     ktransport      = 1
+    dyn_area_min    = 0.001d0
+    dyn_mass_min    = 0.01d0
 /
 
 &shortwave_nml
@@ -234,19 +238,19 @@
     f_fswdn        = 'mdh1x'
     f_flwdn        = 'mdh1x'
     f_snowfrac     = 'x'
-    f_snow         = 'mdh1x'
-    f_snow_ai      = 'x'
-    f_rain         = 'mdh1x'
-    f_rain_ai      = 'x'
+    f_snow         = 'x'
+    f_snow_ai      = 'mdh1x'
+    f_rain         = 'x'
+    f_rain_ai      = 'mdh1x'
     f_sst          = 'mdh1x'
     f_sss          = 'mdh1x'
     f_uocn         = 'mdh1x'
     f_vocn         = 'mdh1x'
     f_frzmlt       = 'mdh1x'
     f_fswfac       = 'mdh1x'
-    f_fswint_ai    = 'x'
-    f_fswabs       = 'mdh1x'
-    f_fswabs_ai    = 'x'
+    f_fswint_ai    = 'mdh1x'
+    f_fswabs       = 'x'
+    f_fswabs_ai    = 'mdh1x'
     f_albsni       = 'mdh1x'
     f_alvdr        = 'mdh1x'
     f_alidr        = 'mdh1x'
@@ -260,15 +264,15 @@
     f_albsno       = 'x'
     f_albpnd       = 'x'
     f_coszen       = 'x'
-    f_flat         = 'mdh1x'
-    f_flat_ai      = 'x'
-    f_fsens        = 'mdh1x'
-    f_fsens_ai     = 'x'
+    f_flat         = 'x'
+    f_flat_ai      = 'mdh1x'
+    f_fsens        = 'x'
+    f_fsens_ai     = 'mdh1x'
     f_fswup        = 'x'
-    f_flwup        = 'mdh1x'
-    f_flwup_ai     = 'x'
-    f_evap         = 'mdh1x'
-    f_evap_ai      = 'x'
+    f_flwup        = 'x'
+    f_flwup_ai     = 'mdh1x'
+    f_evap         = 'x'
+    f_evap_ai      = 'mdh1x'
     f_Tair         = 'mdh1x'
     f_Tref         = 'mdh1x'
     f_Qref         = 'mdh1x'
@@ -280,17 +284,17 @@
     f_meltt        = 'mdh1x'
     f_meltb        = 'mdh1x'
     f_meltl        = 'mdh1x'
-    f_fresh        = 'mdh1x'
-    f_fresh_ai     = 'x'
-    f_fsalt        = 'mdh1x'
-    f_fsalt_ai     = 'x'
+    f_fresh        = 'x'
+    f_fresh_ai     = 'mdh1x'
+    f_fsalt        = 'x'
+    f_fsalt_ai     = 'mdh1x'
     f_fbot         = 'mdh1x'
-    f_fhocn        = 'mdh1x'
-    f_fhocn_ai     = 'x'
+    f_fhocn        = 'x'
+    f_fhocn_ai     = 'mdh1x'
     f_fswthru      = 'x'
-    f_fswthru_ai   = 'x'
-    f_fsurf_ai     = 'x'
-    f_fcondtop_ai  = 'x'
+    f_fswthru_ai   = 'mdh1x'
+    f_fsurf_ai     = 'mdh1x'
+    f_fcondtop_ai  = 'mdh1x'
     f_fmeltt_ai    = 'x'
     f_strairx      = 'mdh1x'
     f_strairy      = 'mdh1x'
@@ -321,7 +325,7 @@
     f_hisnap       = 'x'
     f_aisnap       = 'x'
     f_trsig        = 'x'
-    f_icepresent   = 'x'
+    f_icepresent   = 'mdh1x'
     f_iage         = 'x'
     f_FY           = 'x'
     f_aicen        = 'x'
@@ -337,9 +341,9 @@
     f_fmelttn_ai   = 'x'
     f_flatn_ai     = 'x'
     f_fsensn_ai     = 'x'
-    f_sitempsnic    = 'mdh1x'
-    f_sitemptop     = 'mdh1x'
-    f_sitempbot     = 'mdh1x'
+    f_sitempsnic    = 'x'
+    f_sitemptop     = 'x'
+    f_sitempbot     = 'x'
 /
 
 &icefields_mechred_nml
@@ -368,14 +372,14 @@
     f_apondn       = 'x'
     f_apeffn       = 'x'
     f_hpondn       = 'x'
-    f_apond        = 'mdh1x'
-    f_hpond        = 'mdh1x'
-    f_ipond        = 'mdh1x'
-    f_apeff        = 'mdh1x'
-    f_apond_ai     = 'x'
-    f_hpond_ai     = 'x'
-    f_ipond_ai     = 'x'
-    f_apeff_ai     = 'x'
+    f_apond        = 'x'
+    f_hpond        = 'x'
+    f_ipond        = 'x'
+    f_apeff        = 'x'
+    f_apond_ai     = 'mdh1x'
+    f_hpond_ai     = 'mdh1x'
+    f_ipond_ai     = 'mdh1x'
+    f_apeff_ai     = 'mdh1x'
 /
 
 &icefields_drag_nml

tests/rt.sh

@@ -1058,7 +1058,7 @@ if [[ "${CREATE_BASELINE}" == false ]] ; then
 fi
 
 INPUTDATA_ROOT=${INPUTDATA_ROOT:-${DISKNM}/NEMSfv3gfs/input-data-20250507}
-INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20250806
+INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20250807
 INPUTDATA_LM4=${INPUTDATA_LM4:-${INPUTDATA_ROOT}/LM4_input_data}
 
 shift $((OPTIND-1))

tests/test_changes.list

@@ -1,4 +1,12 @@
-cpld_control_gfsv17_iau intel
-cpld_control_gfsv17_nowav_iau intel
-cpld_restart_gfsv17_nowav_iau intel
-control_c384gdas intel
+cpld_control_gefs intel
+cpld_restart_gefs intel
+cpld_dcp_gefs intel
+cpld_control_gfsv17 intel
+cpld_control_gfsv17_iau intel
+cpld_restart_gfsv17 intel
+cpld_mpi_gfsv17 intel
+cpld_control_gfsv17_nowav_iau intel
+cpld_restart_gfsv17_nowav_iau intel
+cpld_control_sfs intel
+cpld_control_gfsv17 intelllvm
+cpld_control_sfs intelllvm