Mesh cap update

.github/workflows/gnu.yml

@@ -1,21 +1,32 @@
 name: GNU Linux Build
 on: [push, pull_request]
 
+# Cancel in-progress workflows when pushing to a branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 env:
-  cache_key: gnu4
+  cache_key: gnu5
   CC: gcc-10
   FC: gfortran-10
   CXX: g++-10
 
+
 # Split into a steup step, and a WW3 build step which
-# builds multiple switches in a matrix. The setup is run once and 
+# builds multiple switches in a matrix. The setup is run once and
 # the environment is cached so each build of WW3 can share the dependencies.
 
 jobs:
   setup:
     runs-on: ubuntu-20.04
 
     steps:
+      - name: checkout-ww3
+        if: steps.cache-env.outputs.cache-hit != 'true'
+        uses: actions/checkout@v2
+        with:
+            path: ww3
       # Cache spack, OASIS, and compiler
       # No way to flush Action cache, so key may have # appended
       - name: cache-env
@@ -26,13 +37,7 @@ jobs:
             spack
             ~/.spack
             work_oasis3-mct
-          key: spack-${{ runner.os }}-${{ env.cache_key }}
-
-      - name: checkout-ww3
-        if: steps.cache-env.outputs.cache-hit != 'true'
-        uses: actions/checkout@v2
-        with: 
-            path: ww3
+          key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('ww3/model/ci/spack.yaml') }}
 
       # Build WW3 spack environment
       - name: install-dependencies-with-spack
@@ -72,7 +77,7 @@ jobs:
     steps:
       - name: checkout-ww3
         uses: actions/checkout@v2
-        with: 
+        with:
             path: ww3
 
       - name: cache-env
@@ -83,7 +88,7 @@ jobs:
             spack
             ~/.spack
             work_oasis3-mct
-          key: spack-${{ runner.os }}-${{ env.cache_key }}
+          key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('ww3/model/ci/spack.yaml') }}
 
       - name: build-ww3
         run: |
@@ -102,5 +107,3 @@ jobs:
             cmake .. -DSWITCH=${{ matrix.switch }}
           fi
           make -j2 VERBOSE=1
-
-

.github/workflows/intel.yml

@@ -1,6 +1,11 @@
 name: Intel Linux Build
 on: [push, pull_request]
 
+# Cancel in-progress workflows when pushing to a branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 # Use custom shell with -l so .bash_profile is sourced which loads intel/oneapi/setvars.sh
 # without having to do it in manually every step
 defaults:
@@ -9,22 +14,29 @@ defaults:
 
 # Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran
 env:
-  cache_key: intel5
+  cache_key: intel6
   CC: icc
   FC: ifort
   CXX: icpc
   I_MPI_CC: icc
   I_MPI_F90: ifort
 
 # Split into a dependency build step, and a WW3 build step which
-# builds multiple switches in a matrix. The setup is run once and 
+# builds multiple switches in a matrix. The setup is run once and
 # the environment is cached so each build of WW3 can share the dependencies.
 
 jobs:
   setup:
     runs-on: ubuntu-latest
 
     steps:
+
+      - name: checkout-ww3
+        if: steps.cache-env.outputs.cache-hit != 'true'
+        uses: actions/checkout@v2
+        with:
+            path: ww3
+
       # Cache spack, OASIS, and compiler
       # No way to flush Action cache, so key may have # appended
       - name: cache-env
@@ -36,7 +48,7 @@ jobs:
             ~/.spack
             work_oasis3-mct
             /opt/intel
-          key: spack-${{ runner.os }}-${{ env.cache_key }}
+          key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('ww3/model/ci/spack.yaml') }}
 
       - name: install-intel-compilers
         if: steps.cache-env.outputs.cache-hit != 'true'
@@ -48,12 +60,6 @@ jobs:
           sudo apt-get install intel-oneapi-dev-utilities intel-oneapi-mpi-devel intel-oneapi-openmp intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic
           echo "source /opt/intel/oneapi/setvars.sh" >> ~/.bash_profile
 
-      - name: checkout-ww3
-        if: steps.cache-env.outputs.cache-hit != 'true'
-        uses: actions/checkout@v2
-        with: 
-            path: ww3
-
       # Build WW3 spack environment
       - name: install-dependencies-with-spack
         if: steps.cache-env.outputs.cache-hit != 'true'
@@ -92,7 +98,7 @@ jobs:
     steps:
       - name: checkout-ww3
         uses: actions/checkout@v2
-        with: 
+        with:
             path: ww3
 
       - name: install-intel
@@ -108,7 +114,7 @@ jobs:
             ~/.spack
             work_oasis3-mct
             /opt/intel
-          key: spack-${{ runner.os }}-${{ env.cache_key }}
+          key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('ww3/model/ci/spack.yaml') }}
 
       - name: build-ww3
         run: |
@@ -127,5 +133,3 @@ jobs:
             cmake .. -DSWITCH=${{ matrix.switch }}
           fi
           make -j2 VERBOSE=1
-
-

model/src/cmake/src_list.cmake

@@ -55,6 +55,9 @@ set(ftn_src
   wmupdtmd.F90
   wmwavemd.F90
   w3tidemd.F90
+  wav_grdout.F90
+  w3iogoncdmd.F90
+  wav_shr_flags.F90
   )
 
 set(nuopc_mesh_cap_src
@@ -63,7 +66,6 @@ set(nuopc_mesh_cap_src
   wav_shel_inp.F90
   wav_comp_nuopc.F90
   wav_import_export.F90
-  w3iogoncdmd.F90
   )
 
 set(esmf_multi_cap_src

model/src/constants.F90

@@ -20,7 +20,7 @@ MODULE CONSTANTS
 !/
 !/    Copyright 2009-2012 National Weather Service (NWS),
 !/       National Oceanic and Atmospheric Administration.  All rights
-!/       reserved.  WAVEWATCH III is a trademark of the NWS. 
+!/       reserved.  WAVEWATCH III is a trademark of the NWS.
 !/       No unauthorized use without permission.
 !/
 !  1. Purpose :
@@ -55,7 +55,7 @@ MODULE CONSTANTS
 !
 !      - The flag for generating test output files is included here as
 !        it is needed in both ww3_shel and ww3_multi at the same time.
-!        Make sure that this flag is true if you want to write to the 
+!        Make sure that this flag is true if you want to write to the
 !        test output file !
 !
 !/ ------------------------------------------------------------------- /
@@ -65,10 +65,10 @@ MODULE CONSTANTS
       REAL, PARAMETER         :: GRAV   =    9.806
       REAL, PARAMETER         :: DWAT   = 1000.
       REAL, PARAMETER         :: DAIR   =    1.225
-      REAL, PARAMETER         :: nu_air  = 1.4E-5        
+      REAL, PARAMETER         :: nu_air  = 1.4E-5
 !mdo  *** Changing nu_water to be consistent with DWAT=1000 (assumes 10degC)
-      REAL, PARAMETER         :: nu_water  = 1.31E-6    !mdo   WAS: 3.E-6        
-      REAL, PARAMETER         :: sed_sg  = 2.65        
+      REAL, PARAMETER         :: nu_water  = 1.31E-6    !mdo   WAS: 3.E-6
+      REAL, PARAMETER         :: sed_sg  = 2.65
       REAL, PARAMETER         :: KAPPA = 0.40       !Von Karman's constant
 !
       REAL, PARAMETER         :: PI     = 3.141592653589793
@@ -89,21 +89,21 @@ MODULE CONSTANTS
       ! Filled in by the pre-processor with 'big_endian', 'little_endian', or 'native'
       character(*), parameter :: FILE_ENDIAN = ENDIANNESS
 !
-! Parameters for friction factor table 
+! Parameters for friction factor table
 !
-      INTEGER, PARAMETER       :: SIZEFWTABLE=300  
+      INTEGER, PARAMETER       :: SIZEFWTABLE=300
       REAL                     :: FWTABLE(0:SIZEFWTABLE)
       REAL                     :: DELAB
-      REAL,    PARAMETER       :: ABMIN = -1. 
+      REAL,    PARAMETER       :: ABMIN = -1.
       REAL, PRIVATE, PARAMETER :: ABMAX = 8.
       INTEGER, PARAMETER       :: srce_direct = 0
       INTEGER, PARAMETER       :: srce_imp_post = 1
       INTEGER, PARAMETER       :: srce_imp_pre = 2
       INTEGER, PARAMETER       :: DEBUG_NODE = 1104
       INTEGER, PARAMETER       :: DEBUG_ELEMENT = 50
 
-      LOGICAL                  :: LPDLIB      = .FALSE. 
-      LOGICAL                  :: LSETUP      = .FALSE. 
+      LOGICAL                  :: LPDLIB      = .FALSE.
+      LOGICAL                  :: LSETUP      = .FALSE.
 !
 ! Parameters in support of running as ESMF component
 !
@@ -205,26 +205,26 @@ SUBROUTINE TABU_FW
             fsubw=.08/(ker**2+kei**2)
             fsubw=.5*(fsubwmemo+fsubw)
             dzeta0=.5*(dzeta0memo+dzeta0)
-            END DO   
+            END DO
 !
-! Maximum value of 0.5 for fe is based on field 
-! and lab experiment by Lowe et al. JGR 2005, 2007 
-! 
-            FWTABLE(I)  = MIN(fsubw,0.5) 
+! Maximum value of 0.5 for fe is based on field
+! and lab experiment by Lowe et al. JGR 2005, 2007
+!
+            FWTABLE(I)  = MIN(fsubw,0.5)
 !           WRITE(994,*) 'Friction factor:',I,ABR,FWTABLE(I)
          END DO
       RETURN
       END SUBROUTINE TABU_FW
 
 ! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-SUBROUTINE KZEONE(X, Y, RE0, IM0, RE1, IM1)                      
+SUBROUTINE KZEONE(X, Y, RE0, IM0, RE1, IM1)
 !  June 1999 adaptation to CRESTb, all tests on range of (x,y) have been
 !  bypassed, we implicitly expect X to be positive or |x,y| non zero
-! 
+!
 ! This subroutine is copyright by ACM
 ! see http://www.acm.org/pubs/copyright_policy/softwareCRnotice.html
 ! ACM declines any responsibility of any kind
-! 
+!
 ! THE VARIABLES X AND Y ARE THE REAL AND IMAGINARY PARTS OF
 ! THE ARGUMENT OF THE FIRST TWO MODIFIED BESSEL FUNCTIONS
 ! OF THE SECOND KIND,K0 AND K1.  RE0,IM0,RE1 AND IM1 GIVE
@@ -240,7 +240,7 @@ SUBROUTINE KZEONE(X, Y, RE0, IM0, RE1, IM1)
    DOUBLE PRECISION X, Y, X2, Y2, RE0, IM0, RE1, IM1, &
       R1, R2, T1, T2, P1, P2, RTERM, ITERM, L
    DOUBLE PRECISION , PARAMETER, DIMENSION(8) :: EXSQ = &
-         (/ 0.5641003087264D0,0.4120286874989D0,0.1584889157959D0, & 
+         (/ 0.5641003087264D0,0.4120286874989D0,0.1584889157959D0, &
             0.3078003387255D-1,0.2778068842913D-2,0.1000044412325D-3, &
             0.1059115547711D-5,0.1522475804254D-8 /)
    DOUBLE PRECISION , PARAMETER, DIMENSION(8) :: TSQ = &
@@ -386,7 +386,7 @@ END SUBROUTINE KZEONE
 SUBROUTINE KERKEI(X,KER,KEI)
 !**********************************************************************
 ! Computes the values of the zeroth order Kelvin function Ker and Kei
-! These functions are used to determine the friction factor fw as a 
+! These functions are used to determine the friction factor fw as a
 ! function of the bottom roughness length assuming a linear profile
 ! of eddy viscosity (See Grant and Madsen, 1979)
 !**********************************************************************

model/src/w3adatmd.F90

@@ -340,6 +340,9 @@ MODULE W3ADATMD
 !  7. Source code :
 !
 !/ ------------------------------------------------------------------- /
+      ! module default
+      IMPLICIT NONE
+
       PUBLIC
 !/
 !/ Module private variable for checking error returns
@@ -743,8 +746,6 @@ SUBROUTINE W3NAUX ( NDSE, NDST )
 #ifdef W3_S
       USE W3SERVMD, ONLY: STRACE
 #endif
-!
-      IMPLICIT NONE
 !/
 !/ ------------------------------------------------------------------- /
 !/ Parameter list
@@ -907,8 +908,6 @@ SUBROUTINE W3DIMA  ( IMOD, NDSE, NDST, D_ONLY )
 #ifdef W3_S
       USE W3SERVMD, ONLY: STRACE
 #endif
-!
-      IMPLICIT NONE
 !/
 !/ ------------------------------------------------------------------- /
 !/ Parameter list
@@ -1438,8 +1437,7 @@ SUBROUTINE W3DIMA  ( IMOD, NDSE, NDST, D_ONLY )
                        WADATS(IMOD)%DCXDX(1,NSEAL) ,                      &
                        WADATS(IMOD)%DCYDX(1,NSEAL) ,                      &
                        WADATS(IMOD)%DCXDY(1,NSEAL) ,                      &
-                       WADATS(IMOD)%DCYDY(1,NSEAL) ,                      &
-                       STAT=ISTAT           )
+                       WADATS(IMOD)%DCYDY(1,NSEAL) , STAT=ISTAT           )
           ENDIF
           CHECK_ALLOC_STATUS ( ISTAT )
           WADATS(IMOD)%DDDX = 0.
@@ -1543,7 +1541,7 @@ SUBROUTINE W3DIMA  ( IMOD, NDSE, NDST, D_ONLY )
 ! 5.  Restore previous grid setting if necessary
 !
       IF ( JGRID .NE. IMOD ) CALL W3SETG ( JGRID, NDSE, NDST )
- 
+
 #ifdef W3_MEMCHECK
        WRITE(30000+IAPROC,*) 'memcheck_____:', 'W3DIMA END'
        call getMallocInfo(mallinfos)
@@ -1604,7 +1602,6 @@ SUBROUTINE W3XDMA  ( IMOD, NDSE, NDST, OUTFLAGS )
       USE W3SERVMD, ONLY: STRACE
 #endif
 !
-      IMPLICIT NONE
 !/
 !/ ------------------------------------------------------------------- /
 !/ Parameter list
@@ -2547,7 +2544,6 @@ SUBROUTINE W3DMNL  ( IMOD, NDSE, NDST, NSP, NSPX )
       USE W3SERVMD, ONLY: STRACE
 #endif
 !
-      IMPLICIT NONE
 !/
 !/ ------------------------------------------------------------------- /
 !/ Parameter list
@@ -2756,7 +2752,6 @@ SUBROUTINE W3SETA ( IMOD, NDSE, NDST )
       USE W3SERVMD, ONLY: STRACE
 #endif
 !
-      IMPLICIT NONE
 !/
 !/ ------------------------------------------------------------------- /
 !/ Parameter list
@@ -3191,7 +3186,6 @@ SUBROUTINE W3XETA ( IMOD, NDSE, NDST )
       USE W3SERVMD, ONLY: STRACE
 #endif
 !
-      IMPLICIT NONE
 !/
 !/ ------------------------------------------------------------------- /
 !/ Parameter list