diff --git a/modulefiles/tasks/wcoss2/get_extrn_ics.local.lua b/modulefiles/tasks/wcoss2/get_extrn_ics.local.lua index 16559474cd..3370fa018b 100644 --- a/modulefiles/tasks/wcoss2/get_extrn_ics.local.lua +++ b/modulefiles/tasks/wcoss2/get_extrn_ics.local.lua @@ -1,2 +1 @@ -load(pathJoin("intel", os.getenv("intel_ver"))) -load(pathJoin("python", os.getenv("python_ver"))) +load("python_regional_workflow") diff --git a/modulefiles/tasks/wcoss2/get_extrn_lbcs.local.lua b/modulefiles/tasks/wcoss2/get_extrn_lbcs.local.lua index 16559474cd..3370fa018b 100644 --- a/modulefiles/tasks/wcoss2/get_extrn_lbcs.local.lua +++ b/modulefiles/tasks/wcoss2/get_extrn_lbcs.local.lua @@ -1,2 +1 @@ -load(pathJoin("intel", os.getenv("intel_ver"))) -load(pathJoin("python", os.getenv("python_ver"))) +load("python_regional_workflow") diff --git a/modulefiles/tasks/wcoss2/get_obs.local.lua b/modulefiles/tasks/wcoss2/get_obs.local.lua index 16559474cd..3370fa018b 100644 --- a/modulefiles/tasks/wcoss2/get_obs.local.lua +++ b/modulefiles/tasks/wcoss2/get_obs.local.lua @@ -1,2 +1 @@ -load(pathJoin("intel", os.getenv("intel_ver"))) -load(pathJoin("python", os.getenv("python_ver"))) +load("python_regional_workflow") diff --git a/modulefiles/tasks/wcoss2/make_grid.local.lua b/modulefiles/tasks/wcoss2/make_grid.local.lua index 16559474cd..3370fa018b 100644 --- a/modulefiles/tasks/wcoss2/make_grid.local.lua +++ b/modulefiles/tasks/wcoss2/make_grid.local.lua @@ -1,2 +1 @@ -load(pathJoin("intel", os.getenv("intel_ver"))) -load(pathJoin("python", os.getenv("python_ver"))) +load("python_regional_workflow") diff --git a/modulefiles/tasks/wcoss2/make_ics.local.lua b/modulefiles/tasks/wcoss2/make_ics.local.lua index 16559474cd..3370fa018b 100644 --- a/modulefiles/tasks/wcoss2/make_ics.local.lua +++ b/modulefiles/tasks/wcoss2/make_ics.local.lua @@ -1,2 +1 @@ -load(pathJoin("intel", os.getenv("intel_ver"))) -load(pathJoin("python", os.getenv("python_ver"))) +load("python_regional_workflow") diff --git a/modulefiles/tasks/wcoss2/make_lbcs.local.lua b/modulefiles/tasks/wcoss2/make_lbcs.local.lua index 16559474cd..3370fa018b 100644 --- a/modulefiles/tasks/wcoss2/make_lbcs.local.lua +++ b/modulefiles/tasks/wcoss2/make_lbcs.local.lua @@ -1,2 +1 @@ -load(pathJoin("intel", os.getenv("intel_ver"))) -load(pathJoin("python", os.getenv("python_ver"))) +load("python_regional_workflow") diff --git a/modulefiles/tasks/wcoss2/make_sfc_climo.local.lua b/modulefiles/tasks/wcoss2/make_sfc_climo.local.lua index 16559474cd..3370fa018b 100644 --- a/modulefiles/tasks/wcoss2/make_sfc_climo.local.lua +++ b/modulefiles/tasks/wcoss2/make_sfc_climo.local.lua @@ -1,2 +1 @@ -load(pathJoin("intel", os.getenv("intel_ver"))) -load(pathJoin("python", os.getenv("python_ver"))) +load("python_regional_workflow") diff --git a/modulefiles/tasks/wcoss2/run_fcst.local.lua b/modulefiles/tasks/wcoss2/run_fcst.local.lua index 16559474cd..3370fa018b 100644 --- a/modulefiles/tasks/wcoss2/run_fcst.local.lua +++ b/modulefiles/tasks/wcoss2/run_fcst.local.lua @@ -1,2 +1 @@ -load(pathJoin("intel", os.getenv("intel_ver"))) -load(pathJoin("python", os.getenv("python_ver"))) +load("python_regional_workflow") diff --git a/modulefiles/tasks/wcoss2/run_vx.local.lua b/modulefiles/tasks/wcoss2/run_vx.local.lua index 16559474cd..3370fa018b 100644 --- a/modulefiles/tasks/wcoss2/run_vx.local.lua +++ b/modulefiles/tasks/wcoss2/run_vx.local.lua @@ -1,2 +1 @@ -load(pathJoin("intel", os.getenv("intel_ver"))) -load(pathJoin("python", os.getenv("python_ver"))) +load("python_regional_workflow") diff --git a/versions/run.ver.wcoss2 b/versions/run.ver.wcoss2 index 9374b03c15..6a06331a85 100644 --- a/versions/run.ver.wcoss2 +++ b/versions/run.ver.wcoss2 @@ -9,3 +9,4 @@ export nam_ver=v4.2 export rap_ver=v5.1 export gsmgfs_ver=v16.2 export hrrr_ver=v3 +export prod_util_ver=2.0.14