From 9b340357dd3c821ac535ae547ab7e1d350ad3fab Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Mon, 17 Apr 2023 11:01:17 -0500 Subject: [PATCH 1/4] Update Fit2Obs script name in JGDAS_FIT2OBS Refs #1472 --- jobs/JGDAS_FIT2OBS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/JGDAS_FIT2OBS b/jobs/JGDAS_FIT2OBS index f6a1b3631d7..d673845404b 100755 --- a/jobs/JGDAS_FIT2OBS +++ b/jobs/JGDAS_FIT2OBS @@ -58,7 +58,7 @@ if [[ ${CDATE} -gt ${SDATE} ]]; then # RUN FIT2OBS VERIFICATION ############################################## - "${fitdir}/batrun/excfs_gdas_vrfyfits.sh.ecf" + "${SCRIPTSfit2obs}/excfs_gdas_vrfyfits.sh" status=$? [[ ${status} -ne 0 ]] && exit "${status}" From 045df13c5423ac7d159476fa9b87b0047ec05c5b Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Mon, 17 Apr 2023 11:26:05 -0500 Subject: [PATCH 2/4] Update config.fit2obs to remove variables now loaded via module - An update in the Fit2Obs repo added a module that now sets a number of path variables. Remove those variables from config.fit2obs. - Will load module from Fit2Obs install at runtime to get paths. Refs #1472 --- parm/config/config.fit2obs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/parm/config/config.fit2obs b/parm/config/config.fit2obs index 9a904e2b0c9..46baaa9e459 100644 --- a/parm/config/config.fit2obs +++ b/parm/config/config.fit2obs @@ -8,13 +8,6 @@ echo "BEGIN: config.fit2obs" # Get task specific resources . "${EXPDIR}/config.resources" fit2obs -export fit_ver="wflow.1.0" -export fitdir="${BASE_GIT}/Fit2Obs/${fit_ver}" - -export HOMEcfs=${fitdir} -export EXECcfs=${HOMEcfs}/exec -export USHcfs=${HOMEcfs}/ush - export PRVT=${HOMEgfs}/fix/gsi/prepobs_errtable.global export HYBLEVS=${HOMEgfs}/fix/am/global_hyblev.l${LEVS}.txt From e36c7b88c839916c779254b162d57d7e578b960e Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Mon, 17 Apr 2023 11:32:57 -0500 Subject: [PATCH 3/4] Add Fit2Obs module load to module_base modulefiles Refs #1472 --- modulefiles/module_base.hera.lua | 3 +++ modulefiles/module_base.jet.lua | 3 +++ modulefiles/module_base.orion.lua | 3 +++ modulefiles/module_base.s4.lua | 3 +++ modulefiles/module_base.wcoss2.lua | 3 +++ 5 files changed, 15 insertions(+) diff --git a/modulefiles/module_base.hera.lua b/modulefiles/module_base.hera.lua index b93f459a21e..4bb16ed4428 100644 --- a/modulefiles/module_base.hera.lua +++ b/modulefiles/module_base.hera.lua @@ -31,6 +31,9 @@ setenv("WGRIB2","wgrib2") prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/v1.0.1/modulefiles")) load(pathJoin("prepobs", "1.0.1")) +prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/Fit2Obs/v1.0.0/modulefiles")) +load(pathJoin("fit2obs", "1.0.0")) + -- Temporary until official hpc-stack is updated prepend_path("MODULEPATH", "/scratch2/NCEPDEV/ensemble/save/Walter.Kolczynski/hpc-stack/modulefiles/stack") load(pathJoin("hpc", "1.2.0")) diff --git a/modulefiles/module_base.jet.lua b/modulefiles/module_base.jet.lua index 93ad98eb70e..f74235769c6 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/Fit2Obs/v1.0.0/modulefiles")) +load(pathJoin("fit2obs", "1.0.0")) + whatis("Description: GFS run environment") diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua index 19897aaf33d..77a7486da4d 100644 --- a/modulefiles/module_base.orion.lua +++ b/modulefiles/module_base.orion.lua @@ -30,6 +30,9 @@ setenv("WGRIB2","wgrib2") prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/v1.0.1/modulefiles")) load(pathJoin("prepobs", "1.0.1")) +prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v1.0.0/modulefiles")) +load(pathJoin("fit2obs", "1.0.0")) + -- Temporary until official hpc-stack is updated prepend_path("MODULEPATH", "/work2/noaa/global/wkolczyn/save/hpc-stack/modulefiles/stack") load(pathJoin("hpc", "1.2.0")) diff --git a/modulefiles/module_base.s4.lua b/modulefiles/module_base.s4.lua index 62170bbeb66..35c00d83c6f 100644 --- a/modulefiles/module_base.s4.lua +++ b/modulefiles/module_base.s4.lua @@ -31,4 +31,7 @@ setenv("WGRIB2","wgrib2") prepend_path("MODULEPATH", pathJoin("/data/prod/glopara/git/prepobs/v1.0.1/modulefiles")) load(pathJoin("prepobs", "1.0.1")) +prepend_path("MODULEPATH", pathJoin("/data/prod/glopara/git/Fit2Obs/v1.0.0/modulefiles")) +load(pathJoin("fit2obs", "1.0.0")) + whatis("Description: GFS run environment") diff --git a/modulefiles/module_base.wcoss2.lua b/modulefiles/module_base.wcoss2.lua index 7faa8f11a1c..c015bb8af2f 100644 --- a/modulefiles/module_base.wcoss2.lua +++ b/modulefiles/module_base.wcoss2.lua @@ -34,4 +34,7 @@ load(pathJoin("wgrib2", "2.0.7")) prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/prepobs/v1.0.1/modulefiles")) load(pathJoin("prepobs", "1.0.1")) +prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/Fit2Obs/v1.0.0/modulefiles")) +load(pathJoin("fit2obs", "1.0.0")) + whatis("Description: GFS run environment") From 169a3eccf6b6853e047e3dc1c3ff1f27191de55b Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Mon, 17 Apr 2023 12:32:32 -0500 Subject: [PATCH 4/4] Remove Fit2Obs module load from S4 module_base - An update for S4 will happen later if able. Refs #1472 --- modulefiles/module_base.s4.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/modulefiles/module_base.s4.lua b/modulefiles/module_base.s4.lua index 35c00d83c6f..62170bbeb66 100644 --- a/modulefiles/module_base.s4.lua +++ b/modulefiles/module_base.s4.lua @@ -31,7 +31,4 @@ setenv("WGRIB2","wgrib2") prepend_path("MODULEPATH", pathJoin("/data/prod/glopara/git/prepobs/v1.0.1/modulefiles")) load(pathJoin("prepobs", "1.0.1")) -prepend_path("MODULEPATH", pathJoin("/data/prod/glopara/git/Fit2Obs/v1.0.0/modulefiles")) -load(pathJoin("fit2obs", "1.0.0")) - whatis("Description: GFS run environment")