Set option to SMC grid only, remove .inp support

Author: ukmo-daisybrown

model/inp/ww3_ounf.inp

@@ -26,12 +26,12 @@ $ netCDF version [3,4]
 $        and variable type 4 [2 = SHORT, 3 = it depends , 4 = REAL]
 $ swell partitions [0 1 2 3 4 5]
 $ variables in same file [T] or not [F]
-$ double precision output [T] or single precision [F]
+$ double precision output [T] or single precision [F] NOT CURRENTLY SUPPORTED IN .inp
 $
  3 4
  0 1 2
  T
- T
+$ T
 $
 $ -------------------------------------------------------------------- $
 $ File prefix

model/nml/ww3_ounf.nml

@@ -27,7 +27,6 @@
 !     FIELD%LIST                 = 'unset'            ! List of output fields
 !     FIELD%PARTITION            = '0 1 2 3'          ! List of wave partitions ['0 1 2 3 4 5']
 !     FIELD%SAMEFILE             = T                  ! All the variables in the same file
-!     FIELD%DOUBLE               = T                  ! Return coordinates as double precision floats
 !     FIELD%VECTOR               = T                  ! Vector [T] or dir/magnitude [F] for
 !                                                     !   directional fields
 !     FIELD%TYPE                 = 3                  ! [2 = SHORT, 3 = it depends , 4 = REAL]
@@ -55,7 +54,6 @@
   FIELD%TIMESTRIDE       =  '3600'
   FIELD%LIST             =  'DPT WND HS FP DIR SPR MSS'
   FIELD%SAMEFILE         =  F
-  FIELD%DOUBLE           = T
   FIELD%TYPE             =  4
   FIELD%FCVARS           =  F
 /
@@ -101,6 +99,7 @@
 !     SMC%EYO           = -999.9         ! Last latitude
 !     SMC%CELFAC        = 1              ! Cell size factor (SMCTYPE=2 only)
 !     SMC%NOVAL         = UNDEF          ! Fill value for wet cells with no data
+!     SMC%DOUBLE_COORD               = F                  ! Return coordinates as double precision floats
 ! -------------------------------------------------------------------- !
 &SMC_NML
 /

model/src/w3nmlounfmd.F90

@@ -32,7 +32,6 @@ MODULE W3NMLOUNFMD
     CHARACTER(1024)             :: LIST
     CHARACTER(15)               :: PARTITION
     LOGICAL                     :: SAMEFILE
-    LOGICAL                     :: DOUBLE_COORD
     LOGICAL                     :: VECTOR
     INTEGER                     :: TYPE
     CHARACTER(15)               :: TIMEREF
@@ -62,6 +61,7 @@ MODULE W3NMLOUNFMD
     REAL                        :: EXO
     REAL                        :: EYO
     INTEGER                     :: CELFAC
+    LOGICAL                     :: DOUBLE_COORD
   END TYPE NML_SMC_T
 
   ! miscellaneous
@@ -288,7 +288,6 @@ SUBROUTINE READ_FIELD_NML (NDSI, NML_FIELD)
     FIELD%LIST       = 'unset'
     FIELD%PARTITION  = '0 1 2 3'
     FIELD%SAMEFILE   = .TRUE.
-    FIELD%DOUBLE_COORD     = .TRUE.
     FIELD%VECTOR     = .TRUE.
     FIELD%TYPE       = 3
     FIELD%TIMEREF    = 'unset'
@@ -517,6 +516,7 @@ SUBROUTINE READ_SMC_NML (NDSI, NML_SMC)
     SMC%EYO       = -999.9
     SMC%CELFAC    = 1
     SMC%TYPE      = 1
+    SMC%DOUBLE_COORD     = .FALSE.
 
     ! read smc namelist
     REWIND (NDSI)
@@ -620,7 +620,6 @@ SUBROUTINE REPORT_FIELD_NML (NML_FIELD)
     WRITE (NDSN,10) TRIM(MSG),'LIST       = ', TRIM(NML_FIELD%LIST)
     WRITE (NDSN,10) TRIM(MSG),'PARTITION  = ', TRIM(NML_FIELD%PARTITION)
     WRITE (NDSN,13) TRIM(MSG),'SAMEFILE   = ', NML_FIELD%SAMEFILE
-    WRITE (NDSN,13) TRIM(MSG),'DOUBLE_COORD  = ', NML_FIELD%DOUBLE_COORD
     WRITE (NDSN,11) TRIM(MSG),'TYPE       = ', NML_FIELD%TYPE
     WRITE (NDSN,10) TRIM(MSG),'FCVARS     = ', NML_FIELD%FCVARS
     WRITE (NDSN,10) TRIM(MSG),'TIMEREF    = ', NML_FIELD%TIMEREF
@@ -809,8 +808,10 @@ SUBROUTINE REPORT_SMC_NML (NML_SMC)
     WRITE (NDSN,14) TRIM(MSG),'EXO       = ', NML_SMC%EXO
     WRITE (NDSN,14) TRIM(MSG),'EYO       = ', NML_SMC%EYO
     WRITE (NDSN,11) TRIM(MSG),'CELFAC    = ', NML_SMC%CELFAC
+    WRITE (NDSN,13) TRIM(MSG),'DOUBLE_COORD  = ', NML_SMC%DOUBLE_COORD
 
 11  FORMAT (A,2X,A,I12)
+13  FORMAT (A,2X,A,L1)
 14  FORMAT (A,2X,A,F8.2)
 
   END SUBROUTINE REPORT_SMC_NML

model/src/ww3_ounf.F90

@@ -371,7 +371,6 @@ PROGRAM W3OUNF
     TIMEUNIT = NML_FIELD%TIMEUNIT
     NOVAL = NML_FIELD%NOVAL
     MAPSTAOUT = NML_FIELD%MAPSTA
-    ISDOUBLE = NML_FIELD%DOUBLE_COORD
     IF(SMCGRD) THEN
 #ifdef W3_SMC
       SMCOTYPE = NML_SMC%TYPE
@@ -380,6 +379,7 @@ PROGRAM W3OUNF
       EXO = NML_SMC%EXO
       EYO = NML_SMC%EYO
       CELFAC = NML_SMC%CELFAC
+      ISDOUBLE = NML_SMC%DOUBLE_COORD
       SMCNOVAL = NOVAL
 #endif
     ELSE
@@ -436,9 +436,10 @@ PROGRAM W3OUNF
     CALL NEXTLN ( COMSTR , NDSI , NDSE )
     READ (NDSI,*,IOSTAT=IERR) TOGETHER
     IF (IERR.NE.0) CALL EXTIOF(NDSE,IERR,'W3OUNF','INPUT',11)
-    CALL NEXTLN ( COMSTR , NDSI , NDSE )
-    READ (NDSI,*,IOSTAT=IERR) ISDOUBLE
-    IF (IERR.NE.0) CALL EXTIOF(NDSE,IERR,'W3OUNF','INPUT',11)
+    !CALL NEXTLN ( COMSTR , NDSI , NDSE )
+    !READ (NDSI,*,IOSTAT=IERR) ISDOUBLE
+    !IF (IERR.NE.0) CALL EXTIOF(NDSE,IERR,'W3OUNF','INPUT',11) Not yet supported for .inp
+    ISDOUBLE = .FALSE.
 
     !       The following are only configurable via the namelist input
     !       and are hardcoded for .inp files:
@@ -2554,19 +2555,23 @@ SUBROUTINE W3EXNC ( NX, NY, IX1, IXN, IY1, IYN, NSEA,             &
                   CALL CHECK_ERR(IRET)
                 ENDIF ! SMCGRD
 #ifdef W3_RTD
-                IF ( RTDL ) THEN
-                   IF (ISDOUBLE .AND. (SMCOTYPE .NE. 1)) THEN
-                    IRET=NF90_PUT_VAR(NCID,VARID(7),LON2DRGRD(IX1:IXN,IY1:IYN))
-                    CALL CHECK_ERR(IRET)
-                    IRET=NF90_PUT_VAR(NCID,VARID(8),LAT2DRGRD(IX1:IXN,IY1:IYN))
-                    CALL CHECK_ERR(IRET)
-                  ELSE
-                    IRET=NF90_PUT_VAR(NCID,VARID(7),LON2D(IX1:IXN,IY1:IYN))
-                    CALL CHECK_ERR(IRET)
-                    IRET=NF90_PUT_VAR(NCID,VARID(8),LAT2D(IX1:IXN,IY1:IYN))
-                    CALL CHECK_ERR(IRET)
-                  ENDIF
-                END IF
+              IF ( RTDL ) THEN
+#ifdef W3_SMC
+                IF (ISDOUBLE .AND. (SMCOTYPE .NE. 1)) THEN
+                   IRET=NF90_PUT_VAR(NCID,VARID(7),LON2DRGRD(IX1:IXN,IY1:IYN))
+                   CALL CHECK_ERR(IRET)
+                   IRET=NF90_PUT_VAR(NCID,VARID(8),LAT2DRGRD(IX1:IXN,IY1:IYN))
+                   CALL CHECK_ERR(IRET)
+                ELSE
+#endif
+                   IRET=NF90_PUT_VAR(NCID,VARID(7),LON2D(IX1:IXN,IY1:IYN))
+                   CALL CHECK_ERR(IRET)
+                   IRET=NF90_PUT_VAR(NCID,VARID(8),LAT2D(IX1:IXN,IY1:IYN))
+                   CALL CHECK_ERR(IRET)
+#ifdef W3_SMC
+                ENDIF
+#endif
+              END IF
 #endif
               END IF