diff --git a/modulefiles/build_noaacloud_intel.lua b/modulefiles/build_noaacloud_intel.lua index cb1205a42b..d66734164a 100644 --- a/modulefiles/build_noaacloud_intel.lua +++ b/modulefiles/build_noaacloud_intel.lua @@ -5,14 +5,10 @@ the NOAA cloud using Intel-oneapi whatis([===[Loads libraries needed for building the UFS SRW App on NOAA cloud ]===]) -prepend_path("MODULEPATH", "/contrib/spack-stack/apps/srw-app-test/modulefiles/Core") +prepend_path("MODULEPATH", "/contrib/EPIC/spack-stack/envs/srw-develop-intel/install/modulefiles/Core") +load("intel/2021.3.0") load("stack-intel") load("stack-intel-oneapi-mpi") load("cmake/3.22.1") -load("srw_common") -load("esmf/8.2.0") -load("netcdf-c") -load("netcdf-fortran") -load("libpng") -load("jasper") +load("srw_common_spack") diff --git a/modulefiles/srw_common_spack.lua b/modulefiles/srw_common_spack.lua new file mode 100644 index 0000000000..8e0a607a9d --- /dev/null +++ b/modulefiles/srw_common_spack.lua @@ -0,0 +1,30 @@ +load("jasper/2.0.25") +load("zlib/1.2.11") +load("libpng/1.6.37") +load("netcdf-c/4.7.4") +load("netcdf-fortran/4.5.4") +load("pio/2.5.3") +load("esmf/8.3.0b09") +load("fms/2022.01") + +load("bufr/11.7.0") +load("bacio/2.4.1") +load("crtm/2.3.0") +load("g2/3.4.5") +load("g2tmpl/1.10.0") +load("ip/3.3.3") +load("sp/2.3.3") +load("w3emc/2.9.2") + +load("gftl-shared/1.5.0") +load("yafyaml/0.5.1") +load("mapl/2.22.0-esmf-8.3.0b09-esmf-8.3.0") + +load("nemsio/2.5.4") +load("sfcio/1.4.1") +load("sigio/2.3.2") +load("w3nco/2.4.1") +load("wrf_io/1.2.0") + +load("ncio/1.1.2") +load("wgrib2/2.0.8") diff --git a/modulefiles/tasks/noaacloud/miniconda_regional_workflow.lua b/modulefiles/tasks/noaacloud/miniconda_regional_workflow.lua index 74486df795..31565b36c4 100644 --- a/modulefiles/tasks/noaacloud/miniconda_regional_workflow.lua +++ b/modulefiles/tasks/noaacloud/miniconda_regional_workflow.lua @@ -1,4 +1,4 @@ -prepend_path("MODULEPATH", "/contrib/GST/miniconda3/modulefiles") -load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.10.3")) +prepend_path("MODULEPATH", "/contrib/EPIC/miniconda3/modulefiles") +load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) setenv("SRW_ENV", "regional_workflow") diff --git a/modulefiles/wflow_noaacloud.lua b/modulefiles/wflow_noaacloud.lua index 23746052a0..45444a9eb2 100644 --- a/modulefiles/wflow_noaacloud.lua +++ b/modulefiles/wflow_noaacloud.lua @@ -8,12 +8,12 @@ whatis([===[Loads libraries needed for running the UFS SRW App on NOAA cloud ]== prepend_path("MODULEPATH","/apps/modules/modulefiles") load("rocoto") -prepend_path("MODULEPATH","/contrib/GST/miniconda3/modulefiles") -load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.10.3")) +prepend_path("MODULEPATH","/contrib/EPIC/miniconda3/modulefiles") +load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) -setenv("PROJ_LIB","/contrib/GST/miniconda/envs/regional_workflow/share/proj") +setenv("PROJ_LIB","/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/share/proj") setenv("OPT","/contrib/EPIC/hpc-modules") -append_path("PATH","/contrib/GST/miniconda/envs/regional_workflow/bin") +append_path("PATH","/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/bin") if mode() == "load" then LmodMsgRaw([===[Please do the following to activate conda: diff --git a/ush/load_modules_run_task.sh b/ush/load_modules_run_task.sh index efd14c88ab..f5cb23a651 100755 --- a/ush/load_modules_run_task.sh +++ b/ush/load_modules_run_task.sh @@ -184,7 +184,7 @@ module list if [ -n "${SRW_ENV:-}" ] ; then set +u conda activate ${SRW_ENV} - if [ $machine = "gaea" ]; then + if [ $machine = "gaea" ] || [ $machine = "noaacloud" ]; then conda deactivate conda activate ${SRW_ENV} fi diff --git a/ush/machine/noaacloud.yaml b/ush/machine/noaacloud.yaml index ffa371ba2d..42522ce3d8 100644 --- a/ush/machine/noaacloud.yaml +++ b/ush/machine/noaacloud.yaml @@ -5,14 +5,14 @@ platform: CCPA_OBS_DIR: /contrib/EPIC/UFS_SRW_App/develop/obs_data/ccpa/proc MRMS_OBS_DIR: /contrib/EPIC/UFS_SRW_App/develop/obs_data/mrms/proc NDAS_OBS_DIR: /contrib/EPIC/UFS_SRW_App/develop/obs_data/ndas/proc - METPLUS_PATH: /contrib/EPIC/spack-stack/envs/ufs-srw-dev.intel/install/intel/2021.3.0/metplus-4.1.0-t4mkmbg + METPLUS_PATH: /contrib/EPIC/spack-stack/envs/srw-develop-intel/install/intel/2021.3.0/metplus-4.1.0-4mq7qyb MET_BIN_EXEC: bin - MET_INSTALL_DIR: /contrib/EPIC/spack-stack/envs/ufs-srw-dev.intel/install/intel/2021.3.0/met-10.1.0-mqwqjxt + MET_INSTALL_DIR: /contrib/EPIC/spack-stack/envs/srw-develop-intel/install/intel/2021.3.0/met-10.1.0-7kjlehi RUN_CMD_FCST: mpiexec -np ${PE_MEMBER01} RUN_CMD_POST: mpiexec -np $nprocs RUN_CMD_SERIAL: time RUN_CMD_UTILS: mpiexec -np $nprocs - PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }' + PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; sudo yum -y install time; }' BUILD_MOD_FN: wflow_noaacloud TEST_EXTRN_MDL_SOURCE_BASEDIR: /contrib/EPIC/UFS_SRW_App/develop/input_model_data TEST_PREGEN_BASEDIR: /contrib/EPIC/UFS_SRW_App/develop/FV3LAM_pregen