From 53dfccfba3afe07a9d15f94805a238afa975609d Mon Sep 17 00:00:00 2001 From: BenjaminBlake-NOAA <52074832+BenjaminBlake-NOAA@users.noreply.github.com> Date: Tue, 17 Sep 2024 09:01:22 -0400 Subject: [PATCH] Remove python_srw module (#488) Co-authored-by: benjamin blake --- modulefiles/tasks/wcoss2/analysis_gsi.local.lua | 4 ++-- modulefiles/tasks/wcoss2/blend_ics.local.lua | 4 ++-- modulefiles/tasks/wcoss2/bufrsnd.local.lua | 4 ++-- modulefiles/tasks/wcoss2/enkf_radarref.local.lua | 4 ++-- modulefiles/tasks/wcoss2/enkfupdt.local.lua | 4 ++-- modulefiles/tasks/wcoss2/forecast.local.lua | 4 ++-- modulefiles/tasks/wcoss2/hybrid_radar_ref.local.lua | 4 ++-- modulefiles/tasks/wcoss2/make_grid.local.lua | 4 ++-- modulefiles/tasks/wcoss2/make_ics.local.lua | 4 ++-- modulefiles/tasks/wcoss2/make_lbcs.local.lua | 4 ++-- modulefiles/tasks/wcoss2/make_orog.local.lua | 4 ++-- modulefiles/tasks/wcoss2/make_sfc_climo.local.lua | 4 ++-- modulefiles/tasks/wcoss2/post.local.lua | 4 ++-- modulefiles/tasks/wcoss2/prdgen.local.lua | 3 ++- modulefiles/tasks/wcoss2/prep_cyc.local.lua | 4 ++-- modulefiles/tasks/wcoss2/process_smoke.local.lua | 4 ++-- modulefiles/tasks/wcoss2/python_srw.lua | 5 ----- modulefiles/tasks/wcoss2/recenter.local.lua | 4 ++-- modulefiles/tasks/wcoss2/save_restart.local.lua | 4 ++-- 19 files changed, 36 insertions(+), 40 deletions(-) delete mode 100644 modulefiles/tasks/wcoss2/python_srw.lua diff --git a/modulefiles/tasks/wcoss2/analysis_gsi.local.lua b/modulefiles/tasks/wcoss2/analysis_gsi.local.lua index 2ab7fa547..13d9f37f3 100644 --- a/modulefiles/tasks/wcoss2/analysis_gsi.local.lua +++ b/modulefiles/tasks/wcoss2/analysis_gsi.local.lua @@ -1,8 +1,8 @@ -load("python_srw") - load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/blend_ics.local.lua b/modulefiles/tasks/wcoss2/blend_ics.local.lua index d97797709..2496c0bd7 100644 --- a/modulefiles/tasks/wcoss2/blend_ics.local.lua +++ b/modulefiles/tasks/wcoss2/blend_ics.local.lua @@ -1,8 +1,8 @@ -load("python_srw") - load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/bufrsnd.local.lua b/modulefiles/tasks/wcoss2/bufrsnd.local.lua index 7cb66e1a9..22404c80c 100644 --- a/modulefiles/tasks/wcoss2/bufrsnd.local.lua +++ b/modulefiles/tasks/wcoss2/bufrsnd.local.lua @@ -1,11 +1,11 @@ -load("python_srw") - unload("PrgEnv-intel") unload("netcdf") load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/enkf_radarref.local.lua b/modulefiles/tasks/wcoss2/enkf_radarref.local.lua index 14d440d3e..0f9618acc 100644 --- a/modulefiles/tasks/wcoss2/enkf_radarref.local.lua +++ b/modulefiles/tasks/wcoss2/enkf_radarref.local.lua @@ -1,8 +1,8 @@ -load("python_srw") - load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/enkfupdt.local.lua b/modulefiles/tasks/wcoss2/enkfupdt.local.lua index 14d440d3e..0f9618acc 100644 --- a/modulefiles/tasks/wcoss2/enkfupdt.local.lua +++ b/modulefiles/tasks/wcoss2/enkfupdt.local.lua @@ -1,8 +1,8 @@ -load("python_srw") - load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/forecast.local.lua b/modulefiles/tasks/wcoss2/forecast.local.lua index aa693a77e..83ca4824f 100644 --- a/modulefiles/tasks/wcoss2/forecast.local.lua +++ b/modulefiles/tasks/wcoss2/forecast.local.lua @@ -1,11 +1,11 @@ -load("python_srw") - unload("cray_mpich") unload("netcdf") load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/hybrid_radar_ref.local.lua b/modulefiles/tasks/wcoss2/hybrid_radar_ref.local.lua index 3424d646b..5d3a29443 100644 --- a/modulefiles/tasks/wcoss2/hybrid_radar_ref.local.lua +++ b/modulefiles/tasks/wcoss2/hybrid_radar_ref.local.lua @@ -1,8 +1,8 @@ -load("python_srw") - load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/make_grid.local.lua b/modulefiles/tasks/wcoss2/make_grid.local.lua index b756bf6c6..23724e062 100644 --- a/modulefiles/tasks/wcoss2/make_grid.local.lua +++ b/modulefiles/tasks/wcoss2/make_grid.local.lua @@ -1,8 +1,8 @@ -load("python_srw") - load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/make_ics.local.lua b/modulefiles/tasks/wcoss2/make_ics.local.lua index 74ec63e80..280d61bbb 100644 --- a/modulefiles/tasks/wcoss2/make_ics.local.lua +++ b/modulefiles/tasks/wcoss2/make_ics.local.lua @@ -1,8 +1,8 @@ -load("python_srw") - load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/make_lbcs.local.lua b/modulefiles/tasks/wcoss2/make_lbcs.local.lua index 74ec63e80..280d61bbb 100644 --- a/modulefiles/tasks/wcoss2/make_lbcs.local.lua +++ b/modulefiles/tasks/wcoss2/make_lbcs.local.lua @@ -1,8 +1,8 @@ -load("python_srw") - load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/make_orog.local.lua b/modulefiles/tasks/wcoss2/make_orog.local.lua index 60deb4d5d..db057416c 100644 --- a/modulefiles/tasks/wcoss2/make_orog.local.lua +++ b/modulefiles/tasks/wcoss2/make_orog.local.lua @@ -1,8 +1,8 @@ -load("python_srw") - load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/make_sfc_climo.local.lua b/modulefiles/tasks/wcoss2/make_sfc_climo.local.lua index 70cfa03ef..68b857e16 100644 --- a/modulefiles/tasks/wcoss2/make_sfc_climo.local.lua +++ b/modulefiles/tasks/wcoss2/make_sfc_climo.local.lua @@ -1,8 +1,8 @@ -load("python_srw") - load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/post.local.lua b/modulefiles/tasks/wcoss2/post.local.lua index 9a229464b..43273d6c8 100644 --- a/modulefiles/tasks/wcoss2/post.local.lua +++ b/modulefiles/tasks/wcoss2/post.local.lua @@ -1,11 +1,11 @@ -load("python_srw") - unload("PrgEnv-intel") unload("netcdf") load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/prdgen.local.lua b/modulefiles/tasks/wcoss2/prdgen.local.lua index bdf13c63a..d4075e307 100644 --- a/modulefiles/tasks/wcoss2/prdgen.local.lua +++ b/modulefiles/tasks/wcoss2/prdgen.local.lua @@ -1,9 +1,10 @@ -load("python_srw") load(pathJoin("cfp", os.getenv("cfp_ver"))) load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/prep_cyc.local.lua b/modulefiles/tasks/wcoss2/prep_cyc.local.lua index 63afdbeb2..9fad8ba69 100644 --- a/modulefiles/tasks/wcoss2/prep_cyc.local.lua +++ b/modulefiles/tasks/wcoss2/prep_cyc.local.lua @@ -1,8 +1,8 @@ -load("python_srw") - load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/process_smoke.local.lua b/modulefiles/tasks/wcoss2/process_smoke.local.lua index 3424d646b..5d3a29443 100644 --- a/modulefiles/tasks/wcoss2/process_smoke.local.lua +++ b/modulefiles/tasks/wcoss2/process_smoke.local.lua @@ -1,8 +1,8 @@ -load("python_srw") - load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/python_srw.lua b/modulefiles/tasks/wcoss2/python_srw.lua deleted file mode 100644 index 0a3bc3207..000000000 --- a/modulefiles/tasks/wcoss2/python_srw.lua +++ /dev/null @@ -1,5 +0,0 @@ -load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) -load(pathJoin("craype", os.getenv("craype_ver"))) -load(pathJoin("intel", os.getenv("intel_ver"))) -load(pathJoin("python", os.getenv("python_ver"))) -load(pathJoin("prod_util", os.getenv("prod_util_ver"))) diff --git a/modulefiles/tasks/wcoss2/recenter.local.lua b/modulefiles/tasks/wcoss2/recenter.local.lua index a28d4300f..15121d298 100644 --- a/modulefiles/tasks/wcoss2/recenter.local.lua +++ b/modulefiles/tasks/wcoss2/recenter.local.lua @@ -1,11 +1,11 @@ -load("python_srw") - unload("PrgEnv-intel") unload("netcdf") load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("craype", os.getenv("craype_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) diff --git a/modulefiles/tasks/wcoss2/save_restart.local.lua b/modulefiles/tasks/wcoss2/save_restart.local.lua index b9d31def5..c817829e5 100644 --- a/modulefiles/tasks/wcoss2/save_restart.local.lua +++ b/modulefiles/tasks/wcoss2/save_restart.local.lua @@ -1,8 +1,8 @@ -load("python_srw") - load(pathJoin("PrgEnv-intel", "8.1.0")) load(pathJoin("intel", "19.1.3.304")) load(pathJoin("craype", "2.7.13")) +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("cray-mpich", "8.1.7")) setenv("HPC_OPT", "/apps/ops/para/libs")