update: for feature/ascii PR

MatthewMasarik-NOAA · Oct 10, 2023 · 4d96d2e · 4d96d2e
2 parents c43d127 + 4ff0441
commit 4d96d2e
Show file tree

Hide file tree

Showing 15 changed files with 913 additions and 17 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
@@ -587,6 +587,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
@@ -1163,6 +1166,7 @@ SUBROUTINE W3GRID()
     NDSI   = 10
     NDSS   = 99
     NDSM   = 20
+    NDSM   = 21
     !
     INQUIRE(FILE=TRIM(FNMPRE)//"ww3_grid.nml", EXIST=FLGNML)
     IF (FLGNML) THEN
@@ -5939,9 +5943,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.