Replacing exterior w3emc dependency with w3emc module built by CCPP P…

…hysics Updating documentation Removing w3emc dependency installation from CI Removing w3emc module load Removing bacio and sp depedency
NCAR · May 22, 2024 · 790b581 · 790b581
1 parent 046559b
commit 790b581
Show file tree

Hide file tree

Showing 23 changed files with 38 additions and 231 deletions.
diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04.yml b/.github/workflows/ci_build_scm_ubuntu_22.04.yml
@@ -17,9 +17,7 @@ jobs:
     env:
       NFHOME:     /home/runner/netcdf-fortran
       NFVERSION:  v4.5.3
-      bacio_ROOT: /home/runner/bacio
       sp_ROOT:    /home/runner/NCEPLIBS-sp
-      w3emc_ROOT: /home/runner/myw3emc
       SCM_ROOT:   /home/runner/work/ccpp-scm/ccpp-scm
       intel_ROOT: /home/runner/intel
       suites:     SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0,SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps
@@ -85,23 +83,6 @@ jobs:
         sudo apt-get install intel-hpckit-getting-started intel-oneapi-clck intel-oneapi-common-licensing intel-oneapi-common-vars
         sudo apt-get install intel-oneapi-dev-utilities  intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic intel-oneapi-compiler-fortran intel-oneapi-itac
 
-    - name: Cache bacio library v2.4.1
-      id: cache-bacio-fortran
-      uses: actions/cache@v3
-      with:
-        path: /home/runner/bacio
-        key: cache-bacio-fortran-${{matrix.fortran-compiler}}-key
-
-    - name: Install bacio library v2.4.1
-      if: steps.cache-bacio-fortran.outputs.cache-hit != 'true'
-      run: |
-        git clone --branch v2.4.1 https://github.com/NOAA-EMC/NCEPLIBS-bacio.git bacio
-        cd bacio && mkdir build && cd build
-        cmake -DCMAKE_INSTALL_PREFIX=${bacio_ROOT} ../
-        make -j2
-        make install
-        echo "bacio_DIR=/home/runner/bacio/lib/cmake/bacio" >> $GITHUB_ENV
-
     - name: Cache SP-library v2.3.3
       id: cache-sp-fortran
       uses: actions/cache@v3
@@ -119,23 +100,6 @@ jobs:
         make install
         echo "sp_DIR=/home/runner/NCEPLIBS-sp/lib/cmake/sp" >> $GITHUB_ENV
 
-    - name: Cache w3emc library v2.9.2
-      id: cache-w3emc-fortran
-      uses: actions/cache@v3
-      with:
-        path: /home/runner/myw3emc
-        key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-key
-
-    - name: Install w3emc library v2.9.2
-      if: steps.cache-w3emc-fortran.outputs.cache-hit != 'true'
-      run: |
-        git clone --branch v2.9.2 https://github.com/NOAA-EMC/NCEPLIBS-w3emc.git NCEPLIBS-w3emc
-        cd NCEPLIBS-w3emc && mkdir build && cd build
-        cmake -DCMAKE_INSTALL_PREFIX=${w3emc_ROOT} ../
-        make -j2
-        make install
-        echo "w3emc_DIR=/home/runner/myw3emc/lib/cmake/w3emc" >> $GITHUB_ENV
-
     - name: Install NetCDF C library
       run: |
         sudo apt-get update

diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml b/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml
@@ -17,9 +17,7 @@ jobs:
     # Environmental variables
     env:
       NETCDF:      /home/runner/netcdf
-      bacio_ROOT:  /home/runner/bacio
       sp_ROOT:     /home/runner/NCEPLIBS-sp
-      w3emc_ROOT:  /home/runner/myw3emc
       SCM_ROOT:    /home/runner/work/ccpp-scm/ccpp-scm
       zlib_ROOT:   /home/runner/zlib
       HDF5_ROOT:   /home/runner/hdf5
@@ -185,23 +183,6 @@ jobs:
         make
         make install
 
-    - name: Cache bacio library v2.4.1
-      id: cache-bacio-fortran
-      uses: actions/cache@v3
-      with:
-        path: /home/runner/bacio
-        key: cache-bacio-fortran-${{matrix.fortran-compiler}}-key
-
-    - name: Install bacio library v2.4.1
-      if: steps.cache-bacio-fortran.outputs.cache-hit != 'true'
-      run: |
-        git clone --branch v2.4.1 https://github.com/NOAA-EMC/NCEPLIBS-bacio.git bacio
-        cd bacio && mkdir build && cd build
-        cmake -DCMAKE_INSTALL_PREFIX=${bacio_ROOT} ../
-        make -j2
-        make install
-        echo "bacio_DIR=/home/runner/bacio/lib/cmake/bacio" >> $GITHUB_ENV
-
     - name: Cache SP-library v2.3.3
       id: cache-sp-fortran
       uses: actions/cache@v3
@@ -219,23 +200,6 @@ jobs:
         make install
         echo "sp_DIR=/home/runner/NCEPLIBS-sp/lib/cmake/sp" >> $GITHUB_ENV
 
-    - name: Cache w3emc library v2.9.2
-      id: cache-w3emc-fortran
-      uses: actions/cache@v3
-      with:
-        path: /home/runner/myw3emc
-        key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-key
-
-    - name: Install w3emc library v2.9.2
-      if: steps.cache-w3emc-fortran.outputs.cache-hit != 'true'
-      run: |
-        git clone --branch v2.9.2 https://github.com/NOAA-EMC/NCEPLIBS-w3emc.git NCEPLIBS-w3emc
-        cd NCEPLIBS-w3emc && mkdir build && cd build
-        cmake -DCMAKE_INSTALL_PREFIX=${w3emc_ROOT} ../
-        make -j2
-        make install
-        echo "w3emc_DIR=/home/runner/myw3emc/lib/cmake/w3emc" >> $GITHUB_ENV
-
     #######################################################################################
     # Build and run SCM regression tests (ccpp-scm/test/rt_test_cases.py)
     #######################################################################################

diff --git a/.github/workflows/ci_run_scm_DEPHY.yml b/.github/workflows/ci_run_scm_DEPHY.yml
@@ -16,9 +16,7 @@ jobs:
     env:
       NFHOME:     /home/runner/netcdf-fortran
       NFVERSION:  v4.5.3
-      bacio_ROOT: /home/runner/bacio
       sp_ROOT:    /home/runner/NCEPLIBS-sp
-      w3emc_ROOT: /home/runner/myw3emc
       SCM_ROOT:   /home/runner/work/ccpp-scm/ccpp-scm
       suites:     SCM_GFS_v16,SCM_GFS_v16_ps
 
@@ -54,23 +52,6 @@ jobs:
     #######################################################################################
     # Install FORTRAN dependencies
     #######################################################################################
-    - name: Cache bacio library v2.4.1
-      id: cache-bacio-fortran
-      uses: actions/cache@v3
-      with:
-        path: /home/runner/bacio
-        key: cache-bacio-fortran-${{matrix.fortran-compiler}}-key
-
-    - name: Install bacio library v2.4.1
-      if: steps.cache-bacio-fortran.outputs.cache-hit != 'true'
-      run: |
-        git clone --branch v2.4.1 https://github.com/NOAA-EMC/NCEPLIBS-bacio.git bacio
-        cd bacio && mkdir build && cd build
-        cmake -DCMAKE_INSTALL_PREFIX=${bacio_ROOT} ../
-        make -j2
-        make install
-        echo "bacio_DIR=/home/runner/bacio/lib/cmake/bacio" >> $GITHUB_ENV
-
     - name: Cache SP-library v2.3.3
       id: cache-sp-fortran
       uses: actions/cache@v3
@@ -88,23 +69,6 @@ jobs:
         make install
         echo "sp_DIR=/home/runner/NCEPLIBS-sp/lib/cmake/sp" >> $GITHUB_ENV
 
-    - name: Cache w3emc library v2.9.2
-      id: cache-w3emc-fortran
-      uses: actions/cache@v3
-      with:
-        path: /home/runner/myw3emc
-        key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-key
-
-    - name: Install w3emc library v2.9.2
-      if: steps.cache-w3emc-fortran.outputs.cache-hit != 'true'
-      run: |
-        git clone --branch v2.9.2 https://github.com/NOAA-EMC/NCEPLIBS-w3emc.git NCEPLIBS-w3emc
-        cd NCEPLIBS-w3emc && mkdir build && cd build
-        cmake -DCMAKE_INSTALL_PREFIX=${w3emc_ROOT} ../
-        make -j2
-        make install
-        echo "w3emc_DIR=/home/runner/myw3emc/lib/cmake/w3emc" >> $GITHUB_ENV
-
     - name: Install NetCDF C library
       run: sudo apt-get install libnetcdf-dev
 

diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml
@@ -17,9 +17,7 @@ jobs:
     env:
       NFHOME:     /home/runner/netcdf-fortran
       NFVERSION:  v4.5.3
-      bacio_ROOT: /home/runner/bacio
       sp_ROOT:    /home/runner/NCEPLIBS-sp
-      w3emc_ROOT: /home/runner/myw3emc
       SCM_ROOT:   /home/runner/work/ccpp-scm/ccpp-scm
       suites:     SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0
       suites_ps:  SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps
@@ -71,23 +69,6 @@ jobs:
         echo "CC=icx"         >> $GITHUB_ENV
         echo "FC=ifort"       >> $GITHUB_ENV
 
-    - name: Cache bacio library v2.4.1
-      id: cache-bacio-fortran
-      uses: actions/cache@v3
-      with:
-        path: /home/runner/bacio
-        key: cache-bacio-fortran-${{matrix.fortran-compiler}}-key
-
-    - name: Install bacio library v2.4.1
-      if: steps.cache-bacio-fortran.outputs.cache-hit != 'true'
-      run: |
-        git clone --branch v2.4.1 https://github.com/NOAA-EMC/NCEPLIBS-bacio.git bacio
-        cd bacio && mkdir build && cd build
-        cmake -DCMAKE_INSTALL_PREFIX=${bacio_ROOT} ../
-        make -j2
-        make install
-        echo "bacio_DIR=/home/runner/bacio/lib/cmake/bacio" >> $GITHUB_ENV
-
     - name: Cache SP-library v2.3.3
       id: cache-sp-fortran
       uses: actions/cache@v3
@@ -105,23 +86,6 @@ jobs:
         make install
         echo "sp_DIR=/home/runner/NCEPLIBS-sp/lib/cmake/sp" >> $GITHUB_ENV
 
-    - name: Cache w3emc library v2.9.2
-      id: cache-w3emc-fortran
-      uses: actions/cache@v3
-      with:
-        path: /home/runner/myw3emc
-        key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-key
-
-    - name: Install w3emc library v2.9.2
-      if: steps.cache-w3emc-fortran.outputs.cache-hit != 'true'
-      run: |
-        git clone --branch v2.9.2 https://github.com/NOAA-EMC/NCEPLIBS-w3emc.git NCEPLIBS-w3emc
-        cd NCEPLIBS-w3emc && mkdir build && cd build
-        cmake -DCMAKE_INSTALL_PREFIX=${w3emc_ROOT} ../
-        make -j2
-        make install
-        echo "w3emc_DIR=/home/runner/myw3emc/lib/cmake/w3emc" >> $GITHUB_ENV
-
     - name: Install NetCDF C library
       run: sudo apt-get install libnetcdf-dev
 

diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
@@ -17,6 +17,7 @@
     # actual variable definition files
     'ccpp/framework/src/ccpp_types.F90',
     'ccpp/physics/physics/hooks/machine.F',
+    'ccpp/physics/physics/tools/w3emc.F90',
     'ccpp/physics/physics/Radiation/RRTMG/radsw_param.f',
     'ccpp/physics/physics/Radiation/RRTMG/radlw_param.f',
     'ccpp/physics/physics/photochem/h2o_def.f',

diff --git a/ccpp/physics b/ccpp/physics
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -49,7 +49,7 @@ RUN mkdir -p $NCEPLIBS_DIR/src && cd $NCEPLIBS_DIR/src \
   && mkdir NCEPLIBS-bacio/build && cd NCEPLIBS-bacio/build \
   && cmake -DCMAKE_INSTALL_PREFIX=$NCEPLIBS_DIR .. \
   && make VERBOSE=1 \
-  && make install 
+  && make install
 
 RUN cd $NCEPLIBS_DIR/src \
   && git clone -b v2.3.3 --recursive https://github.com/NOAA-EMC/NCEPLIBS-sp \
@@ -82,7 +82,7 @@ RUN cd /comsoftware \
   && make -j4
 
 # The analysis scripts have options for using LaTeX when making figure labels.
-# If you would like to install LaTeK, uncomment the section below. 
+# If you would like to install LaTeK, uncomment the section below.
 # Note: This will increase the image size by 1 GB.
 #USER root
 #RUN yum -y update \