Merge branch 'develop' into ejh_t1

NOAA-EMC · Oct 14, 2023 · 9b895f2 · 9b895f2
2 parents 0b56fb9 + eff6686
commit 9b895f2
Show file tree

Hide file tree

Showing 15 changed files with 909 additions and 10 deletions.
diff --git a/model/src/cmake/switches.json b/model/src/cmake/switches.json
@@ -813,5 +813,15 @@
                 "name": "B4B"
             }
         ]
+    },
+    {
+        "name": "ascii",
+        "num_switches": "upto1",
+        "description": "ASCII output for binary .ww3 file",
+        "valid-options": [
+            {
+                "name": "ASCII"
+            }
+        ]
     }
 ]
diff --git a/model/src/w3gridmd.F90 b/model/src/w3gridmd.F90
@@ -586,6 +586,9 @@ MODULE W3GRIDMD
        IY2, J, JJ, IXR(4), IYR(4), ISEAI(4),&
        IST, NKI, NTHI, NRIC, NRIS, I, IDFT, &
        NSTAT, NBT, NLAND, NOSW, NMAPB, IMAPB
+#ifdef W3_ASCII
+  INTEGER                  :: NDSMA
+#endif
 #ifdef W3_NL2
   INTEGER            :: IDEPTH
 #endif
@@ -5907,9 +5910,16 @@ SUBROUTINE W3GRID()
     !10.  Write model definition file.
     !
     WRITE (NDSO,999)
-    CALL W3IOGR ( 'WRITE', NDSM )
+    CALL W3IOGR ( 'WRITE', NDSM &
+#ifdef W3_ASCII
+                  ,NDSA=NDSMA        &
+#endif
+            )
     !
     CLOSE (NDSM)
+#ifdef W3_ASCII
+    CLOSE (NDSMA)
+#endif
     !
     GOTO 2222
     !

diff --git a/model/src/w3initmd.F90 b/model/src/w3initmd.F90
@@ -239,6 +239,9 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD,  FLGR2, FLGD,
     !                              (first).
     !                          11: Track information file unit number.
     !                          12: Track output file unit number.
+    !                          13: Wave separation output file unit number.
+    !                          14: Grid output file unit number.
+    !                          15: Point output file unit number. ascii
     !       MTRACE  I.A.   I   Array with subroutine tracing information.
     !                           1: Output unit number for trace.
     !                           2: Maximum number of trace prints.