From bdd1a54d379a7be637ed36a6be1f0e851bd39270 Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Mon, 1 Jul 2024 12:21:23 -0400 Subject: [PATCH] update fit2obs and prepobs paths --- modulefiles/module_base.orion.lua | 15 +++++++++------ versions/run.orion.ver | 2 -- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua index 87abcc7233..1b2b9648e7 100644 --- a/modulefiles/module_base.orion.lua +++ b/modulefiles/module_base.orion.lua @@ -9,7 +9,6 @@ load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None"))) load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None"))) load(pathJoin("python", (os.getenv("python_ver") or "None"))) ---load(pathJoin("gempak", (os.getenv("gempak_ver") or "None"))) load(pathJoin("jasper", (os.getenv("jasper_ver") or "None"))) load(pathJoin("libpng", (os.getenv("libpng_ver") or "None"))) load(pathJoin("cdo", (os.getenv("cdo_ver") or "None"))) @@ -44,10 +43,14 @@ setenv("WGRIB","wgrib") setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None")) --prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles")) -prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles")) -load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None"))) - -prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles")) -load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None"))) +--prepend_path("MODULEPATH", "/work/noaa/global/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles") +--load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None"))) +prepend_path("MODULEPATH", "/work/noaa/global/kfriedma/git/prepobs/feature-orion_rocky9/modulefiles") +load(pathJoin("prepobs", "1.0.2")) + +--prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles")) +--load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None"))) +prepend_path("MODULEPATH", "/work/noaa/global/kfriedma/git/fit2obs/feature-orion_rocky9/modulefiles") +load(pathJoin("fit2obs", "1.1.2")) whatis("Description: GFS run environment") diff --git a/versions/run.orion.ver b/versions/run.orion.ver index 9c3444d5c0..112636fb20 100644 --- a/versions/run.orion.ver +++ b/versions/run.orion.ver @@ -2,7 +2,5 @@ export stack_intel_ver=2021.9.0 export stack_impi_ver=2021.9.0 export spack_env=gsi-addon-env-rocky9 -export gempak_ver=7.5.1 # TODO: this version is not installed on Orion+Rocky9 - source "${HOMEgfs:-}/versions/run.spack.ver" export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"