From 6dc81d60979033240b105ad6e59c160b4239a163 Mon Sep 17 00:00:00 2001
From: George Gayno <George.Gayno@noaa.gov>
Date: Thu, 7 Dec 2023 15:43:40 +0000
Subject: [PATCH] Update gdas_init scripts for new directory format.

Fixes #867.
---
 util/gdas_init/run_pre-v14.chgres.sh  | 2 +-
 util/gdas_init/run_v14.chgres.sh      | 2 +-
 util/gdas_init/run_v15.chgres.gfs.sh  | 2 +-
 util/gdas_init/run_v15.chgres.sh      | 2 +-
 util/gdas_init/run_v16.chgres.sh      | 2 +-
 util/gdas_init/run_v16retro.chgres.sh | 2 +-
 util/gdas_init/set_fixed_files.sh     | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/util/gdas_init/run_pre-v14.chgres.sh b/util/gdas_init/run_pre-v14.chgres.sh
index 51290203e..9403c66d8 100755
--- a/util/gdas_init/run_pre-v14.chgres.sh
+++ b/util/gdas_init/run_pre-v14.chgres.sh
@@ -41,7 +41,7 @@ source $GDAS_INIT_DIR/set_fixed_files.sh
 cat << EOF > fort.41
 
 &config
- fix_dir_target_grid="${FIX_ORO}/${ORO_DIR}/fix_sfc"
+ fix_dir_target_grid="${FIX_ORO}/${ORO_DIR}/sfc"
  mosaic_file_target_grid="${FIX_ORO}/${ORO_DIR}/${CTAR}_mosaic.nc"
  orog_dir_target_grid="${FIX_ORO}/${ORO_DIR}"
  orog_files_target_grid="${ORO_NAME}.tile1.nc","${ORO_NAME}.tile2.nc","${ORO_NAME}.tile3.nc","${ORO_NAME}.tile4.nc","${ORO_NAME}.tile5.nc","${ORO_NAME}.tile6.nc"
diff --git a/util/gdas_init/run_v14.chgres.sh b/util/gdas_init/run_v14.chgres.sh
index c1598a7d5..590444154 100755
--- a/util/gdas_init/run_v14.chgres.sh
+++ b/util/gdas_init/run_v14.chgres.sh
@@ -37,7 +37,7 @@ source $GDAS_INIT_DIR/set_fixed_files.sh
 cat << EOF > fort.41
 
 &config
- fix_dir_target_grid="${FIX_ORO}/${ORO_DIR}/fix_sfc"
+ fix_dir_target_grid="${FIX_ORO}/${ORO_DIR}/sfc"
  mosaic_file_target_grid="${FIX_ORO}/${ORO_DIR}/${CTAR}_mosaic.nc"
  orog_dir_target_grid="${FIX_ORO}/${ORO_DIR}"
  orog_files_target_grid="${ORO_NAME}.tile1.nc","${ORO_NAME}.tile2.nc","${ORO_NAME}.tile3.nc","${ORO_NAME}.tile4.nc","${ORO_NAME}.tile5.nc","${ORO_NAME}.tile6.nc"
diff --git a/util/gdas_init/run_v15.chgres.gfs.sh b/util/gdas_init/run_v15.chgres.gfs.sh
index 7cead7181..b24920922 100755
--- a/util/gdas_init/run_v15.chgres.gfs.sh
+++ b/util/gdas_init/run_v15.chgres.gfs.sh
@@ -27,7 +27,7 @@ source $GDAS_INIT_DIR/set_fixed_files.sh
 cat << EOF > fort.41
 
 &config
- fix_dir_target_grid="${FIX_ORO}/${ORO_DIR}/fix_sfc"
+ fix_dir_target_grid="${FIX_ORO}/${ORO_DIR}/sfc"
  mosaic_file_target_grid="${FIX_ORO}/${ORO_DIR}/${CTAR}_mosaic.nc"
  orog_dir_target_grid="${FIX_ORO}/${ORO_DIR}"
  orog_files_target_grid="${ORO_NAME}.tile1.nc","${ORO_NAME}.tile2.nc","${ORO_NAME}.tile3.nc","${ORO_NAME}.tile4.nc","${ORO_NAME}.tile5.nc","${ORO_NAME}.tile6.nc"
diff --git a/util/gdas_init/run_v15.chgres.sh b/util/gdas_init/run_v15.chgres.sh
index ab2dfe530..8b9cbdd1c 100755
--- a/util/gdas_init/run_v15.chgres.sh
+++ b/util/gdas_init/run_v15.chgres.sh
@@ -43,7 +43,7 @@ source $GDAS_INIT_DIR/set_fixed_files.sh
 cat << EOF > fort.41
 
 &config
- fix_dir_target_grid="${FIX_ORO}/${ORO_DIR}/fix_sfc"
+ fix_dir_target_grid="${FIX_ORO}/${ORO_DIR}/sfc"
  mosaic_file_target_grid="${FIX_ORO}/${ORO_DIR}/${CTAR}_mosaic.nc"
  orog_dir_target_grid="${FIX_ORO}/${ORO_DIR}"
  orog_files_target_grid="${ORO_NAME}.tile1.nc","${ORO_NAME}.tile2.nc","${ORO_NAME}.tile3.nc","${ORO_NAME}.tile4.nc","${ORO_NAME}.tile5.nc","${ORO_NAME}.tile6.nc"
diff --git a/util/gdas_init/run_v16.chgres.sh b/util/gdas_init/run_v16.chgres.sh
index 5525afdcb..9b95843cb 100755
--- a/util/gdas_init/run_v16.chgres.sh
+++ b/util/gdas_init/run_v16.chgres.sh
@@ -51,7 +51,7 @@ source $GDAS_INIT_DIR/set_fixed_files.sh
 cat << EOF > fort.41
 
 &config
- fix_dir_target_grid="${FIX_ORO}/${ORO_DIR}/fix_sfc"
+ fix_dir_target_grid="${FIX_ORO}/${ORO_DIR}/sfc"
  mosaic_file_target_grid="${FIX_ORO}/${ORO_DIR}/${CTAR}_mosaic.nc"
  orog_dir_target_grid="${FIX_ORO}/${ORO_DIR}"
  orog_files_target_grid="${ORO_NAME}.tile1.nc","${ORO_NAME}.tile2.nc","${ORO_NAME}.tile3.nc","${ORO_NAME}.tile4.nc","${ORO_NAME}.tile5.nc","${ORO_NAME}.tile6.nc"
diff --git a/util/gdas_init/run_v16retro.chgres.sh b/util/gdas_init/run_v16retro.chgres.sh
index 37b75728d..2a5e59376 100755
--- a/util/gdas_init/run_v16retro.chgres.sh
+++ b/util/gdas_init/run_v16retro.chgres.sh
@@ -61,7 +61,7 @@ source $GDAS_INIT_DIR/set_fixed_files.sh
 cat << EOF > fort.41
 
 &config
- fix_dir_target_grid="${FIX_ORO}/${ORO_DIR}/fix_sfc"
+ fix_dir_target_grid="${FIX_ORO}/${ORO_DIR}/sfc"
  mosaic_file_target_grid="${FIX_ORO}/${ORO_DIR}/${CTAR}_mosaic.nc"
  orog_dir_target_grid="${FIX_ORO}/${ORO_DIR}"
  orog_files_target_grid="${ORO_NAME}.tile1.nc","${ORO_NAME}.tile2.nc","${ORO_NAME}.tile3.nc","${ORO_NAME}.tile4.nc","${ORO_NAME}.tile5.nc","${ORO_NAME}.tile6.nc"
diff --git a/util/gdas_init/set_fixed_files.sh b/util/gdas_init/set_fixed_files.sh
index c81d99816..68d9927ff 100755
--- a/util/gdas_init/set_fixed_files.sh
+++ b/util/gdas_init/set_fixed_files.sh
@@ -15,8 +15,8 @@ if [ "${FRAC_ORO:-"no"}" = "yes" ]; then
   elif [ ${CTAR} == 'C384' ] || [ ${CTAR} == 'C768' ] || [ ${CTAR} == 'C1152' ]; then
     OCNRES='025'
   fi
-  ORO_DIR="${CTAR}.mx${OCNRES}_frac"
-  ORO_NAME="oro_${CTAR}.mx${OCNRES}"
+  ORO_DIR="${CTAR}"
+  ORO_NAME="${CTAR}.mx${OCNRES}_oro_data"
 else
   ORO_DIR="${CTAR}"
   ORO_NAME="${CTAR}_oro_data"