Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/hpc-stack
Browse files Browse the repository at this point in the history
* origin/develop:
  Issue #179 and issue #243 - update Fit2Obs to newm.1.2 tag and correct COMROOT path for Hera
  HOTFIX: Issue #241 - update EMC_verif-global tag to remove use of /tmp space
  • Loading branch information
KateFriedman-NOAA committed Jan 25, 2021
2 parents 40184c2 + 479000a commit fad08a2
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protocol = git
required = True

[EMC_verif-global]
tag = verif_global_v1.11.0
tag = verif_global_v1.13.1
local_path = sorc/verif-global.fd
repo_url = https://github.com/NOAA-EMC/EMC_verif-global.git
protocol = git
Expand Down
2 changes: 1 addition & 1 deletion parm/config/config.vrfy
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export RUNMOS="NO" # whether to run entire MOS package

if [ $VRFYFITS = "YES" ]; then

export fit_ver="newm.1.1"
export fit_ver="newm.1.2"
export fitdir="$BASE_GIT/verif/global/Fit2Obs/${fit_ver}/batrun"
export PRVT=$HOMEgfs/fix/fix_gsi/prepobs_errtable.global
export HYBLEVS=$HOMEgfs/fix/fix_am/global_hyblev.l${LEVS}.txt
Expand Down
2 changes: 1 addition & 1 deletion sorc/checkout.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ if [[ ! -d verif-global.fd ]] ; then
rm -f ${topdir}/checkout-verif-global.log
git clone --recursive https://github.com/NOAA-EMC/EMC_verif-global.git verif-global.fd >> ${topdir}/checkout-verif-global.log 2>&1
cd verif-global.fd
git checkout verif_global_v1.11.0
git checkout verif_global_v1.13.1
cd ${topdir}
else
echo 'Skip. Directory verif-global.fd already exist.'
Expand Down
2 changes: 1 addition & 1 deletion ush/rocoto/setup_expt.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def edit_baseconfig():
base_svn = '/scratch1/NCEPDEV/global/glopara/svn'
dmpdir = '/scratch1/NCEPDEV/global/glopara/dump'
nwprod = '/scratch1/NCEPDEV/global/glopara/nwpara'
comroot = '/scratch1/NCEPDEV/rstprod/com'
comroot = '/scratch1/NCEPDEV/global/glopara/com'
homedir = '/scratch1/NCEPDEV/global/$USER'
stmp = '/scratch1/NCEPDEV/stmp2/$USER'
ptmp = '/scratch1/NCEPDEV/stmp4/$USER'
Expand Down
2 changes: 1 addition & 1 deletion ush/rocoto/setup_expt_fcstonly.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ def edit_baseconfig():
base_svn = '/scratch1/NCEPDEV/global/glopara/svn'
dmpdir = '/scratch1/NCEPDEV/global/glopara/dump'
nwprod = '/scratch1/NCEPDEV/global/glopara/nwpara'
comroot = '/scratch1/NCEPDEV/rstprod/com'
comroot = '/scratch1/NCEPDEV/global/glopara/com'
homedir = '/scratch1/NCEPDEV/global/$USER'
stmp = '/scratch1/NCEPDEV/stmp2/$USER'
ptmp = '/scratch1/NCEPDEV/stmp4/$USER'
Expand Down

0 comments on commit fad08a2

Please sign in to comment.