From fda063d95c786fe61caff56adc2a6e56ef31dc32 Mon Sep 17 00:00:00 2001
From: "kate.friedman" <kate.friedman@noaa.gov>
Date: Tue, 17 Aug 2021 12:00:55 -0500
Subject: [PATCH 1/3] Update EMC_verif-global tag to verif_global_v2.2.1

This tag includes updates for:
- Support rstprod prepbufr files being used on Orion in grid-to-obs verification
- Support for running on S4 (stand alone and in global workflow)
- Enhancements and clean up of plotting scripts

Refs: #347
---
 sorc/checkout.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sorc/checkout.sh b/sorc/checkout.sh
index 02533d4ea14..94168728f99 100755
--- a/sorc/checkout.sh
+++ b/sorc/checkout.sh
@@ -113,7 +113,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_v2.0.2
+    git checkout verif_global_v2.2.1
     cd ${topdir}
 else
     echo 'Skip. Directory verif-global.fd already exist.'

From 81acac37d80f3059eb39e457652c4fd76cbd91a0 Mon Sep 17 00:00:00 2001
From: "kate.friedman" <kate.friedman@noaa.gov>
Date: Tue, 17 Aug 2021 12:04:06 -0500
Subject: [PATCH 2/3] Turn on rstprod support by default on Orion

- in setup scripts change rstprod variables setting for Orion to use rstprod policy
- set chgrp_rstprod to 'YES'
- set chgrp_cmd to 'chgrp rstprod'
- workflow jobs that use CHGRP_CMD will set file permissions to 'rstprod' where needed

Refs: #347
---
 ush/rocoto/setup_expt.py          | 4 ++--
 ush/rocoto/setup_expt_fcstonly.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ush/rocoto/setup_expt.py b/ush/rocoto/setup_expt.py
index 293d18c1017..6d7946c7ca7 100755
--- a/ush/rocoto/setup_expt.py
+++ b/ush/rocoto/setup_expt.py
@@ -250,8 +250,8 @@ def edit_baseconfig():
       queue = 'batch'
       queue_service = 'service'
       partition_batch = 'orion'
-      chgrp_rstprod = 'NO'
-      chgrp_cmd = 'ls'
+      chgrp_rstprod = 'YES'
+      chgrp_cmd = 'chgrp rstprod'
       hpssarch = 'NO'
 
     if args.icsdir is not None and not os.path.exists(icsdir):
diff --git a/ush/rocoto/setup_expt_fcstonly.py b/ush/rocoto/setup_expt_fcstonly.py
index 3e7397127d4..5f129ffea1d 100755
--- a/ush/rocoto/setup_expt_fcstonly.py
+++ b/ush/rocoto/setup_expt_fcstonly.py
@@ -238,8 +238,8 @@ def edit_baseconfig():
       queue = 'batch'
       queue_service = 'service'
       partition_batch = 'orion'
-      chgrp_rstprod = 'NO'          # No rstprod on Orion
-      chgrp_cmd = 'ls'
+      chgrp_rstprod = 'YES'
+      chgrp_cmd = 'chgrp rstprod'
       hpssarch = 'NO'
 
     # COMROT directory

From 4c0f87bd7242b9b0677e8f82ef9ee5bea4e725f7 Mon Sep 17 00:00:00 2001
From: "kate.friedman" <kate.friedman@noaa.gov>
Date: Tue, 17 Aug 2021 12:07:39 -0500
Subject: [PATCH 3/3] Change default DMPDIR path on Orion to new
 rstprod-supported GDA

- change DMPDIR to '/work/noaa/rstprod/dump' on Orion
- default paths in setup_expt*py scripts updated
- config.base will now point DMPDIR to rstprod-supported GDA on Orion

Refs: #347
---
 ush/rocoto/setup_expt.py          | 2 +-
 ush/rocoto/setup_expt_fcstonly.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ush/rocoto/setup_expt.py b/ush/rocoto/setup_expt.py
index 6d7946c7ca7..4ab8fb62e95 100755
--- a/ush/rocoto/setup_expt.py
+++ b/ush/rocoto/setup_expt.py
@@ -239,7 +239,7 @@ def edit_baseconfig():
     elif machine == 'ORION':
       base_git = '/work/noaa/global/glopara/git'
       base_svn = '/work/noaa/global/glopara/svn'
-      dmpdir = '/work/noaa/global/glopara/dump'
+      dmpdir = '/work/noaa/rstprod/dump'
       nwprod = '/work/noaa/global/glopara/nwpara'
       comroot = '/work/noaa/global/glopara/com'
       homedir = '/work/noaa/global/$USER'
diff --git a/ush/rocoto/setup_expt_fcstonly.py b/ush/rocoto/setup_expt_fcstonly.py
index 5f129ffea1d..3e186fd1d9d 100755
--- a/ush/rocoto/setup_expt_fcstonly.py
+++ b/ush/rocoto/setup_expt_fcstonly.py
@@ -227,7 +227,7 @@ def edit_baseconfig():
     elif machine == 'ORION':
       base_git = '/work/noaa/global/glopara/git'
       base_svn = '/work/noaa/global/glopara/svn'
-      dmpdir = '/work/noaa/global/glopara/dump'
+      dmpdir = '/work/noaa/rstprod/dump'
       nwprod = '/work/noaa/global/glopara/nwpara'
       comroot = '/work/noaa/global/glopara/com'
       homedir = '/work/noaa/global/$USER'