From d0f5cdbad15aa3c2a21bf4f5c099bd5cc8b016dc Mon Sep 17 00:00:00 2001 From: Biju Date: Tue, 19 Mar 2024 16:18:59 +0000 Subject: [PATCH 1/4] Jet switch from CentOS to Rocky --- modulefiles/gsi_jet.lua | 47 ++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/modulefiles/gsi_jet.lua b/modulefiles/gsi_jet.lua index e44768275c..1aaa6e6a42 100644 --- a/modulefiles/gsi_jet.lua +++ b/modulefiles/gsi_jet.lua @@ -1,40 +1,39 @@ help([[ ]]) -prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/hpc-stack/libs/intel-18.0.5.274/modulefiles/stack") +prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon-rocky8/install/modulefiles/Core") -local hpc_ver=os.getenv("hpc_ver") or "1.2.0" -local hpc_intel_ver=os.getenv("hpc_intel_ver") or "18.0.5.274" -local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2018.4.274" -local cmake_ver=os.getenv("cmake_ver") or "3.20.1" -local anaconda_ver=os.getenv("anaconda_ver") or "5.3.1" +local python_ver=os.getenv("python_ver") or "3.10.8" +local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" +local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1" +local cmake_ver=os.getenv("cmake_ver") or "3.23.1" local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2" -load(pathJoin("hpc", hpc_ver)) -load(pathJoin("hpc-intel", hpc_intel_ver)) -load(pathJoin("hpc-impi", hpc_impi_ver)) +load(pathJoin("stack-intel", stack_intel_ver)) +load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) +load(pathJoin("python", python_ver)) load(pathJoin("cmake", cmake_ver)) -prepend_path("MODULEPATH", "/contrib/anaconda/modulefiles") - -load(pathJoin("anaconda", anaconda_ver)) +load(pathJoin("prod_util", prod_util_ver)) -local netcdf_ver=os.getenv("netcdf_ver") or "4.7.4" +local netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2" +local netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.0" local bufr_ver=os.getenv("bufr_ver") or "11.7.0" local bacio_ver=os.getenv("bacio_ver") or "2.4.1" -local w3emc_ver=os.getenv("w3emc_ver") or "2.9.1" +local w3emc_ver=os.getenv("w3emc_ver") or "2.10.0" local sp_ver=os.getenv("sp_ver") or "2.3.3" -local ip_ver=os.getenv("ip_ver") or "3.3.3" +local ip_ver=os.getenv("ip_ver") or "4.3.0" local sigio_ver=os.getenv("sigio_ver") or "2.3.2" local sfcio_ver=os.getenv("sfcio_ver") or "1.4.1" -local nemsio_ver=os.getenv("nemsio_ver") or "2.5.2" +local nemsio_ver=os.getenv("nemsio_ver") or "2.5.4" local wrf_io_ver=os.getenv("wrf_io_ver") or "1.2.0" local ncio_ver=os.getenv("ncio_ver") or "1.1.2" local crtm_ver=os.getenv("crtm_ver") or "2.4.0" -local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.0" +local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.2" -load(pathJoin("netcdf", netcdf_ver)) +load(pathJoin("netcdf-c", netcdf_c_ver)) +load(pathJoin("netcdf-fortran", netcdf_fortran_ver)) load(pathJoin("bufr", bufr_ver)) load(pathJoin("bacio", bacio_ver)) @@ -44,18 +43,12 @@ load(pathJoin("ip", ip_ver)) load(pathJoin("sigio", sigio_ver)) load(pathJoin("sfcio", sfcio_ver)) load(pathJoin("nemsio", nemsio_ver)) -load(pathJoin("wrf_io", wrf_io_ver)) +load(pathJoin("wrf-io", wrf_io_ver)) load(pathJoin("ncio", ncio_ver)) load(pathJoin("crtm", crtm_ver)) -load(pathJoin("ncdiag",ncdiag_ver)) - - -load(pathJoin("prod_util", prod_util_ver)) +load(pathJoin("gsi-ncdiag",ncdiag_ver)) pushenv("CFLAGS", "-axSSE4.2,AVX,CORE-AVX2") pushenv("FFLAGS", "-axSSE4.2,AVX,CORE-AVX2") - -pushenv("GSI_BINARY_SOURCE_DIR", "/mnt/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix/gsi/20230601") - -whatis("Description: GSI environment on Jet with Intel Compilers") +pushenv("GSI_BINARY_SOURCE_DIR", "/mnt/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix/gsi/20230911") From 99dfcd761e27a5f6f15408120a1b161852889f29 Mon Sep 17 00:00:00 2001 From: Biju Thomas Date: Wed, 20 Mar 2024 13:57:00 +0000 Subject: [PATCH 2/4] Hera switch from CentOS to Rocky --- modulefiles/gsi_hera.intel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/gsi_hera.intel.lua b/modulefiles/gsi_hera.intel.lua index cddad0e2ab..39d2fd22b4 100644 --- a/modulefiles/gsi_hera.intel.lua +++ b/modulefiles/gsi_hera.intel.lua @@ -1,9 +1,9 @@ help([[ ]]) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon-env-rocky8/install/modulefiles/Core") -local python_ver=os.getenv("python_ver") or "3.10.8" +local python_ver=os.getenv("python_ver") or "3.10.13" local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1" local cmake_ver=os.getenv("cmake_ver") or "3.23.1" From 16f392eec53f8fc285271598117b5a4abde0a40d Mon Sep 17 00:00:00 2001 From: Biju Thomas Date: Sat, 23 Mar 2024 11:26:33 +0000 Subject: [PATCH 3/4] Updating modulefiles for production transition --- modulefiles/gsi_wcoss2.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modulefiles/gsi_wcoss2.lua b/modulefiles/gsi_wcoss2.lua index 04592f17b7..b24059b0e0 100644 --- a/modulefiles/gsi_wcoss2.lua +++ b/modulefiles/gsi_wcoss2.lua @@ -8,7 +8,7 @@ local cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.19" local cmake_ver= os.getenv("cmake_ver") or "3.20.2" local python_ver=os.getenv("python_ver") or "3.8.6" local prod_util_ver=os.getenv("prod_util_ver") or "2.0.14" - +local hdf5_ver=os.getenv("hdf5_ver") or "1.14.0" local netcdf_ver=os.getenv("netcdf_ver") or "4.9.2" local bufr_ver=os.getenv("bufr_ver") or "12.0.0" local bacio_ver=os.getenv("bacio_ver") or "2.4.1" @@ -21,7 +21,9 @@ local nemsio_ver=os.getenv("nemsio_ver") or "2.5.2" local wrf_io_ver=os.getenv("wrf_io_ver") or "1.2.0" local ncio_ver=os.getenv("ncio_ver") or "1.1.2" local crtm_ver=os.getenv("crtm_ver") or "2.4.0" -local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.1" +local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.2" + +prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.9") load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver)) load(pathJoin("intel", intel_ver)) @@ -31,8 +33,8 @@ load(pathJoin("cmake", cmake_ver)) load(pathJoin("python", python_ver)) load(pathJoin("prod_util", prod_util_ver)) - -load(pathJoin("netcdf-B", netcdf_ver)) +load(pathJoin("hdf5-A", hdf5_ver)) +load(pathJoin("netcdf-A", netcdf_ver)) load(pathJoin("bufr", bufr_ver)) load(pathJoin("bacio", bacio_ver)) load(pathJoin("w3emc", w3emc_ver)) @@ -42,9 +44,9 @@ load(pathJoin("sigio", sigio_ver)) load(pathJoin("sfcio", sfcio_ver)) load(pathJoin("nemsio", nemsio_ver)) load(pathJoin("wrf_io", wrf_io_ver)) -load(pathJoin("ncio", ncio_ver)) +load(pathJoin("ncio-A", ncio_ver)) load(pathJoin("crtm", crtm_ver)) -load(pathJoin("ncdiag",ncdiag_ver)) +load(pathJoin("ncdiag-A",ncdiag_ver)) pushenv("GSI_BINARY_SOURCE_DIR", "/lfs/h2/emc/global/noscrub/emc.global/FIX/fix/gsi/20230911") From 0fa0d49817db6cae59bfb41a116881ee0156eb1a Mon Sep 17 00:00:00 2001 From: BijuThomas-NOAA Date: Mon, 8 Apr 2024 14:15:36 +0000 Subject: [PATCH 4/4] Updating CMakeLists.txt to display detailed messages --- regression/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/regression/CMakeLists.txt b/regression/CMakeLists.txt index 99d92162e6..598317827f 100644 --- a/regression/CMakeLists.txt +++ b/regression/CMakeLists.txt @@ -11,7 +11,7 @@ find_program(GSICONTROLEXEC if (GSICONTROLEXEC) message(STATUS "RT: Control GSIexec Found: ${GSICONTROLEXEC}") else() - message(WARNING "RT: Control GSIexec Not Found, GSI Regression Tests Disabled!") + message(VERBOSE "RT: Control GSIexec Not Found, GSI Regression Tests Disabled!") endif() find_program(ENKFCONTROLEXEC @@ -26,12 +26,12 @@ find_program(ENKFCONTROLEXEC if (ENKFCONTROLEXEC) message(STATUS "RT: Control EnKFexec Found: ${ENKFCONTROLEXEC}") else() - message(WARNING "RT: Control EnKFexec Not Found, EnKF Regression Tests Disabled!") + message(VERBOSE "RT: Control EnKFexec Not Found, EnKF Regression Tests Disabled!") endif() # If neither are found, nothing to do; simply return if(NOT (GSICONTROLEXEC AND ENKFCONTROLEXEC)) - message(WARNING "RT: Unable to find Control Executables. Regression Tests Disabled!") + message(VERBOSE "RT: Unable to find Control Executables. Regression Tests Disabled!") set(BUILD_REG_TESTING OFF CACHE BOOL "Regression testing disabled" FORCE) return() endif()