Further align merge branch with dev/ufs-weather-model (answer-neutral)

Second hunk-by-hunk pass minimizing the diff against dev/ufs-weather-model
without changing answers, breaking exact-restart, or removing CESM-specific
code. All changes are provably inactive or no-ops for CESM configurations.

Files now identical to dev/ufs-weather-model (whitespace-only divergence):
- w3sic4md.F90, w3srcemd.F90: taken verbatim from dev/ufs-weather-model.

w3wavemd.F90:
- ODAT dummy dimension 35 -> 40 (matching UFS). ODAT is unused in the body
  in both branches and every call site passes a 40-element array
  (wav_shel_inp odat(40) via the cap; wmwavemd DUMMY2(40)).
- Re-add UFS guards that are no-ops under CESM defaults (use_restartnc and
  logfile_is_assigned default .false., verboselog defaults .true., none set
  by CESM code): "if (.not. use_restartnc)" around the FLOUT(4)/FLOUT(8)
  MPI restart prep and on the J=8 second-restart-stream output;
  ".and. verboselog" on three NAPLOG log writes;
  "if (.not. logfile_is_assigned)" around the NDSO BACKSPACE.
- Restore W3_T-only ILEN declaration/use (W3_T never set in CESM builds),
  UFS FLOUTG/FLOUTG2 = .false. declaration initializers, and several
  comment/blank-line/trailing-space differences.

w3iogomd.F90 (W3OUTG): restore UFS USE block exactly (the extra imports
IAPROC/NAPROC/NAPFLD/NSEALM were unused; NDST is used only under W3_T) and
remove the unused SWW declaration.

wav_shr_mod.F90: re-add the wav_loginit subroutine present in UFS (not
called by CESM, harmless); remove unused locals (ierr, len, i, j x2, sec);
align comment spacing.

w3gridmd.F90: restore upstream changelog comment order and remove a
trailing space. w3iogrmd.F90: align a continuation-line spacing.
w3iorsmd.F90: restore two blank lines and the upstream TIMETAG format
string (identical formatted output). wav_import_export.F90 /
wav_shel_inp.F90: remove unused merge-side locals (num, fvalue, ofile).

Deliberately NOT aligned (kept merge-branch side): the 4961 FORMAT
missing-comma fix and the duplicate FLAG0 declaration removal (both fix
real UFS bugs), the IDOUT(6,14) label, STK_TAIL documentation, validated
newer-develop physics, and all CESM build/cap/output/restart architecture.

Verified: full coupled build succeeds; ERS_Ld3.TL319_t232_wg37.GW_JRA
passes exact-restart (COMPARE_base_rest) and remains bit-identical to
merge_develop across WW3, coupler, MOM6, and CICE history output.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: alperaltuntas

model/src/w3gridmd.F90

@@ -115,8 +115,8 @@ MODULE W3GRIDMD
   !/    19-Jul-2021 : Momentum and air density support    ( version 7.14 )
   !/    28-Feb-2023 : GQM as an alternative for NL1       ( version 7.15 )
   !/    11-Jan-2024 : New namelist parameters for IC4     ( version 7.15 )
-  !/    04-Jul-2025 : Remove labelled statements          ( version X.XX )
   !/    03-May-2024 : New CAPCHNK parameters for SIN4     ( version 7.15 )
+  !/    04-Jul-2025 : Remove labelled statements          ( version X.XX )
   !/
   !/    Copyright 2009-2013 National Weather Service (NWS),
   !/       National Oceanic and Atmospheric Administration.  All rights
@@ -1748,7 +1748,7 @@ SUBROUTINE W3GRID()
     !  initializes TAUWX/Y to zero in W3SRCE
     VISCSTRESS =0
     CAPCHA   = 0.     ! =1 indicates capping of drag is active
-    CHAMIN   = 0.0001 ! 
+    CHAMIN   = 0.0001 !
     CHA0     = ALPHA0 ! initial value for charnock
     UCAP     = 30.    ! U10 threshold from which drag capping is applied
     SIGMAUCAP = 10.   ! Width for reduction of drag beyond UCAP

model/src/w3iogomd.F90

@@ -1310,12 +1310,16 @@ SUBROUTINE W3OUTG ( A, FLPART, FLOUTG, FLOUTG2 )
          HCMAXE, HMAXE, HCMAXD, HMAXD, QP, PQP,      &
          PTHP0, PPE, PGW, PSW, PTM1, PT1, PT2, PEP,  &
          WBT, QKK
-    USE W3ODATMD, ONLY: NDST, UNDEF, IAPROC, NAPROC, NAPFLD,        &
-         ICPRT, DTPRT, WSCUT, NOSWLL, FLOGRD, FLOGR2,&
-         NOGRP, NGRPP
-    USE W3ADATMD, ONLY: NSEALM
+      ! USSHX, USSHY : surface layer (SL) averaged SD
+      ! HSL          : surface layer depth (1/5 of the mixed layer depth
+      !                from the coupler)
     USE W3ADATMD, ONLY: USSHX, USSHY
     USE W3IDATMD, ONLY: HSL
+    USE W3ODATMD, ONLY: UNDEF, ICPRT, DTPRT, WSCUT,  &
+         NOSWLL, FLOGRD, FLOGR2, NOGRP, NGRPP
+#ifdef W3_T
+    USE W3ODATMD, ONLY: NDST
+#endif
 #ifdef W3_S
     USE W3SERVMD, ONLY: STRACE
 #endif
@@ -1374,7 +1378,6 @@ SUBROUTINE W3OUTG ( A, FLPART, FLOUTG, FLOUTG2 )
     LOGICAL                 :: FLOLOC(NOGRP,NGRPP)
     ! SWW: angle between wind and waves
     ! LHSL: local surface layer depth
-    REAL                    :: SWW
     REAL                    :: LHSL
     ! tmp variable for surface layer averaged Stokes drift
     REAL                    :: USSCOH

model/src/w3iogrmd.F90

@@ -1186,7 +1186,7 @@ SUBROUTINE W3IOGR ( INXOUT, NDSM, IMOD, FEXT &
       WRITE (NDSM)                                                &
         LMPENABLED, SDTAIL, HSLMODE
       ELSE
-        READ (NDSM,IOSTAT=IERR)                                      &
+        READ (NDSM,IOSTAT=IERR)                                   &
              LMPENABLED, SDTAIL, HSLMODE
         IF (IERR.NE.0) CALL EXTIOF(NDSE,IERR,'W3IOGR','mod_def.'//FILEXT(:IEXT),51)
     END IF

model/src/w3iorsmd.F90

@@ -539,14 +539,16 @@ SUBROUTINE W3IORS ( INXOUT, NDSR, DUMFPI, IMOD, FLRSTRT , filename)
       ELSE
         FNMPRE_LOCAL = FNMRST
       END IF
+
+
       I      = LEN_TRIM(FILEXT)
       J      = LEN_TRIM(FNMPRE_LOCAL)
       !
       !CHECKPOINT RESTART FILE
       ITMP=0
       IF ( PRESENT(FLRSTRT) ) THEN
         IF (FLRSTRT) THEN
-          WRITE(TIMETAG,"(i8.8,'.'i6.6)")TIME(1),TIME(2)
+          WRITE(TIMETAG, '(i8.8, ".", i6.6)') TIME(1), TIME(2)
           FNAME=TIMETAG//'.restart.'//FILEXT(:I)
           ITMP=1
         END IF
@@ -566,7 +568,6 @@ SUBROUTINE W3IORS ( INXOUT, NDSR, DUMFPI, IMOD, FLRSTRT , filename)
       WRITE (NDST,9001) trim(FNAME), LRECL
 #endif
       !
-
       IF(NDST.EQ.NDSR)THEN
         IF ( IAPROC .EQ. NAPERR )                                    &
              WRITE(NDSE,'(A,I8)')'UNIT NUMBERS OF RESTART FILE AND '&

model/src/w3sic4md.F90

@@ -706,7 +706,7 @@ SUBROUTINE W3SIC4 (A, DEPTH, CG, IX, IY, S, D)
       DO IK=1,NK
         WN_I(IK)  = Chf*(hice**mpow)*(FREQ(IK)**npow)
       END DO
-
+    
     CASE (10)
       ! Cubic fit to Meylan, Horvat & Bitz 2021
       ! ICECOEF1 is thickness
@@ -734,15 +734,15 @@ SUBROUTINE W3SIC4 (A, DEPTH, CG, IX, IY, S, D)
                   (-0.00010791)*x1sqr*x2 + &
                   0.00031073*x1**3 + 1.5996e-06*x2**3 + 0.090994*x3**3
         KARG1(IK)=min(KARG1(IK),0.0)
-        ALPHA(IK) = 10.0**KARG1(IK)
+        ALPHA(IK) = 10.0**KARG1(IK)  
         perfour=x1sqr*x1sqr
         if ((x1.gt.5.0) .and. (x1.lt.20.0)) then
           ALPHA(IK) = ALPHA(IK) + amhb/x1sqr+bmhb/perfour
         else if (x1.gt.20.0) then
           ALPHA(IK) = amhb/x1sqr+bmhb/perfour
         endif
-        WN_I(IK) = ALPHA(IK) * 0.5
-      end do
+          WN_I(IK) = ALPHA(IK) * 0.5
+        end do
 
     CASE DEFAULT
       WN_I = ICECOEF1 !Default to IC1: Uniform in k

model/src/w3srcemd.F90

@@ -2118,6 +2118,7 @@ SUBROUTINE W3SRCE ( srce_call, IT, ISEA, JSEA, IX, IY, IMOD,          &
       WRITE(740+IAPROC,*) '3 : sum(SPEC)=', sum(SPEC)
     END IF
 #endif
+
     IF ( INFLAGS2(4).AND.ICE.GT.0 ) THEN
       IF (.NOT. IC_NUMERICS ) THEN
         IF (IICEDISP) THEN
@@ -2168,6 +2169,7 @@ SUBROUTINE W3SRCE ( srce_call, IT, ISEA, JSEA, IX, IY, IMOD,          &
 #ifdef W3_IS1
         CALL W3SIS1 ( SPEC, ICE, VSIR )
 #endif
+      
         SPEC2 = SPEC
         !
         TAUICE(:) = 0.

model/src/w3wavemd.F90

@@ -563,6 +563,8 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
     USE W3ODATMD,         ONLY : FNMRST
     USE W3GDATMD,         ONLY : MAPST2
 #endif
+    use w3odatmd        , only : use_historync, use_restartnc
+    use w3odatmd        , only : logfile_is_assigned, verboselog
 #if defined(W3_T) || defined(W3_REFRX)
     USE W3GDATMD,  ONLY : NSEA
 #endif
@@ -580,7 +582,7 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
     !/ ------------------------------------------------------------------- /
     !/ Parameter list
     !/
-    INTEGER, INTENT(IN)           :: IMOD, TEND(2),ODAT(35)
+    INTEGER, INTENT(IN)           :: IMOD, TEND(2),ODAT(40)
     LOGICAL, INTENT(IN), OPTIONAL :: STAMP, NO_OUT
 #ifdef W3_OASIS
     type(MPI_COMM), INTENT(IN), OPTIONAL :: ID_LCOMM
@@ -590,6 +592,9 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
     !/ ------------------------------------------------------------------- /
     !/ Local parameters :
     !/
+#ifdef W3_T
+    INTEGER                 :: ILEN
+#endif
 #ifdef W3_S
     INTEGER, SAVE           :: IENT = 0
 #endif
@@ -643,9 +648,10 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
     !
     REAL, ALLOCATABLE       :: TAUWX(:), TAUWY(:)
     !
-    LOGICAL                 :: FLACT, FLZERO, FLFRST, FLMAP, TSTAMP,   &
-                               SKIP_O, FLAG_O, FLDDIR, READBC,         &
-                               FLOUTG, FLPFLD, FLPART, LOCAL, FLOUTG2
+    LOGICAL                 :: FLACT, FLZERO, FLFRST, FLMAP, TSTAMP,&
+         SKIP_O, FLAG_O, FLDDIR, READBC,      &
+         FLOUTG = .false., FLPFLD,            &
+         FLPART, LOCAL, FLOUTG2 = .false.
     !
 #ifdef W3_MPI
     LOGICAL                 :: FLGMPI(0:8)
@@ -763,7 +769,9 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
       FLPFLD = FLPFLD .OR. FLOGRD(4,J) .OR. FLOGR2(4,J)
     END DO
     !
-    IF ( IAPROC .EQ. NAPLOG ) BACKSPACE ( NDSO )
+    if (.not. logfile_is_assigned) then
+      IF ( IAPROC .EQ. NAPLOG ) BACKSPACE ( NDSO )
+    end if
     !
     IF ( FLCOLD ) THEN
       DTDYN = 0.
@@ -801,7 +809,8 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
     ! 0.d Test output
     !
 #ifdef W3_T
-    WRITE (NDST,9000) IMOD, trim(FILEXT), TEND
+    ILEN   = LEN_TRIM(FILEXT)
+    WRITE (NDST,9000) IMOD, FILEXT(:ILEN), TEND
 #endif
     !
     ! 1.  Check the consistency of the input ----------------------------- /
@@ -1663,7 +1672,7 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
               WRITE(740+IAPROC,*) '     SHAVETOT=', SHAVETOT(JSEA)
               FLUSH(740+IAPROC)
 #endif
-            ENDIF 
+            ENDIF
           END DO ! JSEA
         END IF ! PDLIB
 #endif
@@ -2410,7 +2419,7 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
           DTG    = DTTST / REAL(NT-IT)
         END IF
         !
-        IF ( FLACT .AND. IT.NE.NT .AND. IAPROC.EQ.NAPLOG ) THEN
+        IF ( FLACT .AND. IT.NE.NT .AND. IAPROC.EQ.NAPLOG .and. verboselog) THEN
           CALL STME21 ( TIME , IDTIME )
           IF ( IDLAST .NE. TIME(1) ) THEN
             WRITE (NDSO,900) ITIME, IPASS, IDTIME(01:19), IDACT, OUTID
@@ -2430,7 +2439,7 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
 #endif
         !
         !
-      END DO
+      END DO ! DO IT = IT0, NT
 
       IF ( .NOT. FLZERO ) THEN
 #ifdef W3_TIMINGS
@@ -2580,33 +2589,35 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
 #endif
         !
 #ifdef W3_MPI
-        IF ( FLOUT(4) .AND. NRQRS.NE.0 ) THEN
-          IF ( DSEC21(TIME,TONEXT(:,4)).EQ.0. ) THEN
-            CALL MPI_STARTALL ( NRQRS, IRQRS , IERR_MPI )
-            FLGMPI(4) = .TRUE.
-            NRQMAX    = MAX ( NRQMAX , NRQRS )
+        if (.not. use_restartnc) then
+          IF ( FLOUT(4) .AND. NRQRS.NE.0 ) THEN
+            IF ( DSEC21(TIME,TONEXT(:,4)).EQ.0. ) THEN
+              CALL MPI_STARTALL ( NRQRS, IRQRS , IERR_MPI )
+              FLGMPI(4) = .TRUE.
+              NRQMAX    = MAX ( NRQMAX , NRQRS )
 #endif
 #ifdef W3_MPIT
-            WRITE (NDST,9043) '4 ', NRQRS, NRQMAX, NAPRST
+              WRITE (NDST,9043) '4 ', NRQRS, NRQMAX, NAPRST
 #endif
 #ifdef W3_MPI
+            END IF
           END IF
-        END IF
 #endif
-        !
+          !
 #ifdef W3_MPI
-        IF ( FLOUT(8) .AND. NRQRS.NE.0 ) THEN
-          IF ( DSEC21(TIME,TONEXT(:,8)).EQ.0. ) THEN
-            CALL MPI_STARTALL ( NRQRS, IRQRS , IERR_MPI )
-            FLGMPI(8) = .TRUE.
-            NRQMAX    = MAX ( NRQMAX , NRQRS )
+          IF ( FLOUT(8) .AND. NRQRS.NE.0 ) THEN
+            IF ( DSEC21(TIME,TONEXT(:,8)).EQ.0. ) THEN
+              CALL MPI_STARTALL ( NRQRS, IRQRS , IERR_MPI )
+              FLGMPI(8) = .TRUE.
+              NRQMAX    = MAX ( NRQMAX , NRQRS )
 #endif
 #ifdef W3_MPIT
-            WRITE (NDST,9043) '8 ', NRQRS, NRQMAX, NAPRST
+              WRITE (NDST,9043) '8 ', NRQRS, NRQMAX, NAPRST
 #endif
 #ifdef W3_MPI
+            END IF
           END IF
-        END IF
+        end if ! if (.not. use_restartnc)
 #endif
         !
 #ifdef W3_MPI
@@ -2644,7 +2655,6 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
         call print_memcheck(memunit, 'memcheck_____:'//' WW3_WAVE AFTER TIME LOOP 2')
         !
         ! 4.c Reset next output time
-
         !
         TOFRST(1) = -1
         TOFRST(2) =  0
@@ -2821,7 +2831,7 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
 
         ! If there is a second stream of restart files then J=8 and FLOUT(8)=.TRUE.
         J=8
-        IF ( FLOUT(J) ) THEN
+        IF ( FLOUT(J) .and. .not. use_restartnc) THEN
           !
           ! 4.d Perform output
           !
@@ -2889,7 +2899,7 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
       !
       ! 5.  Update log file ------------------------------------------------ /
       !
-      IF ( IAPROC.EQ.NAPLOG ) THEN
+      IF ( IAPROC.EQ.NAPLOG .and. verboselog) THEN
         !
         CALL STME21 ( TIME , IDTIME )
         IF ( FLCUR ) THEN
@@ -2942,7 +2952,7 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
       WRITE (SCREEN,951) STTIME
     END IF
 
-    IF ( IAPROC .EQ. NAPLOG ) WRITE (NDSO,902)
+    IF ( IAPROC .EQ. NAPLOG .and. verboselog) WRITE (NDSO,902)
     !
     DEALLOCATE(FIELD)
     DEALLOCATE(TAUWX, TAUWY)

model/src/wav_import_export.F90

@@ -94,8 +94,7 @@ subroutine advertise_fields(importState, ExportState, flds_scalar_name, rc)
     integer          , intent(out) :: rc
 
     ! local variables
-    integer          :: n, num
-    character(len=2) :: fvalue
+    integer          :: n
     character(len=*), parameter :: subname='(wav_import_export:advertise_fields)'
     !-------------------------------------------------------------------------------
 

model/src/wav_shel_inp.F90

@@ -168,7 +168,6 @@ subroutine read_shel_config(mpi_comm, mds, time0_overwrite, timen_overwrite)
     character(len=256)  :: tmpline, test
     character(len=1024) :: fldrst=''
     character(len=80)   :: linein
-    character(len=30)   :: ofile ! w3_cou only
     character(len=8)    :: words(7)=''
     character(len=256)  :: filename
     logical             :: flflg, flhom, tflagi, prtfrm, flgnml, flh(-7:10)