Merge remote-tracking branch 'EMC/dev/ufs-weather-model' into syncdev2ufs_20250730

Author: JessicaMeixner-NOAA

model/src/w3initmd.F90

@@ -981,38 +981,29 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD,  FLGR2, FLGD,
     VA(:,:) = 0.
 #ifdef W3_PIO
     if (use_restartnc) then
-      if (runtype == 'continue' )then
-        call set_user_timestring(time,user_timestring)
+      call set_user_timestring(time,user_timestring)
+      if (restart_from_binary) then
+        fname = trim(user_restfname)//trim(user_timestring)
+      else
+        fname = trim(user_restfname)//trim(user_timestring)//'.nc'
+      endif
+      inquire(file=trim(fname), exist=exists)
+      if (exists) then
         if (restart_from_binary) then
-          fname = trim(user_restfname)//trim(user_timestring)
-        else
-          fname = trim(user_restfname)//trim(user_timestring)//'.nc'
-        endif
-        inquire(file=trim(fname), exist=exists)
-        if (exists) then
-          if (restart_from_binary) then
-            call w3iors('READ', nds(6), sig(nk), imod, filename=trim(fname))
-          else
-            call read_restart(trim(fname), va=va, mapsta=mapsta, mapst2=mapst2)
-          end if
+          call w3iors('READ', nds(6), sig(nk), imod, filename=trim(fname))
         else
-          call extcde (60, msg="required restart file " // trim(fname) // " does not exist")
+          call read_restart(trim(fname), va=va, mapsta=mapsta, mapst2=mapst2)
         end if
       else
-        if (restart_from_binary) then
-          call set_user_timestring(time,user_timestring)
-          fname = trim(user_restfname)//trim(user_timestring)
-          inquire(file=trim(fname), exist=exists)
-          if (exists) then
-            call w3iors('READ', nds(6), sig(nk), imod, filename=trim(fname))
-          else
-            call extcde (60, msg="required restart file " // trim(fname) // " does not exist")
-          end if
-        else
+        if (runtype == 'continue') then
+          call extcde (60, msg="required restart file " // trim(fname) // " does not exist")
+        elseif (restart_from_binary) then 
+          call extcde (60, msg="required restart file " // trim(fname) // " does not exist")
+        else 
           call read_restart('none')
-          ! mapst2 is module variable defined in read of mod_def; maptst is from 2.b above
-          flcold = .true.
-        end if
+         ! mapst2 is module variable defined in read of mod_def; maptst is from 2.b above
+         flcold = .true.
+        endif 
       end if
     else
 #endif

model/src/wav_import_export.F90

@@ -283,6 +283,11 @@ subroutine import_fields( gcomp, time0, timen, rc )
     use w3wdatmd    , only: w3setw
 #ifdef W3_CESMCOUPLED
     use w3idatmd    , only: HSL
+#else
+    use wav_shr_mod , only : casename
+#ifdef W3_MPI
+    use wmmdatmd    , only: mpi_comm_grd
+#endif
 #endif
 
     ! input/output variables
@@ -299,6 +304,8 @@ subroutine import_fields( gcomp, time0, timen, rc )
     real(r4)                :: def_value
     character(len=10)       :: uwnd
     character(len=10)       :: vwnd
+    integer                 :: isea
+    real(r4), parameter     :: fillv = 9.99e20
     real(r4), allocatable   :: wxdata(:)      ! only needed if merge_import
     real(r4), allocatable   :: wydata(:)      ! only needed if merge_import
     character(len=*), parameter :: subname='(wav_import_export:import_fields)'
@@ -357,6 +364,14 @@ subroutine import_fields( gcomp, time0, timen, rc )
       if (state_fldchk(importState, 'So_u')) then
         call SetGlobalInput(importState, 'So_u', vm, global_data, rc)
         if (ChkErr(rc,__LINE__,u_FILE_u)) return
+
+        if(trim(casename) == 'ufs.hafs') then
+          do isea = 1,nsea
+            if(abs(global_data(isea)-fillv).lt.0.01) then
+              global_data(isea)=0.0
+            end if
+          end do
+        end if
         call FillGlobalInput(global_data, CX0)
       end if
 
@@ -365,6 +380,13 @@ subroutine import_fields( gcomp, time0, timen, rc )
       if (state_fldchk(importState, 'So_v')) then
         call SetGlobalInput(importState, 'So_v', vm, global_data, rc)
         if (ChkErr(rc,__LINE__,u_FILE_u)) return
+        if(trim(casename) == 'ufs.hafs') then
+          do isea = 1,nsea
+            if(abs(global_data(isea)-fillv).lt.0.01) then
+              global_data(isea)=0.0
+            end if
+          end do
+        end if
         call FillGlobalInput(global_data, CY0)
       end if
     end if