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}" 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 b772ea52635..5a543a33295 100644 --- a/modulefiles/module_base.jet.lua +++ b/modulefiles/module_base.jet.lua @@ -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") 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.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") 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