Merge branch 'NOAA-EMC:develop' into ww3_gse2

NOAA-EMC · Dec 31, 2024 · 3e273ed · 3e273ed
2 parents 667c2dc + e82df78
commit 3e273ed
Show file tree

Hide file tree

Showing 6 changed files with 255 additions and 82 deletions.
diff --git a/model/src/w3gridmd.F90 b/model/src/w3gridmd.F90
@@ -845,7 +845,7 @@ MODULE W3GRIDMD
 #ifdef W3_ST4
   INTEGER                 :: SWELLFPAR, SDSISO, SDSBRFDF, SINTABLE,&
                              TAUWBUG
-  REAL 		   :: SDSBCHOICE
+  REAL                    :: SDSBCHOICE                     
   REAL                    :: ZWND, ALPHA0, Z0MAX, BETAMAX, SINTHP,&
        ZALP, Z0RAT, TAUWSHELTER, SWELLF,    &
        SWELLF2,SWELLF3,SWELLF4, SWELLF5,    &

diff --git a/model/src/w3initmd.F90 b/model/src/w3initmd.F90
@@ -658,7 +658,6 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD,  FLGR2, FLGD,
       STOP
     ENDIF
 #endif
-
     !
     ! 1.c Open files without unpacking MDS ,,,
     !
@@ -1240,7 +1239,11 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD,  FLGR2, FLGD,
     !
     ! 4.d Preprocessing for point output.
     !
-    IF ( FLOUT(2) ) CALL W3IOPP ( NPT, XPT, YPT, PNAMES, IMOD )
+#ifdef W3_MPI    
+    IF ( FLOUT(2) ) CALL W3IOPP ( NPT, XPT, YPT, PNAMES, IMOD, MPI_COMM_WAVE )
+#else 
+    IF ( FLOUT(2) ) CALL W3IOPP ( NPT, XPT, YPT, PNAMES, IMOD, 1 )
+#endif 
 #ifdef W3_PDLIB
     CALL DEALLOCATE_PDLIB_GLOBAL(IMOD)
 #endif