From 1603cf0f865abc71ed58451e31f9d93f845336da Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Thu, 13 Jul 2023 12:05:11 +0000 Subject: [PATCH] Testing environment for spack-stack on Hera #589 --- modulefiles/gsi_common.lua | 6 ++--- modulefiles/gsi_hera.intel.lua | 41 +++++++++++++++++----------------- src/gsi/CMakeLists.txt | 2 +- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/modulefiles/gsi_common.lua b/modulefiles/gsi_common.lua index c54f6ddb92..8ab7985d4b 100644 --- a/modulefiles/gsi_common.lua +++ b/modulefiles/gsi_common.lua @@ -2,9 +2,9 @@ help([[ Load common modules to build GSI on all machines ]]) -local netcdf_ver=os.getenv("netcdf_ver") or "4.7.4" +local netcdf_ver=os.getenv("netcdf_ver") or "4.9.2" -local bufr_ver=os.getenv("bufr_ver") or "11.7.0" +local bufr_ver=os.getenv("bufr_ver") or "12.0.0" local bacio_ver=os.getenv("bacio_ver") or "2.4.1" local w3emc_ver=os.getenv("w3emc_ver") or "2.9.2" local sp_ver=os.getenv("sp_ver") or "2.3.3" @@ -30,4 +30,4 @@ load(pathJoin("nemsio", nemsio_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("gsi-ncdiag",ncdiag_ver)) diff --git a/modulefiles/gsi_hera.intel.lua b/modulefiles/gsi_hera.intel.lua index 866af02d50..64d652be78 100644 --- a/modulefiles/gsi_hera.intel.lua +++ b/modulefiles/gsi_hera.intel.lua @@ -1,26 +1,27 @@ help([[ ]]) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles") -miniconda3_ver=os.getenv("miniconda3_ver") or "4.12.0" -load(pathJoin("miniconda3", miniconda3_ver)) - -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack") - -local hpc_ver=os.getenv("hpc_ver") or "1.2.0" -local hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1.2" -local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2022.1.2" -local cmake_ver=os.getenv("cmake_ver") or "3.20.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("cmake", cmake_ver)) - -load("gsi_common") - -load(pathJoin("prod_util", prod_util_ver)) +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/stmp4/Cameron.Book/dave_gsi/envs/gsi_test/install/modulefiles/Core") + +local spack_python_ver=os.getenv("spack_python_ver") or "3.9.12" +local spack_intel_ver=os.getenv("spack_intel_ver") or "2021.5.0" +local spack_impi_ver=os.getenv("spack_impi_ver") or "2021.5.1" +local spack_python_ver=os.getenv("spack_impi_ver") or "3.9.12" +local ecflow_ver=os.getenv("ecflow_ver") or "5.5.3" +local mysql_ver=os.getenv("mysql_ver") or "8.0.31" + +load(pathJoin("miniconda", spack_python_ver)) +load(pathJoin("ecflow", ecflow_ver)) +load(pathJoin("mysql", mysql_ver)) +load(pathJoin("stack-intel", spack_intel_ver)) +load(pathJoin("stack-intel-oneapi-mpi", spack_impi_ver)) +load(pathJoin("stack-python", spack_python_ver)) + +load("ufs-srw-app-env/unified-dev") +load("gsi-ncdiag/1.1.1") +load("ncio/1.1.2") +load("bufr/12.0.0") pushenv("CFLAGS", "-xHOST") pushenv("FFLAGS", "-xHOST") diff --git a/src/gsi/CMakeLists.txt b/src/gsi/CMakeLists.txt index af94224c05..603a0b5f4e 100644 --- a/src/gsi/CMakeLists.txt +++ b/src/gsi/CMakeLists.txt @@ -146,7 +146,7 @@ target_link_libraries(gsi_fortran_obj PUBLIC nemsio::nemsio) target_link_libraries(gsi_fortran_obj PUBLIC ncio::ncio) target_link_libraries(gsi_fortran_obj PUBLIC w3emc::w3emc_d) target_link_libraries(gsi_fortran_obj PUBLIC sp::sp_d) -target_link_libraries(gsi_fortran_obj PUBLIC bufr::bufr_d) +target_link_libraries(gsi_fortran_obj PUBLIC bufr::bufr_4) target_link_libraries(gsi_fortran_obj PUBLIC crtm::crtm) if(GSI_MODE MATCHES "Regional") target_link_libraries(gsi_fortran_obj PUBLIC wrf_io::wrf_io)