From aaa416fdea40b76fb5f6c255826cd0aed92c3889 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Mon, 18 Nov 2024 14:14:43 -0600 Subject: [PATCH] Update esmf and mapl --- modulefiles/ufs_common.lua | 2 +- modulefiles/ufs_hercules.gnu.lua | 2 +- modulefiles/ufs_hercules.intel.lua | 2 +- modulefiles/ufs_hercules.intelllvm.lua | 2 +- tests/parm/hafs_datm.streams.era5.IN | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modulefiles/ufs_common.lua b/modulefiles/ufs_common.lua index 44fe2f3848..c1ad7ef877 100644 --- a/modulefiles/ufs_common.lua +++ b/modulefiles/ufs_common.lua @@ -20,7 +20,7 @@ local ufs_modules = { {["sp"] = "2.5.0"}, {["w3emc"] = "2.10.0"}, {["gftl-shared"] = "1.6.1"}, - {["mapl"] = "2.46.2-esmf-8.6.1"}, + {["mapl"] = "2.40.3.1-esmf-8.6.1"}, {["scotch"] = "7.0.4"}, } diff --git a/modulefiles/ufs_hercules.gnu.lua b/modulefiles/ufs_hercules.gnu.lua index 9417c1452d..d0a429f958 100644 --- a/modulefiles/ufs_hercules.gnu.lua +++ b/modulefiles/ufs_hercules.gnu.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Hercules/GNU ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/ue-esmf-8.6.1-mapl-2.46.3/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/ue-esmf-8.6.1-mapl-2.40.3.1/install/modulefiles/Core") -- for mvapich2, need: prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles") diff --git a/modulefiles/ufs_hercules.intel.lua b/modulefiles/ufs_hercules.intel.lua index 539aef53b1..770983e518 100644 --- a/modulefiles/ufs_hercules.intel.lua +++ b/modulefiles/ufs_hercules.intel.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Hercules/Intel ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/ue-esmf-8.6.1-mapl-2.46.3/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/ue-esmf-8.6.1-mapl-2.40.3.1/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0" load(pathJoin("stack-intel", stack_intel_ver)) diff --git a/modulefiles/ufs_hercules.intelllvm.lua b/modulefiles/ufs_hercules.intelllvm.lua index 2d5627b417..c330900c77 100644 --- a/modulefiles/ufs_hercules.intelllvm.lua +++ b/modulefiles/ufs_hercules.intelllvm.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Hercules/IntelLLVM ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/ue-esmf-8.6.1-mapl-2.40.3.1/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0" load(pathJoin("stack-intel", stack_intel_ver)) diff --git a/tests/parm/hafs_datm.streams.era5.IN b/tests/parm/hafs_datm.streams.era5.IN index a63e8ca29f..379dea4c04 100644 --- a/tests/parm/hafs_datm.streams.era5.IN +++ b/tests/parm/hafs_datm.streams.era5.IN @@ -11,5 +11,5 @@ yearAlign01: @[SYEAR] stream_vectors01: "Sa_u10m:Sa_v10m" stream_mesh_file01: "INPUT/@[MESH_ATM]" stream_lev_dimname01: null -stream_data_files01: @[DATA_ATM]" +stream_data_files01: @[DATA_ATM] stream_data_variables01: "u10 Sa_u10m" "v10 Sa_v10m" "t2m Sa_t2m" "skt Sa_tskn" "d2m Sa_tdew" "msl Sa_pslv" "tp Faxa_rain" "cp Faxa_rainc" "lsp Faxa_rainl" "csf Faxa_snowc" "lsf Faxa_snowl" "ssrd Faxa_swdn" "ssr Faxa_swnet" "strd Faxa_lwdn" "str Faxa_lwnet" "aluvp Faxa_swvdr" "aluvd Faxa_swvdf" "alnip Faxa_swndr" "alnid Faxa_swndf" "sshf Faxa_sen" "slhf Faxa_lat" "ewss Faxa_taux" "nsss Faxa_tauy"