Merge pull request ESCOMP#5 from daniele-peano/dev/ww3_forced

Add changes for cplhist
marianna-benassi · Mar 9, 2023 · 3e0af36 · 3e0af36
2 parents 4d73342 + a3d012b
commit 3e0af36
Show file tree

Hide file tree

Showing 64 changed files with 2,118 additions and 1,433 deletions.
diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml
@@ -2,7 +2,7 @@ name: Bump version
 on:
   push:
     branches:
-      - master
+      - main
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/extbuild.yml b/.github/workflows/extbuild.yml
@@ -2,12 +2,12 @@
 name: extbuild
 
 # Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
+# events but only for the main branch
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -19,109 +19,60 @@ jobs:
       CXX: mpicxx
       CPPFLAGS: "-I/usr/include -I/usr/local/include"
       # Versions of all dependencies can be updated here
-      ESMF_VERSION: v8.3.0b13
-      PNETCDF_VERSION: pnetcdf-1.12.3
-      NETCDF_FORTRAN_VERSION: v4.5.2
-      PIO_VERSION: pio2_5_7
+      ESMF_VERSION: v8.4.0
+      PNETCDF_VERSION: checkpoint.1.12.3
+      NETCDF_FORTRAN_VERSION: v4.6.0
+      PIO_VERSION: pio2_5_10
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         # Build the ESMF library, if the cache contains a previous build
         # it will be used instead
-      - id: cache-esmf
-        uses: actions/cache@v2
-        with:
-          path: ~/ESMF
-          key: ${{ runner.os }}-${{ env.ESMF_VERSION }}-ESMF
       - id: load-env
         run: |
           sudo apt-get update
-          sudo apt-get install gfortran wget openmpi-bin netcdf-bin libopenmpi-dev libnetcdf-dev
-      - id: checkout-ESMF
-        uses: actions/checkout@v3
-        with:
-          repository: esmf-org/esmf
-          path: esmf-src
-          ref: ${{ env.ESMF_VERSION }}
-      - id: build-ESMF
-        if: steps.cache-esmf.outputs.cache-hit != 'true'
-        run: |
-          #wget https://github.com/esmf-org/esmf/archive/${{ env.ESMF_VERSION }}.tar.gz
-          #tar -xzvf ${{ env.ESMF_VERSION }}.tar.gz
-          #pushd esmf-${{ env.ESMF_VERSION }}
-          pushd esmf-src
-          export ESMF_DIR=`pwd`
-          export ESMF_COMM=openmpi
-          export ESMF_YAMLCPP="internal"
-          export ESMF_INSTALL_PREFIX=$HOME/ESMF
-          export ESMF_BOPT=g
-          make
-          make install
-          popd
-      - id: cache-pnetcdf
-        uses: actions/cache@v2
-        with:
-          path: ~/pnetcdf
-          key: ${{ runner.os }}-${{ env.PNETCDF_VERSION}}-pnetcdf
-      - name: pnetcdf build
-        if: steps.cache-pnetcdf.outputs.cache-hit != 'true'
-        run: |
-          wget https://parallel-netcdf.github.io/Release/${{ env.PNETCDF_VERSION }}.tar.gz
-          tar -xzvf ${{ env.PNETCDF_VERSION }}.tar.gz
-          ls -l
-          pushd ${{ env.PNETCDF_VERSION }}
-          ./configure --prefix=$HOME/pnetcdf --enable-shared --disable-cxx
-          make
-          make install
-          popd
-      - name: Cache netcdf-fortran
-        id: cache-netcdf-fortran
-        uses: actions/cache@v2
+          sudo apt-get update
+          sudo apt-get install gfortran
+          sudo apt-get install wget
+          sudo apt-get install openmpi-bin libopenmpi-dev
+          sudo apt-get install netcdf-bin libnetcdf-dev libnetcdff-dev
+          sudo apt-get install pnetcdf-bin libpnetcdf-dev
+          sudo apt-get install autotools-dev autoconf
+      - id: cache-esmf
+        uses: actions/cache@v3
         with:
-          path: ~/netcdf-fortran
-          key: ${{ runner.os }}-${{ env.NETCDF_FORTRAN_VERSION }}-netcdf-fortran
-      - name: netcdf fortran build
-        if: steps.cache-netcdf-fortran.outputs.cache-hit != 'true'
-        run: |
-          wget https://github.com/Unidata/netcdf-fortran/archive/${{ env.NETCDF_FORTRAN_VERSION }}.tar.gz
-          tar -xzvf ${{ env.NETCDF_FORTRAN_VERSION }}.tar.gz
-          ls -l
-          pushd netcdf-fortran-*
-          ./configure --prefix=$HOME/netcdf-fortran
-          make
-          make install
-
-      - name: Cache PIO
-        id: cache-PIO
-        uses: actions/cache@v2
+          path: ~/ESMF
+          key: ${{ runner.os }}-${{ env.ESMF_VERSION }}-ESMF
+      - name: Cache ParallelIO
+        id: cache-ParallelIO
+        uses: actions/cache@v3
         with:
           path: ~/pio
           key: ${{ runner.os }}-${{ env.PIO_VERSION }}.pio
-          restore-keys: |
-            ${{ runner.os }}-${{ env.NETCDF_FORTRAN_VERSION }}-netcdf-fortran
-            ${{ runner.os }}-${{ env.PNETCDF_VERSION }}-pnetcdf
-
-      - id: checkout-PIO
-        uses: actions/checkout@v3
+      - name: Build ParallelIO
+        if: steps.cache-ParallelIO.outputs.cache-hit != 'true'
+        uses: NCAR/ParallelIO/.github/actions/parallelio_cmake@9390e30e29d4ebbfbef0fc72162cacd9e8f25e4e
         with:
-          repository: NCAR/ParallelIO
-          path: parallelio-src
-          ref: ${{ env.PIO_VERSION }}
-      - name: Build PIO
-        if: steps.cache-PIO.outputs.cache-hit != 'true'
-        run: |
-          mkdir build-pio
-          pushd build-pio
-          cmake -Wno-dev -DNetCDF_C_LIBRARY=/usr/lib/x86_64-linux-gnu/libnetcdf.so -DNetCDF_C_INCLUDE_DIR=/usr/include -DCMAKE_PREFIX_PATH=/usr -DCMAKE_INSTALL_PREFIX=$HOME/pio -DPIO_HDF5_LOGGING=On -DPIO_USE_MALLOC=On -DPIO_ENABLE_TESTS=Off -DPIO_ENABLE_LOGGING=On -DPIO_ENABLE_EXAMPLES=Off -DPIO_ENABLE_TIMING=Off -DNetCDF_Fortran_PATH=$HOME/netcdf-fortran -DPnetCDF_PATH=$HOME/pnetcdf ../parallelio-src
-          make VERBOSE=1
-          make install
-          popd
-
+          parallelio_version: ${{ env.ParallelIO_VERSION }}
+          enable_fortran: True
+          install_prefix: $HOME/pio
+      - name: Build ESMF
+        if: steps.cache-esmf.outputs.cache-hit != 'true'
+        uses: ESCOMP/CDEPS/.github/actions/buildesmf@e06246b560d3132170bb1a5443fa3d65dfbd2040
+        with:
+          esmf_version: ${{ env.ESMF_VERSION }}
+          esmf_bopt: g
+          esmf_comm: openmpi
+          install_prefix: $HOME/ESMF
+          netcdf_c_path: /usr
+          netcdf_fortran_path: /usr
+          pnetcdf_path: /usr
+          parallelio_path: $HOME/pio
       - name: Build CMEPS
         run: |
           export ESMFMKFILE=$HOME/ESMF/lib/libg/Linux.gfortran.64.openmpi.default/esmf.mk
           export PIO=$HOME/pio
           mkdir build-cmeps
           pushd build-cmeps
-          cmake -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_Fortran_FLAGS="-g -Wall -ffree-form -ffree-line-length-none" ../
+          cmake -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_Fortran_FLAGS="-g -Wall -Werror -ffree-form -ffree-line-length-none  -Wno-unused-dummy-argument" ../
           make VERBOSE=1
           popd
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: Bump version @@
     on:
       push:
         branches:
-          - master
+          - main
     jobs:
       build:
         runs-on: ubuntu-latest
@@ Expand Down @@