Merge remote-tracking branch 'emc/develop' into feature/cpld_gridgen2

ufs-community · Apr 25, 2022 · 46ea554 · 46ea554
2 parents c38307f + adc7197
commit 46ea554
Show file tree

Hide file tree

Showing 24 changed files with 285 additions and 538 deletions.
diff --git a/.github/workflows/debug-docs-test_coverage.yml b/.github/workflows/debug-docs-test_coverage.yml
@@ -97,10 +97,7 @@ jobs:
         export CC=mpicc
         export CXX=mpicxx
         export FC=mpifort
-        # Findwgrib2 in module form does not search <libname>-version
-        # as NCEPLIBS installs it
         export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:~/jasper/lib;~/jasper/lib64"
-        export wgrib2_ROOT=`find ~/nceplibs -type d -maxdepth 1 -iname "wgrib2*"`
         cmake .. -DCMAKE_PREFIX_PATH='~/jasper;~/nceplibs' -DCMAKE_BUILD_TYPE=Debug -DENABLE_DOCS=On -DCMAKE_Fortran_FLAGS="-g -fprofile-arcs -ftest-coverage -O0"
         make -j2
 

diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml
@@ -160,10 +160,7 @@ jobs:
         export ESMFMKFILE=~/esmf/lib/esmf.mk
         cd ufs_utils
         mkdir build && cd build
-        # Findwgrib2 in module form does not search <libname>-version
-        # as NCEPLIBS installs it
         export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:~/jasper/lib;~/jasper/lib64"
-        export wgrib2_ROOT=`find ~/nceplibs -type d -maxdepth 1 -iname "wgrib2*"`
         cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH='~;~/jasper;~/nceplibs;~/netcdf'
         make -j2
     

diff --git a/.github/workflows/linux-mac-nceplibs-mpi.yml b/.github/workflows/linux-mac-nceplibs-mpi.yml
@@ -214,11 +214,8 @@ jobs:
         export CC=mpicc
         export CXX=mpicxx
         export FC=mpifort
-        # Findwgrib2 in module form does not search <libname>-version
-        # as NCEPLIBS installs it
         export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:~/jasper/lib;~/jasper/lib64"
         export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:~/jasper/lib;~/jasper/lib64"
-        export wgrib2_ROOT=`find ~/nceplibs -type d -maxdepth 1 -iname "wgrib2*"`
         cmake .. -DCMAKE_PREFIX_PATH='~/jasper;~/nceplibs;~/netcdf'
         make -j2
 

diff --git a/.github/workflows/netcdf-versions.yml b/.github/workflows/netcdf-versions.yml
@@ -148,10 +148,7 @@ jobs:
         export CC=mpicc
         export CXX=mpicxx
         export FC=mpifort
-        # Findwgrib2 in module form does not search <libname>-version
-        # as NCEPLIBS installs it
         export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:~/jasper/lib;~/jasper/lib64"
-        export wgrib2_ROOT=`find ~/nceplibs -type d -maxdepth 1 -iname "wgrib2*"`
         cmake .. -DCMAKE_PREFIX_PATH='~/jasper;~/nceplibs;~/netcdf' -DCMAKE_BUILD_TYPE=Debug 
         make -j2
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -70,7 +70,6 @@ find_package(sigio 2.3.0 REQUIRED)
 find_package(sp 2.3.3 REQUIRED)
 find_package(ip 3.3.3 REQUIRED)
 find_package(g2 3.4.3 REQUIRED)
-find_package(wgrib2 2.0.8 REQUIRED)
 find_package(sigio 2.3.0 REQUIRED)
 
 # EMC requires executables in ./exec

diff --git a/README.md b/README.md
@@ -40,7 +40,6 @@ This package uses the [hpc-stack](https://github.com/NOAA-EMC/hpc-stack) for the
  - [NCEPLIBS-sp](https://github.com/NOAA-EMC/NCEPLIBS-sp)
  - [NCEPLIBS-ip](https://github.com/NOAA-EMC/NCEPLIBS-ip)
  - [NCEPLIBS-g2](https://github.com/NOAA-EMC/NCEPLIBS-g2)
- - [NCEPLIBS-wgrib2](https://github.com/NOAA-EMC/NCEPLIBS-wgrib2)
 
 And for the following third party libraries:
 

diff --git a/cmake/Findwgrib2.cmake b/cmake/Findwgrib2.cmake
diff --git a/modulefiles/build.cheyenne.intel b/modulefiles/build.cheyenne.intel
@@ -20,7 +20,6 @@ module load w3nco/2.4.1
 module load sigio/2.3.2
 
 module load sfcio/1.4.1
-module load wgrib2/2.0.8
 module load netcdf/4.7.4
 
 setenv ESMFMKFILE /glade/p/ral/jntp/GMTB/tools/NCEPLIBS-ufs-v2.0.0/intel-19.1.1/mpt-2.19/lib64/esmf.mk

diff --git a/modulefiles/build.hera.gnu.lua b/modulefiles/build.hera.gnu.lua
@@ -49,9 +49,6 @@ load(pathJoin("sfcio", sfcio_ver))
 sigio_ver=os.getenv("sigio_ver") or "2.3.2"
 load(pathJoin("sigio", sigio_ver))
 
-wgrib2_ver=os.getenv("wgrib2_ver") or "2.0.8"
-load(pathJoin("wgrib2", wgrib2_ver))
-
 nccmp_ver=os.getenv("nccmp_ver") or "1.8.7.0"
 load(pathJoin("nccmp", nccmp_ver))
 

diff --git a/modulefiles/build.hera.intel.lua b/modulefiles/build.hera.intel.lua
@@ -43,9 +43,6 @@ load(pathJoin("sfcio", sfcio_ver))
 sigio_ver=os.getenv("sigio_ver") or "2.3.2"
 load(pathJoin("sigio", sigio_ver))
 
-wgrib2_ver=os.getenv("wgrib2_ver") or "2.0.8"
-load(pathJoin("wgrib2", wgrib2_ver))
-
 zlib_ver=os.getenv("zlib_ver") or "1.2.11"
 load(pathJoin("zlib", zlib_ver))
 

diff --git a/modulefiles/build.jet.intel.lua b/modulefiles/build.jet.intel.lua
@@ -55,9 +55,6 @@ load(pathJoin("nemsio", nemsio_ver))
 g2_ver=os.getenv("g2_ver") or "3.4.3"
 load(pathJoin("g2", g2_ver))
 
-wgrib2_ver=os.getenv("wgrib2_ver") or "2.0.8"
-load(pathJoin("wgrib2", wgrib2_ver))
-
 prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
 load(pathJoin("prod_util", prod_util_ver))
 

diff --git a/modulefiles/build.odin.intel b/modulefiles/build.odin.intel
@@ -25,13 +25,10 @@ module load sigio
 module load sfcio
 module load nemsio
 module load g2
-module load wgrib2
 
 #module load esmf/8.0.0
 #setenv ESMFMKFILE /oldscratch/ywang/external/NCEPLIBS_SRW/lib64/esmf.mk
 setenv ESMFMKFILE /oldscratch/ywang/external/NCEPLIBS_SRWv2.0/lib64/esmf.mk
 
 setenv CMAKE_Fortran_COMPILER ftn
 setenv CMAKE_C_COMPILER cc
-
-#setenv WGRIB2_ROOT /oldscratch/ywang/external/NCEPLIBS_SRWv2.0/wgrib2-2.0.8
diff --git a/modulefiles/build.orion.intel.lua b/modulefiles/build.orion.intel.lua
@@ -40,9 +40,6 @@ load(pathJoin("sfcio", sfcio_ver))
 sigio_ver=os.getenv("sigio_ver") or "2.3.2"
 load(pathJoin("sigio", sigio_ver))
 
-wgrib2_ver=os.getenv("wgrib2_ver") or "2.0.8"
-load(pathJoin("wgrib2", wgrib2_ver))
-
 zlib_ver=os.getenv("zlib_ver") or "1.2.11"
 load(pathJoin("zlib", zlib_ver))
 

diff --git a/modulefiles/build.s4.intel b/modulefiles/build.s4.intel
@@ -16,7 +16,6 @@ module load sp/2.3.3
 module load w3nco/2.4.1
 module load sfcio/1.4.1
 module load sigio/2.3.2
-module load wgrib2/2.0.8
 
 module load jasper/2.0.22
 module load zlib/1.2.11

diff --git a/modulefiles/build.stampede.intel b/modulefiles/build.stampede.intel
@@ -32,7 +32,6 @@ module load sigio
 module load sfcio
 module load nemsio
 module load g2
-module load wgrib2
 
 #setenv ESMFMKFILE /work/00315/tg455890/stampede2/regional_fv3/NCEPLIBS_SRWv2.0/lib64/esmf.mk
 

diff --git a/modulefiles/build.wcoss_cray.intel b/modulefiles/build.wcoss_cray.intel
@@ -24,7 +24,6 @@ module load sp/2.3.3
 module load w3nco/2.4.1
 module load sfcio/1.4.1
 module load sigio/2.3.2
-module load wgrib2/2.0.8
 
 setenv ZLIB_ROOT /usrx/local/prod/zlib/1.2.7/intel/haswell
 setenv PNG_ROOT /usrx/local/prod/png/1.2.49/intel/haswell

diff --git a/modulefiles/build.wcoss_dell_p3.intel.lua b/modulefiles/build.wcoss_dell_p3.intel.lua
@@ -64,9 +64,6 @@ load(pathJoin("sfcio", sfcio_ver))
 sigio_ver=os.getenv("sigio_ver") or "2.3.2"
 load(pathJoin("sigio", sigio_ver))
 
-wgrib2_ver=os.getenv("wgrib2_ver") or "2.0.8"
-load(pathJoin("wgrib2", wgrib2_ver))
-
 prepend_path("MODULEPATH", "/usrx/local/dev/modulefiles")
 
 prod_util_ver=os.getenv("prod_util_ver") or "1.1.3"

diff --git a/sorc/chgres_cube.fd/CMakeLists.txt b/sorc/chgres_cube.fd/CMakeLists.txt
@@ -49,10 +49,10 @@ target_link_libraries(
   sfcio::sfcio
   sigio::sigio
   bacio::bacio_4
+  ip::ip_d
   sp::sp_d
   w3nco::w3nco_d
   esmf
-  wgrib2::wgrib2
   MPI::MPI_Fortran
   NetCDF::NetCDF_Fortran)
 

diff --git a/sorc/chgres_cube.fd/input_data.F90 b/sorc/chgres_cube.fd/input_data.F90
@@ -41,8 +41,7 @@ module input_data
                                     ip1_input, jp1_input,  &
                                     num_tiles_input_grid, &
                                     latitude_input_grid, &
-                                    longitude_input_grid, &
-                                    inv_file
+                                    longitude_input_grid
 
  implicit none