From 74884227aedd00cf3b1688fc87b149dcae9eb8f2 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Mon, 17 Apr 2023 14:20:10 -0500 Subject: [PATCH 1/5] Remove prepobs path variables from jobs/rocoto/prep.sh Refs #761 --- jobs/rocoto/prep.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/jobs/rocoto/prep.sh b/jobs/rocoto/prep.sh index d82cb29de3..826dec5ae7 100755 --- a/jobs/rocoto/prep.sh +++ b/jobs/rocoto/prep.sh @@ -113,15 +113,6 @@ if [[ ${MAKE_PREPBUFR} = "YES" ]]; then export MAKE_NSSTBUFR="NO" fi - export DEBUG_LEVEL="4" - export LOUD="YES" - export HOMEprepobs="${BASE_GIT}/prepobs/v1.0.1" - export EXECprepobs=${HOMEprepobs}/exec - export FIXprepobs=${HOMEprepobs}/fix - export SCRIPTprepobs=${HOMEprepobs}/script - export USHprepobs=${HOMEprepobs}/ush - - "${HOMEobsproc}/jobs/JOBSPROC_GLOBAL_PREP" status=$? [[ ${status} -ne 0 ]] && exit ${status} From c1bbb8416add5fbbe69bedd469c7ba3d21669af0 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Mon, 17 Apr 2023 14:21:49 -0500 Subject: [PATCH 2/5] Temporarily use feature-GFSv17_com_reorg install of TC_tracker - Will update in a follow-up PR to use newly installed tag/version. Refs #761 --- parm/config/config.vrfy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/parm/config/config.vrfy b/parm/config/config.vrfy index 1cf08f97c8..f73a2994e3 100644 --- a/parm/config/config.vrfy +++ b/parm/config/config.vrfy @@ -66,7 +66,8 @@ fi # Cyclone genesis and cyclone track verification #------------------------------------------------- -export ens_tracker_ver=v1.1.15.5 +#export ens_tracker_ver=v1.1.15.5 +export ens_tracker_ver=feature-GFSv17_com_reorg # TODO - temporary ahead of new tag/version export HOMEens_tracker=$BASE_GIT/TC_tracker/${ens_tracker_ver} if [ "$VRFYTRAK" = "YES" ]; then From 8dfde83481c324408910fc0e34dbe37c3c7b328c Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Mon, 17 Apr 2023 14:22:37 -0500 Subject: [PATCH 3/5] Set prepobs module to interim feature-GFSv17_com_reorg copy Refs #761 --- modulefiles/module_base.hera.lua | 2 +- modulefiles/module_base.orion.lua | 2 +- modulefiles/module_base.s4.lua | 2 +- modulefiles/module_base.wcoss2.lua | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modulefiles/module_base.hera.lua b/modulefiles/module_base.hera.lua index b93f459a21..df39dbcd10 100644 --- a/modulefiles/module_base.hera.lua +++ b/modulefiles/module_base.hera.lua @@ -28,7 +28,7 @@ load(pathJoin("crtm", "2.4.0")) load(pathJoin("wgrib2", "2.0.8")) setenv("WGRIB2","wgrib2") -prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/v1.0.1/modulefiles")) +prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/feature-GFSv17_com_reorg/modulefiles")) load(pathJoin("prepobs", "1.0.1")) -- Temporary until official hpc-stack is updated diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua index 19897aaf33..3eaa80f2bb 100644 --- a/modulefiles/module_base.orion.lua +++ b/modulefiles/module_base.orion.lua @@ -27,7 +27,7 @@ load(pathJoin("crtm", "2.4.0")) load(pathJoin("wgrib2", "2.0.8")) setenv("WGRIB2","wgrib2") -prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/v1.0.1/modulefiles")) +prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/feature-GFSv17_com_reorg/modulefiles")) load(pathJoin("prepobs", "1.0.1")) -- Temporary until official hpc-stack is updated diff --git a/modulefiles/module_base.s4.lua b/modulefiles/module_base.s4.lua index 62170bbeb6..3d31e43ee7 100644 --- a/modulefiles/module_base.s4.lua +++ b/modulefiles/module_base.s4.lua @@ -28,7 +28,7 @@ load(pathJoin("crtm", "2.4.0")) load(pathJoin("wgrib2", "2.0.8")) setenv("WGRIB2","wgrib2") -prepend_path("MODULEPATH", pathJoin("/data/prod/glopara/git/prepobs/v1.0.1/modulefiles")) +prepend_path("MODULEPATH", pathJoin("/data/prod/glopara/git/prepobs/feature-GFSv17_com_reorg/modulefiles")) load(pathJoin("prepobs", "1.0.1")) whatis("Description: GFS run environment") diff --git a/modulefiles/module_base.wcoss2.lua b/modulefiles/module_base.wcoss2.lua index 7faa8f11a1..36aa493dee 100644 --- a/modulefiles/module_base.wcoss2.lua +++ b/modulefiles/module_base.wcoss2.lua @@ -31,7 +31,7 @@ load(pathJoin("ncdiag", "1.0.0")) load(pathJoin("crtm", "2.4.0")) load(pathJoin("wgrib2", "2.0.7")) -prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/prepobs/v1.0.1/modulefiles")) +prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/prepobs/feature-GFSv17_com_reorg/modulefiles")) load(pathJoin("prepobs", "1.0.1")) whatis("Description: GFS run environment") From d552981fa00962b6ad7a293929d152b165907731 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Mon, 17 Apr 2023 14:24:16 -0500 Subject: [PATCH 4/5] Set prepobs module to interim feature-GFSv17_com_reorg copy for Jet - Make sure this isn't wiped out by Jet port PR going in. Refs #761 --- modulefiles/module_base.jet.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modulefiles/module_base.jet.lua b/modulefiles/module_base.jet.lua index 93ad98eb70..02853ddd22 100644 --- a/modulefiles/module_base.jet.lua +++ b/modulefiles/module_base.jet.lua @@ -22,4 +22,7 @@ load(pathJoin("g2tmpl", "1.10.0")) load(pathJoin("crtm", "2.4.0")) load(pathJoin("wgrib2", "2.0.8")) +prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/prepobs/feature-GFSv17_com_reorg/modulefiles")) +load(pathJoin("prepobs", "1.0.1")) + whatis("Description: GFS run environment") From 069fb3909df1294f14271d44b00cfdc7709b267b Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Mon, 17 Apr 2023 15:23:24 -0500 Subject: [PATCH 5/5] Revert Hera/Orion BASE_GITs back to global group locations Refs #761 --- workflow/hosts/hera.yaml | 3 +-- workflow/hosts/orion.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/workflow/hosts/hera.yaml b/workflow/hosts/hera.yaml index f5b4591521..d6e3b83b3d 100644 --- a/workflow/hosts/hera.yaml +++ b/workflow/hosts/hera.yaml @@ -1,5 +1,4 @@ -# BASE_GIT: '/scratch1/NCEPDEV/global/glopara/git' -BASE_GIT: '/scratch2/NCEPDEV/ensemble/save/Walter.Kolczynski/gw_external_git' +BASE_GIT: '/scratch1/NCEPDEV/global/glopara/git' DMPDIR: '/scratch1/NCEPDEV/global/glopara/dump' PACKAGEROOT: '/scratch1/NCEPDEV/global/glopara/nwpara' COMROOT: '/scratch1/NCEPDEV/global/glopara/com' diff --git a/workflow/hosts/orion.yaml b/workflow/hosts/orion.yaml index 8e980b617b..b1f0a8ad97 100644 --- a/workflow/hosts/orion.yaml +++ b/workflow/hosts/orion.yaml @@ -1,5 +1,4 @@ -# BASE_GIT: '/work/noaa/global/glopara/git' -BASE_GIT: '/work2/noaa/global/wkolczyn/save/gw_external_git' +BASE_GIT: '/work/noaa/global/glopara/git' DMPDIR: '/work/noaa/rstprod/dump' PACKAGEROOT: '/work/noaa/global/glopara/nwpara' COMROOT: '/work/noaa/global/glopara/com'