Skip to content

Fit2Obs updates for package reorganization and invocation via module #1484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KateFriedman-NOAA merged 6 commits into from
Apr 19, 2023
Merged

Fit2Obs updates for package reorganization and invocation via module #1484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b34035
Update Fit2Obs script name in JGDAS_FIT2OBS
KateFriedman-NOAA Apr 17, 2023
045df13
Update config.fit2obs to remove variables now loaded via module
KateFriedman-NOAA Apr 17, 2023
e36c7b8
Add Fit2Obs module load to module_base modulefiles
KateFriedman-NOAA Apr 17, 2023
169a3ec
Remove Fit2Obs module load from S4 module_base
KateFriedman-NOAA Apr 17, 2023
e7523f0
Merge branch 'NOAA-EMC:develop' into feature/fit2obs
KateFriedman-NOAA Apr 17, 2023
e708c0e
Merge branch 'NOAA-EMC:develop' into feature/fit2obs
KateFriedman-NOAA Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jobs/JGDAS_FIT2OBS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
3 changes: 3 additions & 0 deletions modulefiles/module_base.hera.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
3 changes: 3 additions & 0 deletions modulefiles/module_base.jet.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,7 @@ load(pathJoin("prepobs", "1.0.1"))
prepend_path("MODULEPATH", "/contrib/anaconda/modulefiles")
load(pathJoin("anaconda", "5.3.1"))

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")
3 changes: 3 additions & 0 deletions modulefiles/module_base.orion.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
3 changes: 3 additions & 0 deletions modulefiles/module_base.wcoss2.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
7 changes: 0 additions & 7 deletions parm/config/config.fit2obs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down