gdas_init utility bug fix (#912)

Point to the correct orography directory when using v15/GDAS and v16 retro/GDAS 
input data to the chgres step. 

Fixes #908.

util/gdas_init/driver.hera.sh

@@ -21,6 +21,8 @@ module load prod_util/1.1.0
 PROJECT_CODE=fv3-cpu
 QUEUE=batch
 
+export machine=hera
+
 source config
 
 if [ $EXTRACT_DATA == yes ]; then

util/gdas_init/driver.jet.sh

@@ -20,8 +20,10 @@ PROJECT_CODE=hfv3gfs
 QUEUE=batch
 PARTITION=xjet
 
+export machine=jet
+
 # Needed for NDATE utility
-module load prod_util/1.2.2
+module load prod_util/2.1.1
 
 source config
 

util/gdas_init/driver.s4.sh

@@ -15,13 +15,15 @@ module load build.$target.$compiler
 module list
 
 # Needed for NDATE utility
-module load prod_util/1.2.2
+module load prod_util/2.1.1
 
 PROJECT_CODE=star
 QUEUE=s4
 
 source config
 
+export machine=s4
+
 if [ $EXTRACT_DATA == yes ]; then
 
   echo "HPSS is not accessible from S4!  If you wish to run just the chgres portion, set EXTRACT_DATA=NO in the config file and try again."

util/gdas_init/driver.wcoss2.sh

@@ -21,6 +21,8 @@ PROJECT_CODE=GFS-DEV
 
 source config
 
+export machine=wcoss2
+
 this_dir=$PWD
 
 if [ $EXTRACT_DATA == yes ]; then

util/gdas_init/run_v15.chgres.sh

@@ -47,8 +47,8 @@ cat << EOF > fort.41
  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"
- mosaic_file_input_grid="${FIX_ORO}/${CINP}/${CINP}_mosaic.nc"
- orog_dir_input_grid="${FIX_ORO}/${CINP}"
+ mosaic_file_input_grid="${FIX_ORO_INPUT}/${CINP}/${CINP}_mosaic.nc"
+ orog_dir_input_grid="${FIX_ORO_INPUT}/${CINP}"
  orog_files_input_grid="${CINP}_oro_data.tile1.nc","${CINP}_oro_data.tile2.nc","${CINP}_oro_data.tile3.nc","${CINP}_oro_data.tile4.nc","${CINP}_oro_data.tile5.nc","${CINP}_oro_data.tile6.nc"
  data_dir_input_grid="${INPUT_DATA_DIR}"
  atm_core_files_input_grid="${YMDH}.fv_core.res.tile1.nc","${YMDH}.fv_core.res.tile2.nc","${YMDH}.fv_core.res.tile3.nc","${YMDH}.fv_core.res.tile4.nc","${YMDH}.fv_core.res.tile5.nc","${YMDH}.fv_core.res.tile6.nc","${YMDH}.fv_core.res.nc"

util/gdas_init/run_v16retro.chgres.sh

@@ -65,8 +65,8 @@ cat << EOF > fort.41
  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"
- mosaic_file_input_grid="${FIX_ORO}/${CINP}/${CINP}_mosaic.nc"
- orog_dir_input_grid="${FIX_ORO}/${CINP}"
+ mosaic_file_input_grid="${FIX_ORO_INPUT}/${CINP}/${CINP}_mosaic.nc"
+ orog_dir_input_grid="${FIX_ORO_INPUT}/${CINP}"
  orog_files_input_grid="${CINP}_oro_data.tile1.nc","${CINP}_oro_data.tile2.nc","${CINP}_oro_data.tile3.nc","${CINP}_oro_data.tile4.nc","${CINP}_oro_data.tile5.nc","${CINP}_oro_data.tile6.nc"
  data_dir_input_grid="${INPUT_DATA_DIR}"
  atm_core_files_input_grid="${YMDH}.fv_core.res.tile1.nc","${YMDH}.fv_core.res.tile2.nc","${YMDH}.fv_core.res.tile3.nc","${YMDH}.fv_core.res.tile4.nc","${YMDH}.fv_core.res.tile5.nc","${YMDH}.fv_core.res.tile6.nc","${YMDH}.fv_core.res.nc"

util/gdas_init/set_fixed_files.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #---------------------------------------------------------------------------
-# Set directory names and file names for orog data.
+# Set directory names and file names for the target grid orog data.
 #---------------------------------------------------------------------------
 
 if [ ${CTAR} == 'C48' ] ; then
@@ -22,3 +22,24 @@ fi
 
 ORO_DIR="${CTAR}"
 ORO_NAME="${CTAR}.mx${OCNRES}_oro_data"
+
+#---------------------------------------------------------------------------
+# When using the v15/v16 tiled warm restart data as input to the chgres
+# step, the input grid orography is needed (there is no orography record
+# in the restart files). Since the restart data was created before the
+# latest orog version (20231027), need to use a previous version.
+#---------------------------------------------------------------------------
+
+if [ "$machine" = 'hera' ] ; then
+  FIX_ORO_INPUT=/scratch1/NCEPDEV/global/glopara/fix/orog/20230615
+elif [ "$machine" = 'wcoss2' ] ; then
+  FIX_ORO_INPUT=/lfs/h2/emc/global/noscrub/emc.global/FIX/fix/orog/20230615
+elif [ "$machine" = 'jet' ] ; then
+  FIX_ORO_INPUT=/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix/orog/20230615
+elif [ "$machine" = 's4' ] ; then
+  FIX_ORO_INPUT=/data/prod/glopara/fix/orog/20230615
+else
+  set +x
+  echo ERROR machine $machine not supported.
+  exit 3
+fi