From 66feea1a54bfa42be959c2987c5a9e6e358c459d Mon Sep 17 00:00:00 2001
From: George Gayno <George.Gayno@noaa.gov>
Date: Thu, 14 Dec 2023 18:33:06 +0000
Subject: [PATCH] Update ./ush/chgres_cube.sh to use the 'orog' files for the
 coupled or uncoupled model.

Fixes #867.
---
 ush/chgres_cube.sh | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/ush/chgres_cube.sh b/ush/chgres_cube.sh
index bc871dd1e..9b7dff415 100755
--- a/ush/chgres_cube.sh
+++ b/ush/chgres_cube.sh
@@ -16,6 +16,13 @@ set -eux
 
 CRES=${CRES:-96}
 
+#----------------------------------------------------------------------------
+# Resolution of ocean grid. When declared, use the orography files
+# for coupled model runs. Example: 025, 050, 100.
+#----------------------------------------------------------------------------
+
+ocn=${ocn:-""}
+
 #----------------------------------------------------------------------------
 # Set up environment paths.
 #
@@ -175,9 +182,15 @@ MOSAIC_FILE_TARGET_GRID=${MOSAIC_FILE_TARGET_GRID:-${FIXfv3}/C${CRES}_mosaic.nc}
 
 OROG_FILES_TARGET_GRID=${OROG_FILES_TARGET_GRID:-NULL}
 if [ $OROG_FILES_TARGET_GRID == NULL ]; then
-  OROG_FILES_TARGET_GRID='C'${CRES}'_oro_data.tile1.nc","C'${CRES}'_oro_data.tile2.nc"'
-  OROG_FILES_TARGET_GRID=${OROG_FILES_TARGET_GRID}',"C'${CRES}'_oro_data.tile3.nc","C'${CRES}'_oro_data.tile4.nc"'
-  OROG_FILES_TARGET_GRID=${OROG_FILES_TARGET_GRID}',"C'${CRES}'_oro_data.tile5.nc","C'${CRES}'_oro_data.tile6.nc'
+  if [ -z "${ocn}" ];then
+    OROG_FILES_TARGET_GRID='C'${CRES}'_oro_data.tile1.nc","C'${CRES}'_oro_data.tile2.nc"'
+    OROG_FILES_TARGET_GRID=${OROG_FILES_TARGET_GRID}',"C'${CRES}'_oro_data.tile3.nc","C'${CRES}'_oro_data.tile4.nc"'
+    OROG_FILES_TARGET_GRID=${OROG_FILES_TARGET_GRID}',"C'${CRES}'_oro_data.tile5.nc","C'${CRES}'_oro_data.tile6.nc'
+  else
+    OROG_FILES_TARGET_GRID='C'${CRES}.mx${ocn}'_oro_data.tile1.nc","C'${CRES}.mx${ocn}'_oro_data.tile2.nc"'
+    OROG_FILES_TARGET_GRID=${OROG_FILES_TARGET_GRID}',"C'${CRES}.mx${ocn}'_oro_data.tile3.nc","C'${CRES}.mx${ocn}'_oro_data.tile4.nc"'
+    OROG_FILES_TARGET_GRID=${OROG_FILES_TARGET_GRID}',"C'${CRES}.mx${ocn}'_oro_data.tile5.nc","C'${CRES}.mx${ocn}'_oro_data.tile6.nc'
+  fi
 fi
 
 THOMPSON_AEROSOL_FILE=${THOMPSON_AEROSOL_FILE:-NULL}