From fb54bb6606d0959c063aa03ff2182da637d61c3e Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <26926959+RussTreadon-NOAA@users.noreply.github.com>
Date: Wed, 25 Jan 2023 15:08:16 -0500
Subject: [PATCH] Update UFS-DA atmospheric prep script to be consistent with
 GDASApp update (#1265)

Updates the GDAS App version to incorporate the changes of https://github.com/NOAA-EMC/GDASApp/pull/278, which restores the ability of `run_jedi_exe.py` to execute UFS-DA applications, specifically `fv3jedi_var.x`. Included in https://github.com/NOAA-EMC/GDASApp/pull/278 is the removal of entry `ufsda.stage` from `ush/ufsda/__init__.py`.  Scripts which simply `import ufsda` must now specify the functions to from `ufsda.stage`.

g-w issue #1262 documents the addition of the `ufsda.stage` line to `scripts/exgdas_global_atmos_analysis_prep.py`.  This change is required for g-w to successfully stage files used by the var and ensemble UFS-DA applications.

Fixes #1262
---
 Externals.cfg                                | 2 +-
 scripts/exgdas_global_atmos_analysis_prep.py | 1 +
 sorc/checkout.sh                             | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Externals.cfg b/Externals.cfg
index 9eaf7ce577..ec5b58610a 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -50,7 +50,7 @@ protocol = git
 required = False
 
 [GDASApp]
-hash = 843d3a9
+hash = f7c23af
 local_path = sorc/gdas.cd
 repo_url = https://github.com/NOAA-EMC/GDASApp.git
 protocol = git
diff --git a/scripts/exgdas_global_atmos_analysis_prep.py b/scripts/exgdas_global_atmos_analysis_prep.py
index fc48c5d060..65c77cd903 100755
--- a/scripts/exgdas_global_atmos_analysis_prep.py
+++ b/scripts/exgdas_global_atmos_analysis_prep.py
@@ -35,6 +35,7 @@
 
 # import UFSDA utilities
 import ufsda
+from ufsda.stage import atm_obs, bias_obs
 
 # get configuration based on environment variables
 config = ufsda.misc_utils.get_env_config(component='atm')
diff --git a/sorc/checkout.sh b/sorc/checkout.sh
index 9ef987f28d..514e772c98 100755
--- a/sorc/checkout.sh
+++ b/sorc/checkout.sh
@@ -165,7 +165,7 @@ if [[ ${checkout_gsi} == "YES" ]]; then
 fi
 
 if [[ ${checkout_gdas} == "YES" ]]; then
-  checkout "gdas.cd" "https://github.com/NOAA-EMC/GDASApp.git" "843d3a9"; errs=$((errs + $?))
+  checkout "gdas.cd" "https://github.com/NOAA-EMC/GDASApp.git" "f7c23af"; errs=$((errs + $?))
 fi
 
 if [[ ${checkout_gsi} == "YES" || ${checkout_gdas} == "YES" ]]; then