meshcap 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/bin/build_utils.sh

@@ -829,7 +829,7 @@ create_file_list()
                then
                  core=''
                else
-                 core='wav_kind_mod wav_shr_mod wav_shel_inp wav_comp_nuopc wav_import_export w3iogoncdmd'
+                 core='wav_kind_mod wav_shr_mod wav_shel_inp wav_comp_nuopc wav_import_export wav_grdout wav_shr_flags w3iogoncdmd'
                fi
                core="$core w3fldsmd w3initmd w3wavemd w3wdasmd w3updtmd"
                core="$core wminitmd wmwavemd wmfinlmd wmgridmd wmupdtmd wminiomd"

model/bin/make_makefile.sh

@@ -452,6 +452,8 @@
          'wav_kind_mod'      ) modtest=wav_kind_mod.o ;;
          'wav_shr_mod'       ) modtest=wav_shr_mod.o ;;
          'wav_shel_inp'      ) modtest=wav_shel_inp.o ;;
+         'wav_grdout'        ) modtest=wav_grdout.o ;;
+		 'wav_shr_flags'.    ) modtest=wav_shr_flags.o ;;
          'wav_comp_nuopc'    ) modtest=wav_comp_nuopc.o ;;
          'wav_import_export' ) modtest=wav_import_export.o ;;
          'w3iogoncdmd'       ) modtest=w3iogoncdmd.o ;;

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