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/w3initmd.F90

@@ -109,7 +109,10 @@ MODULE W3INITMD
 !  7. Source code :
 !
 !/ ------------------------------------------------------------------- /
-      PUBLIC
+  ! module default
+  IMPLICIT NONE
+
+  PUBLIC
 !/
       REAL, PARAMETER                :: CRITOS = 15.
       CHARACTER(LEN=10), PARAMETER   :: WWVER  = '7.14  '
@@ -118,8 +121,7 @@ MODULE W3INITMD
 !/
       CONTAINS
 !/ ------------------------------------------------------------------- /
-      SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT      &
-                          , FLGRD,                               &
+  SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT , FLGRD, &
                            FLGR2, FLGD, FLG2, NPT, XPT, YPT, PNAMES,   &
                           IPRT, PRTFRM, MPI_COMM, FLAGSTIDEIN)
 
@@ -414,8 +416,6 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT      &
      USE W3UOSTMD, ONLY: UOST_SETGRID
 #endif
 !/
-      IMPLICIT NONE
-!
 #ifdef W3_MPI
       INCLUDE "mpif.h"
 #endif
@@ -743,8 +743,8 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT      &
       WRITE (NDST,9003) LFILE(:IFL), TFILE(:IFT)
 #endif
 !
-! 2.  Model defintition ---------------------------------------------- /
-! 2.a Read model defintition file
+! 2.  Model definition ---------------------------------------------- /
+! 2.a Read model definition file
 !
 !!/DEBUGMPI     CALL TEST_MPI_STATUS("Case 8")
       CALL W3IOGR ( 'READ', NDS(5), IMOD, FEXT )
@@ -2151,7 +2151,6 @@ SUBROUTINE W3MPII ( IMOD )
 #endif
       USE W3ODATMD, ONLY: NDST, NAPROC, IAPROC
 !/
-      IMPLICIT NONE
 !
 #ifdef W3_MPI
       INCLUDE "mpif.h"
@@ -2189,16 +2188,14 @@ SUBROUTINE W3MPII ( IMOD )
       NXXXX  = NSEALM * NAPROC
 !
 #ifdef W3_MPI
-      CALL MPI_TYPE_VECTOR ( NSEALM, 1, NAPROC, MPI_REAL,        &
-                             WW3_FIELD_VEC, IERR_MPI )
+      CALL MPI_TYPE_VECTOR ( NSEALM, 1, NAPROC, MPI_REAL, WW3_FIELD_VEC, IERR_MPI )
 #endif
 #ifdef W3_DEBUGINIT
       WRITE(740+IAPROC,*) 'W3MPII, step 1'
       FLUSH(740+IAPROC)
 #endif
 #ifdef W3_MPI
-      CALL MPI_TYPE_VECTOR ( NSEALM, 1, NSPEC, MPI_REAL,         &
-                             WW3_SPEC_VEC, IERR_MPI )
+      CALL MPI_TYPE_VECTOR ( NSEALM, 1, NSPEC, MPI_REAL, WW3_SPEC_VEC, IERR_MPI )
 #endif
 #ifdef W3_DEBUGINIT
       WRITE(740+IAPROC,*) 'W3MPII, step 1'
@@ -2284,14 +2281,11 @@ SUBROUTINE W3MPII ( IMOD )
         IF ( IAPPRO(ISP) .NE. IAPROC ) THEN
             ITARG  = IAPPRO(ISP) - 1
             IH     = IH + 1
-            CALL MPI_SEND_INIT ( VA(ISP,1), 1, WW3_SPEC_VEC,     &
-                 ITARG, ISP, MPI_COMM_WAVE, IRQSG1(IH,1), IERR1 )
-            CALL MPI_RECV_INIT ( VA(ISP,1), 1, WW3_SPEC_VEC,     &
-                 ITARG, ISP, MPI_COMM_WAVE, IRQSG1(IH,2), IERR2 )
+            CALL MPI_SEND_INIT ( VA(ISP,1), 1, WW3_SPEC_VEC, ITARG, ISP, MPI_COMM_WAVE, IRQSG1(IH,1), IERR1 )
+            CALL MPI_RECV_INIT ( VA(ISP,1), 1, WW3_SPEC_VEC, ITARG, ISP, MPI_COMM_WAVE, IRQSG1(IH,2), IERR2 )
 #endif
 #ifdef W3_MPIT
-            WRITE (NDST,9022) IH, ISP, ITARG+1,                 &
-                   IRQSG1(IH,1), IERR1, IRQSG1(IH,2), IERR2
+            WRITE (NDST,9022) IH, ISP, ITARG+1, IRQSG1(IH,1), IERR1, IRQSG1(IH,2), IERR2
 #endif
 #ifdef W3_MPI
           END IF
@@ -2364,18 +2358,14 @@ SUBROUTINE W3MPII ( IMOD )
 #endif
 !
 #ifdef W3_MPI
-                  CALL MPI_RECV_INIT                             &
-                     ( WADATS(IMOD)%GSTORE(IP,IBFLOC), 1,        &
-                       WW3_FIELD_VEC, ITARG, ISP, MPI_COMM_WAVE, &
-                       IRQSG2(IH,1), IERR2 )
-                  CALL MPI_SEND_INIT                             &
-                     ( WADATS(IMOD)%SSTORE(IP,IBFLOC), 1,        &
-                       WW3_FIELD_VEC, ITARG, ISP, MPI_COMM_WAVE, &
-                       IRQSG2(IH,2), IERR2 )
+                  CALL MPI_RECV_INIT ( WADATS(IMOD)%GSTORE(IP,IBFLOC), 1,        &
+                       WW3_FIELD_VEC, ITARG, ISP, MPI_COMM_WAVE, IRQSG2(IH,1), IERR2 )
+                  CALL MPI_SEND_INIT ( WADATS(IMOD)%SSTORE(IP,IBFLOC), 1,        &
+                       WW3_FIELD_VEC, ITARG, ISP, MPI_COMM_WAVE, IRQSG2(IH,2), IERR2 )
 #endif
 #ifdef W3_MPIT
-                  WRITE (NDST,9032) IH, ISP, ITARG+1, IBFLOC,   &
-                         IRQSG2(IH,1), IERR1, IRQSG2(IH,2), IERR2
+                  WRITE (NDST,9032) IH, ISP, ITARG+1, IBFLOC, &
+                       IRQSG2(IH,1), IERR1, IRQSG2(IH,2), IERR2
 #endif
 !
 ! ... End of loops
@@ -2602,7 +2592,6 @@ SUBROUTINE W3MPIO ( IMOD )
       USE W3GDATMD, ONLY: GTYPE, UNGTYPE
       USE CONSTANTS, ONLY: LPDLIB
 !/
-      IMPLICIT NONE
 !
 #ifdef W3_MPI
       INCLUDE "mpif.h"
@@ -3789,23 +3778,23 @@ SUBROUTINE W3MPIO ( IMOD )
 #ifdef W3_MPIT
       WRITE (NDST,9011) IH, ' 6/13', IROOT, IT, IRQGO(IH), IERR
 #endif
-#ifdef W3_CESMCOUPLED
 #ifdef W3_MPI
+                END IF
+#endif
+!
+#ifdef W3_MPI
+#ifdef W3_CESMCOUPLED
               IF ( FLGRDALL( 6, 14) ) THEN
                   IH     = IH + 1
                   IT     = IT + 1
-      CALL MPI_SEND_INIT (LANGMT  (1),NSEALM , MPI_REAL, IROOT,   &
+      CALL MPI_SEND_INIT (LANGMT(1),NSEALM , MPI_REAL, IROOT,   &
                                 IT, MPI_COMM_WAVE, IRQGO(IH), IERR)
-                END IF
-#endif
 #ifdef W3_MPIT
       WRITE (NDST,9011) IH, ' 6/14', IROOT, IT, IRQGO(IH), IERR
 #endif
-#endif
-
-#ifdef W3_MPI
-                END IF
-#endif
+              END IF
+#endif !W3_CESMCOUPLED
+#endif !W3_MPI
 !
 #ifdef W3_MPI
               IF ( FLGRDALL( 7, 1) ) THEN
@@ -5210,22 +5199,23 @@ SUBROUTINE W3MPIO ( IMOD )
 #ifdef W3_MPIT
       WRITE (NDST,9011) IH, ' 6/13', IFROM, IT, IRQGO2(IH), IERR
 #endif
-#ifdef W3_CESMCOUPLED
 #ifdef W3_MPI
+                  END IF
+#endif
+!
+#ifdef W3_MPI
+#ifdef W3_CESMCOUPLED
               IF ( FLGRDALL( 6, 14) ) THEN
                   IH     = IH + 1
                   IT     = IT + 1
-      CALL MPI_RECV_INIT (LANGMT  (1),NSEALM , MPI_REAL, IROOT,   &
-                                IT, MPI_COMM_WAVE, IRQGO(IH), IERR)
-                END IF
-#endif
+      CALL MPI_RECV_INIT (LANGMT(I0),1,WW3_FIELD_VEC, IFROM, IT,  &
+                                MPI_COMM_WAVE, IRQGO2(IH), IERR)
 #ifdef W3_MPIT
-      WRITE (NDST,9011) IH, ' 6/14', IROOT, IT, IRQGO(IH), IERR
+      WRITE (NDST,9011) IH, ' 6/14', IFROM, IT, IRQGO2(IH), IERR
 #endif
-#endif
-#ifdef W3_MPI
                   END IF
-#endif
+#endif ! W3_CESMCOUPLED
+#endif ! W3_MPI
 !
 #ifdef W3_MPI
                 IF ( FLGRDALL( 7, 1) ) THEN
@@ -6952,7 +6942,6 @@ SUBROUTINE W3MPIP ( IMOD )
       USE W3PARALL, ONLY: INIT_GET_JSEA_ISPROC
 #endif
 !/
-      IMPLICIT NONE
 !
 #ifdef W3_MPI
       INCLUDE "mpif.h"