From 742d01359dfc2bb7f0b75c95178770a8cd1a42be Mon Sep 17 00:00:00 2001 From: George Gayno Date: Wed, 27 Jan 2021 22:07:17 +0000 Subject: [PATCH 01/21] feature/stack Update hera intel build module to point to official stack. Issue #248. --- modulefiles/build.hera.intel | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modulefiles/build.hera.intel b/modulefiles/build.hera.intel index 3774f7def..25ac0b850 100644 --- 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 @@ -25,11 +25,11 @@ module load nemsiogfs/2.5.3 module load landsfcutil/2.4.1 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 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_27 +module load esmf/8_1_0_beta_snapshot_36 From 94f3562a136580fb86ba69e000cae185742295f7 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 28 Jan 2021 15:21:23 +0000 Subject: [PATCH 02/21] feature stack: Update hera gnu build module to use official hpc stack. Issue #248. --- modulefiles/build.hera.gnu | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modulefiles/build.hera.gnu b/modulefiles/build.hera.gnu index b7e9260cf..e6636217d 100644 --- a/modulefiles/build.hera.gnu +++ b/modulefiles/build.hera.gnu @@ -5,14 +5,14 @@ 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 module load netcdf/4.7.4 -module load esmf/8_1_0_beta_snapshot_27 +module load esmf/8_1_0_beta_snapshot_36 module load bacio/2.4.1 module load g2/3.4.1 module load ip/3.3.3 @@ -29,4 +29,4 @@ 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 From 5e6322274a010f6cb4064ff83fd8aa25d7cbe2ff Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 28 Jan 2021 15:53:18 +0000 Subject: [PATCH 03/21] feature/stack Update dell build module to point to offical hpc stack. Issue #248. --- modulefiles/build.wcoss_dell_p3.intel | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modulefiles/build.wcoss_dell_p3.intel b/modulefiles/build.wcoss_dell_p3.intel index 117093998..081eb78f5 100644 --- 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 @@ -19,7 +19,7 @@ module load png/1.6.35 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_27 +module load esmf/8_1_0_beta_snapshot_36 module load bacio/2.4.1 module load g2/3.4.1 From 1773d86a823da26c235729dd43cc544551704197 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 28 Jan 2021 13:39:19 -0600 Subject: [PATCH 04/21] feature/stack Update Orion build module to point to the official hpc stack. Issue #248 --- modulefiles/build.orion.intel | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modulefiles/build.orion.intel b/modulefiles/build.orion.intel index 5ec3d5802..c497cd280 100644 --- 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 @@ -24,11 +24,11 @@ module load nemsiogfs/2.5.3 module load landsfcutil/2.4.1 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 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_27 +module load esmf/8_1_0_beta_snapshot_36 From e977f89eae4237f46be33aafe6bbb99bc8a907f7 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 28 Jan 2021 22:22:06 +0000 Subject: [PATCH 05/21] feature/stack Update jet build module to use latest hpc stack. Issue #248. --- modulefiles/build.jet.intel | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modulefiles/build.jet.intel b/modulefiles/build.jet.intel index d14b5ee59..d266d7917 100644 --- a/modulefiles/build.jet.intel +++ b/modulefiles/build.jet.intel @@ -3,16 +3,16 @@ ############################################################# 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_36 +module load jasper/2.0.22 module load w3nco/2.4.1 module load w3emc/2.7.3 From fc1395e16d74e91f701eb4fb382cb075978561a6 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 1 Feb 2021 15:23:16 +0000 Subject: [PATCH 06/21] feature/stack Revert back to esmf snapshot 27 on Hera. Issue #248. --- modulefiles/build.hera.intel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modulefiles/build.hera.intel b/modulefiles/build.hera.intel index 25ac0b850..9bab1b5ab 100644 --- a/modulefiles/build.hera.intel +++ b/modulefiles/build.hera.intel @@ -32,4 +32,4 @@ module load png/1.6.35 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_36 +module load esmf/8_1_0_beta_snapshot_27 From 7a13c30600a947af9eeb9b908dff64c410f05ff7 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 1 Feb 2021 15:30:47 +0000 Subject: [PATCH 07/21] feature/stack Revert back to esmf snapshot 27 on Dell. Issue #248. --- modulefiles/build.wcoss_dell_p3.intel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modulefiles/build.wcoss_dell_p3.intel b/modulefiles/build.wcoss_dell_p3.intel index 081eb78f5..ef405322e 100644 --- a/modulefiles/build.wcoss_dell_p3.intel +++ b/modulefiles/build.wcoss_dell_p3.intel @@ -19,7 +19,7 @@ module load png/1.6.35 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_36 +module load esmf/8_1_0_beta_snapshot_27 module load bacio/2.4.1 module load g2/3.4.1 From c0ac7d6701afc0d40e0f55875d1ebe6e2860373d Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 1 Feb 2021 10:11:14 -0600 Subject: [PATCH 08/21] feature/stack Revert to esmf snapshot 27 on Orion. Issue #248. --- modulefiles/build.orion.intel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modulefiles/build.orion.intel b/modulefiles/build.orion.intel index c497cd280..b386f109b 100644 --- a/modulefiles/build.orion.intel +++ b/modulefiles/build.orion.intel @@ -31,4 +31,4 @@ module load png/1.6.35 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_36 +module load esmf/8_1_0_beta_snapshot_27 From f45a2492a9051309af29f3467f8e2dcc7806a6bc Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 1 Feb 2021 16:28:06 +0000 Subject: [PATCH 09/21] feature/stack Revert to esmf snapshot 27 for Hera gnu build. Issue #248. --- modulefiles/build.hera.gnu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modulefiles/build.hera.gnu b/modulefiles/build.hera.gnu index e6636217d..4721ef200 100644 --- a/modulefiles/build.hera.gnu +++ b/modulefiles/build.hera.gnu @@ -12,7 +12,7 @@ module load hpc-gnu/9.2.0 module load hpc-mpich/3.3.2 module load netcdf/4.7.4 -module load esmf/8_1_0_beta_snapshot_36 +module load esmf/8_1_0_beta_snapshot_27 module load bacio/2.4.1 module load g2/3.4.1 module load ip/3.3.3 From 448e24ac85d211925362821c50fddd825c033c3b Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 1 Feb 2021 17:03:36 +0000 Subject: [PATCH 10/21] feature/stack Revert to esmf snapshot 27 on Jet. Issue #248. --- modulefiles/build.jet.intel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modulefiles/build.jet.intel b/modulefiles/build.jet.intel index d266d7917..8a1c4e41e 100644 --- a/modulefiles/build.jet.intel +++ b/modulefiles/build.jet.intel @@ -11,7 +11,7 @@ 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_36 +module load esmf/8_1_0_beta_snapshot_27 module load jasper/2.0.22 module load w3nco/2.4.1 From 3dd5a1b0ca3d56ec1caf498e029217ec3c3591a9 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 22 Apr 2021 19:40:34 +0000 Subject: [PATCH 11/21] Add minimum version for each package find except for esmf. Fixes #248 --- CMakeLists.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f10b2658..fb5012597 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,25 +45,25 @@ if(CMAKE_C_COMPILER_ID MATCHES "^(Intel)$") endif() # Find packages. -find_package(NetCDF REQUIRED C Fortran) -find_package(MPI REQUIRED C Fortran) +find_package(NetCDF 4.7.4 REQUIRED C Fortran) +find_package(MPI 3.1 REQUIRED C Fortran) find_package(ESMF MODULE REQUIRED) if(OPENMP) - find_package(OpenMP REQUIRED COMPONENTS Fortran) + find_package(OpenMP 5.0 REQUIRED COMPONENTS Fortran) endif() -find_package(gfsio REQUIRED) -find_package(sfcio REQUIRED) -find_package(w3nco REQUIRED) -find_package(bacio REQUIRED) -find_package(nemsio REQUIRED) -find_package(sigio REQUIRED) -find_package(sp REQUIRED) -find_package(ip REQUIRED) -find_package(w3emc REQUIRED) -find_package(g2 REQUIRED) -find_package(wgrib2 REQUIRED) +find_package(gfsio 1.4.0 REQUIRED) +find_package(sfcio 1.4.0 REQUIRED) +find_package(w3nco 2.4.0 REQUIRED) +find_package(bacio 2.4.0 REQUIRED) +find_package(nemsio 2.5.1 REQUIRED) +find_package(sigio 2.3.0 REQUIRED) +find_package(sp 2.3.3 REQUIRED) +find_package(ip 3.3.3 REQUIRED) +find_package(w3emc 2.7.3 REQUIRED) +find_package(g2 3.4.0 REQUIRED) +find_package(wgrib2 2.0.8 REQUIRED) # EMC requires executables in ./exec set(exec_dir bin) From ba3e00de2353f132825dfacbe24530edca93123d Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 22 Apr 2021 20:11:50 +0000 Subject: [PATCH 12/21] Update to work with gnu on hera. Fixes #248 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fb5012597..ac76f628e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ find_package(MPI 3.1 REQUIRED C Fortran) find_package(ESMF MODULE REQUIRED) if(OPENMP) - find_package(OpenMP 5.0 REQUIRED COMPONENTS Fortran) + find_package(OpenMP 4.5 REQUIRED COMPONENTS Fortran) endif() find_package(gfsio 1.4.0 REQUIRED) From 9708143f152d5e0bb8b0efc72a2ec8b0afe8bbfc Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 22 Apr 2021 20:30:30 +0000 Subject: [PATCH 13/21] Change required version number for Cray compile. The Cray does not have the stack installed. Fixes #248. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac76f628e..c8b4830e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,8 +45,8 @@ if(CMAKE_C_COMPILER_ID MATCHES "^(Intel)$") endif() # Find packages. -find_package(NetCDF 4.7.4 REQUIRED C Fortran) -find_package(MPI 3.1 REQUIRED C Fortran) +find_package(NetCDF 4.3.3 REQUIRED C Fortran) +find_package(MPI 3.0 REQUIRED C Fortran) find_package(ESMF MODULE REQUIRED) if(OPENMP) From d95514114db92428586c63d7baf39c9a5f93baad Mon Sep 17 00:00:00 2001 From: George Gayno Date: Fri, 23 Apr 2021 12:27:05 +0000 Subject: [PATCH 14/21] Remove unused libraries for Dell build. Fixes #449 Part of #248 --- CMakeLists.txt | 2 -- modulefiles/build.wcoss_dell_p3.intel | 2 -- 2 files changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c8b4830e3..73bfdd0ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,6 @@ if(OPENMP) find_package(OpenMP 4.5 REQUIRED COMPONENTS Fortran) endif() -find_package(gfsio 1.4.0 REQUIRED) find_package(sfcio 1.4.0 REQUIRED) find_package(w3nco 2.4.0 REQUIRED) find_package(bacio 2.4.0 REQUIRED) @@ -61,7 +60,6 @@ find_package(nemsio 2.5.1 REQUIRED) find_package(sigio 2.3.0 REQUIRED) find_package(sp 2.3.3 REQUIRED) find_package(ip 3.3.3 REQUIRED) -find_package(w3emc 2.7.3 REQUIRED) find_package(g2 3.4.0 REQUIRED) find_package(wgrib2 2.0.8 REQUIRED) diff --git a/modulefiles/build.wcoss_dell_p3.intel b/modulefiles/build.wcoss_dell_p3.intel index fc01bb681..4e44018e8 100644 --- a/modulefiles/build.wcoss_dell_p3.intel +++ b/modulefiles/build.wcoss_dell_p3.intel @@ -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 From 3565370de796e1665bcddc0cde812567fa7e6cac Mon Sep 17 00:00:00 2001 From: George Gayno Date: Fri, 23 Apr 2021 12:36:21 +0000 Subject: [PATCH 15/21] Remove unused libraries from WCOSS-Cray build. Part of #248 Fixes #449. --- modulefiles/build.wcoss_cray.intel | 2 -- 1 file changed, 2 deletions(-) diff --git a/modulefiles/build.wcoss_cray.intel b/modulefiles/build.wcoss_cray.intel index ab776c745..eff6e3ccc 100644 --- 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 From a5ecb296c2cd6e370b2df011012ba819479ea703 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Fri, 23 Apr 2021 12:44:20 +0000 Subject: [PATCH 16/21] Remove unused libraries from Hera build. Fixes #449 Part of #248 --- modulefiles/build.hera.gnu | 2 -- modulefiles/build.hera.intel | 2 -- 2 files changed, 4 deletions(-) diff --git a/modulefiles/build.hera.gnu b/modulefiles/build.hera.gnu index 9974a7992..15702b39e 100644 --- a/modulefiles/build.hera.gnu +++ b/modulefiles/build.hera.gnu @@ -18,9 +18,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.hera.intel b/modulefiles/build.hera.intel index 45a213622..7c68b4143 100644 --- a/modulefiles/build.hera.intel +++ b/modulefiles/build.hera.intel @@ -16,9 +16,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 From 282f1e450c3073d552475116ab7a078a28912d74 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Fri, 23 Apr 2021 07:51:44 -0500 Subject: [PATCH 17/21] Remove unused libraries from Orion build. Part of #248 Fixes #449. --- modulefiles/build.orion.intel | 2 -- 1 file changed, 2 deletions(-) diff --git a/modulefiles/build.orion.intel b/modulefiles/build.orion.intel index 81464809e..891623680 100644 --- a/modulefiles/build.orion.intel +++ b/modulefiles/build.orion.intel @@ -15,9 +15,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 From 538af171ef6d8b3ac38f49ec8f4b10735b9f7465 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Fri, 23 Apr 2021 13:00:31 +0000 Subject: [PATCH 18/21] Remove unused libraries from Jet build. Part of #248 Fixes #449 --- modulefiles/build.jet.intel | 2 -- 1 file changed, 2 deletions(-) diff --git a/modulefiles/build.jet.intel b/modulefiles/build.jet.intel index f4090ee99..178470443 100644 --- a/modulefiles/build.jet.intel +++ b/modulefiles/build.jet.intel @@ -15,13 +15,11 @@ 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 From f484a520843d8e9dd5dd73eb7e63bcaa44fc9666 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Fri, 23 Apr 2021 13:03:27 +0000 Subject: [PATCH 19/21] Remove unused libraries from README.md Fixes #449 --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index e9d5c46e4..47003be0d 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,6 @@ 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) @@ -37,7 +36,6 @@ This package requires the following NCEPLIBS packages: - [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) From 1e8766683ce4d2b71945c099c721d8e142654739 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Fri, 23 Apr 2021 13:21:42 +0000 Subject: [PATCH 20/21] Remove unused libraries from remaining build modules. Fixes #449 Part of #248 --- modulefiles/build.cheyenne.intel | 2 -- modulefiles/build.odin.intel | 2 -- modulefiles/build.stampede.intel | 2 -- 3 files changed, 6 deletions(-) diff --git a/modulefiles/build.cheyenne.intel b/modulefiles/build.cheyenne.intel index cee0935de..570a424f4 100644 --- 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.odin.intel b/modulefiles/build.odin.intel index 30adf99d3..362aa3a84 100644 --- 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.stampede.intel b/modulefiles/build.stampede.intel index 4e37c6e84..5d5829507 100644 --- 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 From de7d13b59ca4e3c7a0d98fd9ea92eb0facc1fbb6 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Wed, 28 Apr 2021 20:25:19 +0000 Subject: [PATCH 21/21] Update CMakeLists.txt Fixes #248 Fixes #449 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f8accbde5..11b467cf5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ find_package(MPI REQUIRED C Fortran) find_package(ESMF 8.0.0 REQUIRED) if(OPENMP) - find_package(OpenMP 4.5 REQUIRED COMPONENTS Fortran) + find_package(OpenMP REQUIRED COMPONENTS Fortran) endif() find_package(sfcio 1.4.0 REQUIRED)