Update to v1.1.0 of the hpc-stack (#476)

Point to the official v1.1.0 of the hpc-stack. Remove references to unused libraries gfsio and w3emc. Fixes #248 Fixes #449
ufs-community · Apr 29, 2021 · 69c389d · 69c389d
1 parent 7cc01c8
commit 69c389d
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 40 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -54,13 +54,13 @@ if(OPENMP)
 endif()
 
 find_package(sfcio 1.4.0 REQUIRED)
-find_package(w3nco 2.3.0 REQUIRED)
+find_package(w3nco 2.4.0 REQUIRED)
 find_package(bacio 2.4.0 REQUIRED)
-find_package(nemsio 2.4.0 REQUIRED)
-find_package(sigio 2.2.0 REQUIRED)
+find_package(nemsio 2.5.0 REQUIRED)
+find_package(sigio 2.3.0 REQUIRED)
 find_package(sp 2.3.3 REQUIRED)
-find_package(ip 3.2.0 REQUIRED)
-find_package(g2 3.3.0 REQUIRED)
+find_package(ip 3.3.3 REQUIRED)
+find_package(g2 3.4.0 REQUIRED)
 find_package(wgrib2 2.0.8 REQUIRED)
 
 # EMC requires executables in ./exec

diff --git a/README.md b/README.md
@@ -29,15 +29,13 @@ UFS_UTILS Code managers: George Gayno, Kyle Gerheiser
 ## Prerequisites
 
 This package requires the following NCEPLIBS packages:
- - [NCEPLIBS-gfsio](https://github.com/NOAA-EMC/NCEPLIBS-gfsio)
  - [NCEPLIBS-sfcio](https://github.com/NOAA-EMC/NCEPLIBS-sfcio)
  - [NCEPLIBS-w3nco](https://github.com/NOAA-EMC/NCEPLIBS-w3nco)
  - [NCEPLIBS-bacio](https://github.com/NOAA-EMC/NCEPLIBS-bacio)
  - [NCEPLIBS-nemsio](https://github.com/NOAA-EMC/NCEPLIBS-nemsio)
  - [NCEPLIBS-sigio](https://github.com/NOAA-EMC/NCEPLIBS-sigio)
  - [NCEPLIBS-sp](https://github.com/NOAA-EMC/NCEPLIBS-sp)
  - [NCEPLIBS-ip](https://github.com/NOAA-EMC/NCEPLIBS-ip)
- - [NCEPLIBS-w3emc](https://github.com/NOAA-EMC/NCEPLIBS-w3emc)
  - [NCEPLIBS-g2](https://github.com/NOAA-EMC/NCEPLIBS-g2)
  - [NCEPLIBS-wgrib2](https://github.com/NOAA-EMC/NCEPLIBS-wgrib2)
 

diff --git a/modulefiles/build.cheyenne.intel b/modulefiles/build.cheyenne.intel
@@ -16,12 +16,10 @@ module load g2/3.4.1
 module load ip/3.3.3
 module load nemsio/2.5.2
 module load sp/2.3.3
-module load w3emc/2.7.3
 module load w3nco/2.4.1
 module load sigio/2.3.2
 
 module load sfcio/1.4.1
-module load gfsio/1.4.1
 module load wgrib2/2.0.8
 module load netcdf/4.7.4
 

diff --git a/modulefiles/build.hera.gnu b/modulefiles/build.hera.gnu
@@ -5,9 +5,9 @@
 module load hpss
 module load cmake/3.16.1
 
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
+module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
 
-module load hpc/1.0.0-beta1
+module load hpc/1.1.0
 module load hpc-gnu/9.2.0
 module load hpc-mpich/3.3.2
 
@@ -18,13 +18,11 @@ module load g2/3.4.1
 module load ip/3.3.3
 module load nemsio/2.5.2
 module load sp/2.3.3
-module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load gfsio/1.4.1
 module load sfcio/1.4.1
 module load sigio/2.3.2
 module load wgrib2/2.0.8
 module load nccmp/1.8.7.0
 module load png/1.6.35
 module load zlib/1.2.11
-module load jasper/2.0.15
+module load jasper/2.0.22
diff --git a/modulefiles/build.hera.intel b/modulefiles/build.hera.intel
@@ -5,9 +5,9 @@
 module load hpss
 module load cmake/3.16.1
 
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
+module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
 
-module load hpc/1.0.0-beta1
+module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.0.4
 
@@ -16,14 +16,12 @@ module load g2/3.4.1
 module load ip/3.3.3
 module load nemsio/2.5.2
 module load sp/2.3.3
-module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load gfsio/1.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.15
+module load jasper/2.0.22
 module load zlib/1.2.11
 module load png/1.6.35
 

diff --git a/modulefiles/build.jet.intel b/modulefiles/build.jet.intel
@@ -3,25 +3,23 @@
 #############################################################
 module load cmake/3.16.1
 
-module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/v1.0.0-beta1/modulefiles/stack
-module load hpc/1.0.0-beta1
+module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack
+module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.4.274
 
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load nccmp/1.8.7.0
-module load esmf/8_1_0_beta_snapshot_21
-module load jasper/2.0.15
+module load esmf/8_1_0_beta_snapshot_27
+module load jasper/2.0.22
 
 module load w3nco/2.4.1
-module load w3emc/2.7.3
 module load sp/2.3.3
 module load ip/3.3.3
 module load bacio/2.4.1
 module load sigio/2.3.2
 module load sfcio/1.4.1
 module load nemsio/2.5.2
-module load gfsio/1.4.1
 module load g2/3.4.1
 module load wgrib2/2.0.8
diff --git a/modulefiles/build.odin.intel b/modulefiles/build.odin.intel
@@ -18,14 +18,12 @@ setenv NETCDF /opt/cray/pe/netcdf-hdf5parallel/4.6.3.2/INTEL/19.0
 #module use /oldscratch/ywang/external/NCEPLIBS_SRW/modules
 module use /oldscratch/ywang/external/NCEPLIBS_SRWv2.0/modules
 module load w3nco
-module load w3emc
 module load sp
 module load ip
 module load bacio
 module load sigio
 module load sfcio
 module load nemsio
-module load gfsio
 module load g2
 module load wgrib2
 

diff --git a/modulefiles/build.orion.intel b/modulefiles/build.orion.intel
@@ -4,9 +4,9 @@
 
 module load cmake/3.17.3
 
-module use /apps/contrib/NCEP/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
+module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack
 
-module load hpc/1.0.0-beta1
+module load hpc/1.1.0
 module load hpc-intel/2018.4
 module load hpc-impi/2018.4
 
@@ -15,14 +15,12 @@ module load g2/3.4.1
 module load ip/3.3.3
 module load nemsio/2.5.2
 module load sp/2.3.3
-module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load gfsio/1.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.15
+module load jasper/2.0.22
 module load zlib/1.2.11
 module load png/1.6.35
 

diff --git a/modulefiles/build.stampede.intel b/modulefiles/build.stampede.intel
@@ -25,14 +25,12 @@ module use /work/00315/tg455890/stampede2/regional_fv3/NCEPLIBS_SRWv2.0/modules
 module load esmf/8.0.0
 
 module load w3nco
-module load w3emc
 module load sp
 module load ip
 module load bacio
 module load sigio
 module load sfcio
 module load nemsio
-module load gfsio
 module load g2
 module load wgrib2
 

diff --git a/modulefiles/build.wcoss_cray.intel b/modulefiles/build.wcoss_cray.intel
@@ -22,9 +22,7 @@ module load g2/3.4.1
 module load ip/3.3.3
 module load nemsio/2.5.2
 module load sp/2.3.3
-module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load gfsio/1.4.1
 module load sfcio/1.4.1
 module load sigio/2.3.2
 module load wgrib2/2.0.8

diff --git a/modulefiles/build.wcoss_dell_p3.intel b/modulefiles/build.wcoss_dell_p3.intel
@@ -6,9 +6,9 @@ module load lsf/10.1
 module load HPSS/5.0.2.5
 module load cmake/3.16.2
 
-module use /usrx/local/nceplibs/dev/hpc-stack/test/hpc-stack/modulefiles/stack
+module use /usrx/local/nceplibs/dev/hpc-stack/libs/hpc-stack/modulefiles/stack
 
-module load hpc/1.0.0-beta1
+module load hpc/1.1.0
 module load hpc-ips/18.0.1.163
 module load hpc-impi/18.0.1
 
@@ -26,9 +26,7 @@ module load g2/3.4.1
 module load ip/3.3.3
 module load nemsio/2.5.2
 module load sp/2.3.3
-module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load gfsio/1.4.1
 module load sfcio/1.4.1
 module load sigio/2.3.2
 module load wgrib2/2.0.8