porting changes from develop branch to v3.4.x branch, to prepare for …

…a 3.4.6 release (#343) * moved source files into CMakeLists.txt * added test_params * no change * reverted * added tests * adding pdstemplates.F90 * cmake changes * adding developer workflow * added more workflows * moved old workflow * changes * back * back * back * back * back * back * back * updated jpeg code * doxygen fixes * doxygen fixes * fixes gribmod problem * more fixes * fixed leaks * fixing CI workflows * fixing CI workflows * updated VERSION file to 3.4.6 * adding reference to previous version of docs
NOAA-EMC · Dec 23, 2022 · 6afd3d5 · 6afd3d5
1 parent 86f71dc
commit 6afd3d5
Show file tree

Hide file tree

Showing 48 changed files with 8,983 additions and 3,085 deletions.
diff --git a/.github/workflows/Intel.yml b/.github/workflows/Intel.yml
@@ -32,6 +32,38 @@ 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-bacio
+      uses: actions/checkout@v2
+      with:
+        repository: NOAA-EMC/NCEPLIBS-bacio
+        path: bacio
+        ref: develop
+
+    - name: build-bacio
+      run: |
+        cd bacio
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_INSTALL_PREFIX=~/bacio
+        make -j2
+        make install
+
+    - name: checkout-w3emc
+      uses: actions/checkout@v2
+      with:
+        repository: NOAA-EMC/NCEPLIBS-w3emc
+        path: w3emc
+        ref: develop
+
+    - name: build-w3emc
+      run: |
+        cd w3emc
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_PREFIX_PATH=~/bacio -DCMAKE_INSTALL_PREFIX=~/w3emc
+        make -j2
+        make install
+        
     - name: checkout-jasper
       uses: actions/checkout@v2
       with:
@@ -65,7 +97,7 @@ jobs:
         cd g2
         mkdir build 
         cd build
-        cmake .. -DOPENMP=ON -DJasper_ROOT=~/Jasper
+        cmake -DOPENMP=ON -DCMAKE_PREFIX_PATH="~/Jasper;~/bacio;~/w3emc" ..
         make -j2
     
     - name: test

diff --git a/.github/workflows/Linux_versions.yml b/.github/workflows/Linux_versions.yml
@@ -0,0 +1,133 @@
+name: Linux_versions
+on: [push, pull_request]
+
+jobs:
+  Linux_versions:
+    runs-on: ubuntu-latest
+    env:
+      FC: gfortran
+      CC: gcc
+      LD_LIBRARY_PATH: /home/runner/jasper/lib
+    strategy:
+      matrix:
+        jasper-version: [2.0.33, 3.0.5]
+        bacio-version: [2.4.1, 2.5.0]
+        w3emc-version: [2.9.2, 2.9.3]
+
+    steps:
+
+    - name: install-dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install libpng-dev zlib1g-dev libjpeg-dev
+
+    - name: cache-bacio
+      id: cache-bacio
+      uses: actions/cache@v2
+      with:
+        path: ~/bacio
+        key: bacio-${{ runner.os }}-${{ matrix.bacio-version }}
+
+    - name: checkout-bacio
+      if: steps.cache-bacio.outputs.cache-hit != 'true'
+      uses: actions/checkout@v2
+      with:
+        repository: NOAA-EMC/NCEPLIBS-bacio
+        path: bacio
+        ref: v${{ matrix.bacio-version }}
+
+    - name: build-bacio
+      if: steps.cache-bacio.outputs.cache-hit != 'true'
+      run: |
+        cd bacio
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_INSTALL_PREFIX=~/bacio
+        make -j2
+        make install
+        
+    - name: cache-w3emc
+      id: cache-w3emc
+      uses: actions/cache@v2
+      with:
+        path: ~/w3emc
+        key: w3emc-${{ runner.os }}-${{ matrix.w3emc-version }}-${{ matrix.bacio-version }}
+
+    - name: checkout-w3emc
+      if: steps.cache-w3emc.outputs.cache-hit != 'true'
+      uses: actions/checkout@v2
+      with:
+        repository: NOAA-EMC/NCEPLIBS-w3emc
+        path: w3emc
+        ref: v${{ matrix.w3emc-version }}
+
+    - name: build-w3emc
+      if: steps.cache-w3emc.outputs.cache-hit != 'true'
+      run: |
+        cd w3emc
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_PREFIX_PATH=~/bacio -DCMAKE_INSTALL_PREFIX=~/w3emc
+        make -j2
+        make install
+        
+    - name: cache-jasper
+      id: cache-jasper
+      uses: actions/cache@v2
+      with:
+        path: ~/jasper
+        key: jasper-${{ runner.os }}-${{ hashFiles('jasper/VERSION') }}
+
+    - name: checkout-jasper
+      if: steps.cache-jasper.outputs.cache-hit != 'true'
+      uses: actions/checkout@v2
+      with:
+        repository: jasper-software/jasper
+        path: jasper
+        ref: version-${{ matrix.jasper-version }}
+
+    - name: build-jasper
+      if: steps.cache-jasper.outputs.cache-hit != 'true'
+      run: |
+        cd jasper
+        mkdir build-jasper && cd build-jasper
+        cmake .. -DCMAKE_INSTALL_PREFIX=~/jasper
+        make -j2
+        make install
+
+    - name: checkout-g2c
+      uses: actions/checkout@v2
+      with:
+        repository: NOAA-EMC/NCEPLIBS-g2c
+        path: g2c
+        ref: develop
+
+    - name: build-g2c
+      run: |
+        cd g2c
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_INSTALL_PREFIX=~/g2c -DJasper_ROOT=~/jasper 
+        make -j2
+        make install
+        
+    - name: checkout
+      uses: actions/checkout@v2
+      with:
+        path: g2
+
+    - name:  ${{ matrix.config.name }}
+      run: |
+        set -x
+        cd g2
+        mkdir build
+        cd build
+        cmake -DJasper_ROOT=~/jasper -DCMAKE_PREFIX_PATH="~/g2c;~/bacio;~/w3emc" -DLOGGING=ON -DCMAKE_BUILD_TYPE=Debug ..
+        make -j2 VERBOSE=1
+
+    - name: test
+      run: |
+        cd $GITHUB_WORKSPACE/g2/build
+        ctest --verbose --rerun-failed --output-on-failure
+
+
diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml
@@ -0,0 +1,140 @@
+name: MacOS
+on:
+  push:
+    branches:
+    - develop
+    paths-ignore:
+    - README.md
+  pull_request:
+    branches:
+    - develop
+    paths-ignore:
+    - README.md
+
+jobs:
+  MacOS:
+    runs-on: macos-latest
+    env:
+      FC: gfortran-12
+      CC: gcc
+
+    strategy:
+      fail-fast: true
+      matrix:
+        jasper-version: [3.0.3]
+        bacio-version: [2.4.1, 2.5.0]
+    steps:
+    - name: install-dependencies
+      run: |
+        find /Library/Frameworks/ -name "png*"
+        sudo rm -rf /Library/Frameworks/Mono.framework
+        brew update
+        brew install libpng
+        brew install jpeg-turbo
+
+    - name: cache-bacio
+      id: cache-bacio
+      uses: actions/cache@v2
+      with:
+        path: ~/bacio
+        key: bacio-${{ runner.os }}-${{ matrix.bacio-version }}
+
+    - name: checkout-bacio
+      if: steps.cache-bacio.outputs.cache-hit != 'true'        
+      uses: actions/checkout@v2
+      with:
+        repository: NOAA-EMC/NCEPLIBS-bacio
+        path: bacio
+        ref: v${{ matrix.bacio-version }}
+
+    - name: build-bacio
+      if: steps.cache-bacio.outputs.cache-hit != 'true'    
+      run: |
+        cd bacio
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_INSTALL_PREFIX=~/bacio
+        make -j2
+        make install
+        
+    - name: cache-w3emc
+      id: cache-w3emc
+      uses: actions/cache@v2
+      with:
+        path: ~/w3emc
+        key: w3emc-${{ runner.os }}-2.9.2-bacio-${{ matrix.bacio-version }}
+
+    - name: checkout-w3emc
+      if: steps.cache-w3emc.outputs.cache-hit != 'true'    
+      uses: actions/checkout@v2
+      with:
+        repository: NOAA-EMC/NCEPLIBS-w3emc
+        path: w3emc
+        ref: v2.9.2
+
+    - name: build-w3emc
+      if: steps.cache-w3emc.outputs.cache-hit != 'true'
+      run: |
+        cd w3emc
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_PREFIX_PATH=~/bacio -DCMAKE_INSTALL_PREFIX=~/w3emc
+        make -j2
+        make install
+        
+    - name: cache-jasper
+      id: cache-jasper
+      uses: actions/cache@v2
+      with:
+        path: ~/jasper
+        key: jasper-${{ runner.os }}-${{ matrix.jasper-version }}
+
+    - name: checkout-jasper
+      if: steps.cache-jasper.outputs.cache-hit != 'true'    
+      uses: actions/checkout@v2
+      with:
+        repository: jasper-software/jasper
+        path: jasper
+        ref: version-${{ matrix.jasper-version }}
+
+    - name: build-jasper
+      if: steps.cache-jasper.outputs.cache-hit != 'true'
+      run: |
+        cd jasper
+        mkdir build-jasper && cd build-jasper
+        cmake .. -DCMAKE_INSTALL_PREFIX=~/jasper
+        make -j2
+        make install
+
+    - name: checkout-g2c
+      uses: actions/checkout@v2
+      with:
+        repository: NOAA-EMC/NCEPLIBS-g2c
+        path: g2c
+        ref: develop
+
+    - name: build-g2c
+      run: |
+        cd g2c
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_PREFIX_PATH=~/jasper -DCMAKE_INSTALL_PREFIX=~/g2c
+        make -j2
+        make install
+    - name: checkout
+      uses: actions/checkout@v2
+      with:
+        path: g2
+
+    - name: build
+      run: |
+        cd g2
+        mkdir build
+        cd build
+        cmake -DCMAKE_PREFIX_PATH="~/jasper;~/bacio;~/w3emc;~/g2c" -DCMAKE_BUILD_TYPE=Debug ..
+        make -j2 VERBOSE=1
+
+    - name: test
+      run: |
+        cd $GITHUB_WORKSPACE/g2/build
+        ctest  --output-on-failure