ww3_shom: more merging

erdc · Oct 7, 2024 · 5aad643 · 5aad643
1 parent cf79a25
commit 5aad643
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/model/src/w3gridmd.F90 b/model/src/w3gridmd.F90
@@ -3336,7 +3336,7 @@ SUBROUTINE W3GRID()
       WRITE (NDSO,2953) CFLTM, WDTHCG, WDTHTH
 #endif
       !
-      WRITE (NDSO,*) UGBCCFL, UGOBCAUTO, UGOBCDEPTH,TRIM(UGOBCFILE), &
+      WRITE (NDSO,2956) UGBCCFL, UGOBCAUTO, UGOBCDEPTH,TRIM(UGOBCFILE), &
            EXPFSN, EXPFSPSI, EXPFSFCT, IMPFSN, EXPTOTAL,&
            IMPTOTAL, IMPREFRACTION, IMPFREQSHIFT,      &
            IMPSOURCE, LREAD2DM, SETUP_APPLY_WLV,        &

diff --git a/model/src/w3initmd.F90 b/model/src/w3initmd.F90
@@ -421,7 +421,7 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD,  FLGR2, FLGD,
     use yowNodepool, only: npa
     use yowRankModule, only : rank
 #endif
-    USE W3GDATMD, ONLY: GTYPE, UNGTYPE, IOBDP_LOC
+    USE W3GDATMD, ONLY: GTYPE, UNGTYPE
 #ifdef W3_PDLIB
     USE PDLIB_W3PROFSMD, ONLY : PDLIB_MAPSTA_INIT, SET_IOBDP_PDLIB, PDLIB_IOBP_INIT, SET_IOBPA_PDLIB
     USE PDLIB_W3PROFSMD, ONLY : BLOCK_SOLVER_INIT, BLOCK_SOLVER_EXPLICIT_INIT, PDLIB_INIT, DEALLOCATE_PDLIB_GLOBAL
@@ -1286,9 +1286,9 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD,  FLGR2, FLGD,
       !Li     IF ( ISEA .NE. 0) THEN
       WLVeff=WLV(ISEA)
 #ifdef W3_SETUP
-!      IF (DO_CHANGE_WLV) THEN
-!        WLVeff=WLVeff + ZETA_SETUP(ISEA)
-!      END IF
+      IF (DO_CHANGE_WLV) THEN
+        WLVeff=WLVeff + ZETA_SETUP(ISEA)
+      END IF
 #endif
 #ifdef W3_DEBUGSTP
       max_val = MAX(max_val, WLVeff)
@@ -1315,9 +1315,9 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD,  FLGR2, FLGD,
       CALL INIT_GET_ISEA(ISEA, JSEA)
       WLVeff=WLV(ISEA)
 #ifdef W3_SETUP
-!      IF (DO_CHANGE_WLV) THEN
-!        WLVeff=WLVeff + ZETA_SETUP(ISEA)
-!      END IF
+      IF (DO_CHANGE_WLV) THEN
+        WLVeff=WLVeff + ZETA_SETUP(ISEA)
+      END IF
 #endif
 #ifdef W3_DEBUGSTP
       max_val = MAX(max_val, WLVeff)
@@ -1335,8 +1335,7 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD,  FLGR2, FLGD,
     !
 #ifdef W3_PDLIB
     IF ( IAPROC .LE. NAPROC ) THEN
-      CALL SET_IOBDP_PDLIB
-      WRITE(*,*) MAXVAL(IOBDP_LOC), MINVAL(IOBDP_LOC) 
+      CALL SET_IOBDP_PDLIB 
     ENDIF
 #endif
 

diff --git a/model/src/w3wavset.F90 b/model/src/w3wavset.F90
@@ -5,7 +5,6 @@
 !> @author Aron Roland
 !> @author Mathieu Dutour-Sikiric
 !> @date 1-Jun-2018
-#define W3_DEBUGSTP
 !>
 !     ----------------------------------------------------------------
 !>