Remove unused variables OROFIX and FIX_SFC.

Fixes ufs-community#897.
GeorgeGayno-NOAA · Feb 21, 2024 · 97b765e · 97b765e
1 parent 0a5e76a
commit 97b765e
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 74 deletions.
diff --git a/reg_tests/global_cycle/C192.lndincsoilnoahmp.sh b/reg_tests/global_cycle/C192.lndincsoilnoahmp.sh
@@ -15,9 +15,10 @@ NCCMP=${NCCMP:-$(which nccmp)}
 export MAX_TASKS_CY=6
 
 export HOMEgfs=$NWPROD
-export BASE_GSM=$NWPROD
 
-export CYCLEXEC=$BASE_GSM/exec/global_cycle
+export FIXgfs=$HOMEreg/fix
+
+export CYCLEXEC=$HOMEgfs/exec/global_cycle
 
 export CDATE=2019073000
 export FHOUR=00
@@ -34,9 +35,6 @@ export JCAP=1534
 export LONB=3072
 export LATB=1536
 
-export OROFIX=$HOMEreg/fix/$CASE
-export FIXgsm=$BASE_GSM/fix/am
-
 export DONST="NO"
 export use_ufo=.true.
 
@@ -46,7 +44,7 @@ export DO_LNDINC=".TRUE."
 export VERBOSE=YES
 export CYCLVARS=FSNOL=-2.,FSNOS=99999.,
 
-$BASE_GSM/ush/global_cycle_driver.sh
+$HOMEgfs/ush/global_cycle_driver.sh
 
 iret=$?
 if [ $iret -ne 0 ]; then
@@ -77,7 +75,7 @@ if [ $test_failed -ne 0 ]; then
   echo "<<< C192 LANDINC SOIL-NOAHMP CYCLE TEST FAILED. >>>"
   echo "**********************************************"
   if [ "$UPDATE_BASELINE" = "TRUE" ]; then
-    $BASE_GSM/reg_tests/update_baseline.sh $HOMEreg "c192.lndincsoilnoahmp" $commit_num
+    $HOMEgfs/reg_tests/update_baseline.sh $HOMEreg "c192.lndincsoilnoahmp" $commit_num
   fi
 else
   echo

diff --git a/reg_tests/global_cycle/C48.noahmp.fracgrid.sh b/reg_tests/global_cycle/C48.noahmp.fracgrid.sh
@@ -15,9 +15,8 @@ NCCMP=${NCCMP:-$(which nccmp)}
 export MAX_TASKS_CY=6
 
 export HOMEgfs=$NWPROD
-export BASE_GSM=$NWPROD
 
-export CYCLEXEC=$BASE_GSM/exec/global_cycle
+export CYCLEXEC=$HOMEgfs/exec/global_cycle
 
 export CDATE=2021032406
 export FHOUR=00
@@ -36,11 +35,7 @@ export JCAP=1534
 export LONB=3072
 export LATB=1536
 
-export OROFIX=$HOMEreg/fix/$CASE
-
-export FIXgsm=$BASE_GSM/fix/am
-
-export FNAISC=$FIXgsm/IMS-NIC.blended.ice.monthly.clim.grb
+export FNAISC=$HOMEgfs/fix/am/IMS-NIC.blended.ice.monthly.clim.grb
 
 export DONST="YES"
 export use_ufo=.true.
@@ -49,7 +44,7 @@ export FRAC_GRID=.true.
 export VERBOSE=YES
 export CYCLVARS=FSNOL=99999.,FSNOS=99999.,
 
-$BASE_GSM/ush/global_cycle_driver.sh
+$HOMEgfs/ush/global_cycle_driver.sh
 
 iret=$?
 if [ $iret -ne 0 ]; then
@@ -80,7 +75,7 @@ if [ $test_failed -ne 0 ]; then
   echo "<<< C48 NOAHMP FRAC GRID TEST FAILED. >>>"
   echo "******************************************"
   if [ "$UPDATE_BASELINE" = "TRUE" ]; then
-    $BASE_GSM/reg_tests/update_baseline.sh $HOMEreg "c48.noahmp.fracgrid" $commit_num
+    $HOMEgfs/reg_tests/update_baseline.sh $HOMEreg "c48.noahmp.fracgrid" $commit_num
   fi
 else
   echo

diff --git a/reg_tests/global_cycle/C768.fv3gfs.sh b/reg_tests/global_cycle/C768.fv3gfs.sh
@@ -12,9 +12,10 @@ NCCMP=${NCCMP:-$(which nccmp)}
 export MAX_TASKS_CY=6
 
 export HOMEgfs=$NWPROD
-export BASE_GSM=$NWPROD
 
-export CYCLEXEC=$BASE_GSM/exec/global_cycle
+export CYCLEXEC=$HOMEgfs/exec/global_cycle
+
+export FIXgfs=$HOMEreg/fix
 
 export CDATE=2019073000
 export FHOUR=00
@@ -33,30 +34,33 @@ export JCAP=1534
 export LONB=3072
 export LATB=1536
 
-export OROFIX=$HOMEreg/fix/$CASE
-
-export FIXgsm=$BASE_GSM/fix/am
-
-export FNALBC2=$FIXgsm/global_albedo4.1x1.grb
-export FNALBC=$FIXgsm/global_snowfree_albedo.bosu.t1534.3072.1536.rg.grb
-export FNALBC=$FIXgsm/global_snowfree_albedo.bosu.t1534.3072.1536.rg.grb
-export FNTG3C=$FIXgsm/global_tg3clim.2.6x1.5.grb
-export FNVETC=$FIXgsm/global_vegtype.igbp.t1534.3072.1536.rg.grb
-export FNSOTC=$FIXgsm/global_soiltype.statsgo.t1534.3072.1536.rg.grb
-export FNVEGC=$FIXgsm/global_vegfrac.0.144.decpercent.grb
-export FNVMNC=$FIXgsm/global_shdmin.0.144x0.144.grb
-export FNVMXC=$FIXgsm/global_shdmax.0.144x0.144.grb
-export FNSLPC=$FIXgsm/global_slope.1x1.grb
-export FNABSC=$FIXgsm/global_mxsnoalb.uariz.t1534.3072.1536.rg.grb
-export FNAISC=$FIXgsm/CFSR.SEAICE.1982.2012.monthly.clim.grb
+export FNALBC2=$HOMEgfs/fix/am/global_albedo4.1x1.grb
+export FNALBC=$HOMEgfs/fix/am/global_snowfree_albedo.bosu.t1534.3072.1536.rg.grb
+export FNALBC=$HOMEgfs/fix/am/global_snowfree_albedo.bosu.t1534.3072.1536.rg.grb
+export FNTG3C=$HOMEgfs/fix/am/global_tg3clim.2.6x1.5.grb
+export FNVETC=$HOMEgfs/fix/am/global_vegtype.igbp.t1534.3072.1536.rg.grb
+export FNSOTC=$HOMEgfs/fix/am/global_soiltype.statsgo.t1534.3072.1536.rg.grb
+export FNVEGC=$HOMEgfs/fix/am/global_vegfrac.0.144.decpercent.grb
+export FNVMNC=$HOMEgfs/fix/am/global_shdmin.0.144x0.144.grb
+export FNVMXC=$HOMEgfs/fix/am/global_shdmax.0.144x0.144.grb
+export FNSLPC=$HOMEgfs/fix/am/global_slope.1x1.grb
+export FNABSC=$HOMEgfs/fix/am/global_mxsnoalb.uariz.t1534.3072.1536.rg.grb
+export FNAISC=$HOMEgfs/fix/am/CFSR.SEAICE.1982.2012.monthly.clim.grb
+export FNMSKH=$HOMEgfs/fix/am/global_slmask.t1534.3072.1536.grb
+export FNGLAC=$HOMEgfs/fix/am/global_glacier.2x2.grb
+export FNMXIC=$HOMEgfs/fix/am/global_maxice.2x2.grb
+export FNTSFC=$HOMEgfs/fix/am/RTGSST.1982.2012.monthly.clim.grb
+export FNSALC=$HOMEgfs/fix/am/global_salclm.t1534.3072.1536.nc
+export FNSNOC=$HOMEgfs/fix/am/global_snoclim.1.875.grb
+export FNSMCC=$HOMEgfs/fix/am/global_soilmgldas.statsgo.t1534.3072.1536.grb
 
 export DONST="YES"
 export use_ufo=.true.
 
 export VERBOSE=YES
 export CYCLVARS=FSNOL=-2.,FSNOS=99999.,
 
-$BASE_GSM/ush/global_cycle_driver.sh
+$HOMEgfs/ush/global_cycle_driver.sh
 
 iret=$?
 if [ $iret -ne 0 ]; then
@@ -87,7 +91,7 @@ if [ $test_failed -ne 0 ]; then
   echo "<<< C768 GLOBAL CYCLE TEST FAILED. >>>"
   echo "*********************************"
   if [ "$UPDATE_BASELINE" = "TRUE" ]; then
-    $BASE_GSM/reg_tests/update_baseline.sh $HOMEreg "c768.fv3gfs" $commit_num
+    $HOMEgfs/reg_tests/update_baseline.sh $HOMEreg "c768.fv3gfs" $commit_num
   fi
 else
   echo

diff --git a/reg_tests/global_cycle/C768.lndincsnow.sh b/reg_tests/global_cycle/C768.lndincsnow.sh
@@ -13,9 +13,10 @@ NCCMP=${NCCMP:-$(which nccmp)}
 export MAX_TASKS_CY=6
 
 export HOMEgfs=$NWPROD
-export BASE_GSM=$NWPROD
 
-export CYCLEXEC=$BASE_GSM/exec/global_cycle
+export FIXgfs=$HOMEreg/fix
+
+export CYCLEXEC=$HOMEgfs/exec/global_cycle
 
 export CDATE=2019073000
 export FHOUR=00
@@ -35,9 +36,6 @@ export JCAP=1534
 export LONB=3072
 export LATB=1536
 
-export OROFIX=$HOMEreg/fix/$CASE
-export FIXgsm=$BASE_GSM/fix/am
-
 export DONST="NO"
 export use_ufo=.true.
 
@@ -47,7 +45,7 @@ export DO_LNDINC=".TRUE."
 export VERBOSE=YES
 export CYCLVARS=FSNOL=99999.,FSNOS=99999.,
 
-$BASE_GSM/ush/global_cycle_driver.sh
+$HOMEgfs/ush/global_cycle_driver.sh
 
 iret=$?
 if [ $iret -ne 0 ]; then
@@ -78,7 +76,7 @@ if [ $test_failed -ne 0 ]; then
   echo "<<< C768 LANDINC SNOW CYCLE TEST FAILED. >>>"
   echo "****************************************"
   if [ "$UPDATE_BASELINE" = "TRUE" ]; then
-    $BASE_GSM/reg_tests/update_baseline.sh $HOMEreg "c768.lndincsnow" $commit_num
+    $HOMEgfs/reg_tests/update_baseline.sh $HOMEreg "c768.lndincsnow" $commit_num
   fi
 else
   echo

diff --git a/ush/global_cycle.sh b/ush/global_cycle.sh
@@ -30,10 +30,6 @@
 #                   nwprod/gfs.v15.0.0.
 #     envir         Environment - i.e., 'prod' or 'para'. Default is 'prod'.
 #     FIXgfs        Directory for fixed data. Default is $HOMEgfs/fix.
-#     OROFIX        Directory for model orography data. Default is 
-#                   $FIXgfs/orog/${CASE}
-#     FIX_SFC       Directory for model surface climatological data.
-#                   Default is $OROFIX/sfc.
 #     EXECgfs       Directory of the program executable.  Defaults to
 #                   $HOMEgfs/exec
 #     DATA          Working directory
@@ -67,29 +63,29 @@
 #                   FNVETC must be set to igbp file:
 #                   ${FIXam}/global_vegtype.igbp.t$JCAP_CASE.$LONB_CASE.$LATB_CASE.rg.grb
 #     FNALBC        Input 4-component albedo climatology GRIB file.
-#                   defaults to ${FIX_SFC}/${CASE}.mx${OCNRES}.snowfree_albedo.tileX.nc
+#                   defaults to ${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.snowfree_albedo.tileX.nc
 #     FNALBC2       Input 'facsf' and 'facwf' albedo climatology GRIB file.
-#                   Defaults to ${FIX_SFC}/${CASE}.mx${OCNRES}.facsf.tileX.nc
+#                   Defaults to ${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.facsf.tileX.nc
 #     FNAISC        Input sea ice climatology GRIB file.
 #                   Defaults to ${FIXgfs}/am/IMS-NIC.blended.ice.monthly.clim.grb
 #     FNTG3C        Input deep soil temperature climatology GRIB file.
-#                   Defaults to ${FIX_SFC}/${CASE}.mx${OCNRES}.substrate_temperature.tileX.nc
+#                   Defaults to ${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.substrate_temperature.tileX.nc
 #     FNVEGC        Input vegetation fraction climatology GRIB file.
-#                   Defaults to ${FIX_SFC}/${CASE}.mx${OCNRES}.vegetation_greenness.tileX.nc
+#                   Defaults to ${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.vegetation_greenness.tileX.nc
 #     FNVETC        Input vegetation type climatology GRIB file.
-#                   Defaults to ${FIX_SFC}/${CASE}.mx${OCNRES}.vegetation_type.tileX.nc
+#                   Defaults to ${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.vegetation_type.tileX.nc
 #     FNSOTC        Input soil type climatology GRIB file.
-#                   Defaults to ${FIX_SFC}/${CASE}.mx${OCNRES}.soil_type.tileX.nc
+#                   Defaults to ${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.soil_type.tileX.nc
 #     FNSMCC        Input soil moisture climatology GRIB file.
 #                   Defaults to ${FIXgfs}/am/global_soilmgldas.statsgo.t$JCAP_CASE.$LONB_CASE.$LATB_CASE.grb
 #     FNVMNC        Input min veg frac climatology GRIB file.
-#                   Defaults to ${FIX_SFC}/${CASE}.mx${OCNRES}.vegetation_greenness.tileX.nc
+#                   Defaults to ${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.vegetation_greenness.tileX.nc
 #     FNVMXC        Input max veg frac climatology GRIB file.
-#                   Defaults to ${FIX_SFC}/${CASE}.mx${OCNRES}.vegetation_greenness.tileX.nc
+#                   Defaults to ${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.vegetation_greenness.tileX.nc
 #     FNSLPC        Input slope type climatology GRIB file.
-#                   Defaults to ${FIX_SFC}/${CASE}.mx${OCNRES}.slope_type.tileX.nc
+#                   Defaults to ${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.slope_type.tileX.nc
 #     FNABSC        Input max snow albedo climatology GRIB file.
-#                   Defaults to ${FIX_SFC}/${CASE}.mx${OCNRES}.maximum_snow_albedo.tileX.nc
+#                   Defaults to ${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.maximum_snow_albedo.tileX.nc
 #     FNMSKH        Input high resolution land mask GRIB file.  Use to set mask for
 #                   some of the input climatology fields.  This is NOT the model mask.
 #                   Defaults to ${FIXgfs}/am/global_slmask.t1534.3072.1536.grb
@@ -235,8 +231,6 @@ envir=${envir:-prod}
 HOMEgfs=${HOMEgfs:-/nw${envir}/gfs_ver.${gfs_ver}}
 EXECgfs=${EXECgfs:-$HOMEgfs/exec}
 FIXgfs=${FIXgfs:-$HOMEgfs/fix}
-OROFIX=${OROFIX:-$FIXgfs/orog/${CASE}}
-FIX_SFC=${FIX_SFC:-$OROFIX/sfc}
 DATA=${DATA:-$(pwd)}
 COMIN=${COMIN:-$(pwd)}
 COMOUT=${COMOUT:-$(pwd)}
@@ -283,16 +277,16 @@ FNSNOC=${FNSNOC:-${FIXgfs}/am/global_snoclim.1.875.grb}
 FNZORC=${FNZORC:-igbp}
 FNAISC=${FNAISC:-${FIXgfs}/am/IMS-NIC.blended.ice.monthly.clim.grb}
 FNSMCC=${FNSMCC:-${FIXgfs}/am/global_soilmgldas.statsgo.t$JCAP_CASE.$LONB_CASE.$LATB_CASE.grb}
-FNALBC2=${FNALBC2:-${FIX_SFC}/${CASE}.mx${OCNRES}.facsf.tileX.nc}
-FNTG3C=${FNTG3C:-${FIX_SFC}/${CASE}.mx${OCNRES}.substrate_temperature.tileX.nc}
-FNVEGC=${FNVEGC:-${FIX_SFC}/${CASE}.mx${OCNRES}.vegetation_greenness.tileX.nc}
-FNALBC=${FNALBC:-${FIX_SFC}/${CASE}.mx${OCNRES}.snowfree_albedo.tileX.nc}
-FNVETC=${FNVETC:-${FIX_SFC}/${CASE}.mx${OCNRES}.vegetation_type.tileX.nc}
-FNSOTC=${FNSOTC:-${FIX_SFC}/${CASE}.mx${OCNRES}.soil_type.tileX.nc}
-FNABSC=${FNABSC:-${FIX_SFC}/${CASE}.mx${OCNRES}.maximum_snow_albedo.tileX.nc}
-FNVMNC=${FNVMNC:-${FIX_SFC}/${CASE}.mx${OCNRES}.vegetation_greenness.tileX.nc}
-FNVMXC=${FNVMXC:-${FIX_SFC}/${CASE}.mx${OCNRES}.vegetation_greenness.tileX.nc}
-FNSLPC=${FNSLPC:-${FIX_SFC}/${CASE}.mx${OCNRES}.slope_type.tileX.nc}
+FNALBC2=${FNALBC2:-${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.facsf.tileX.nc}
+FNTG3C=${FNTG3C:-${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.substrate_temperature.tileX.nc}
+FNVEGC=${FNVEGC:-${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.vegetation_greenness.tileX.nc}
+FNALBC=${FNALBC:-${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.snowfree_albedo.tileX.nc}
+FNVETC=${FNVETC:-${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.vegetation_type.tileX.nc}
+FNSOTC=${FNSOTC:-${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.soil_type.tileX.nc}
+FNABSC=${FNABSC:-${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.maximum_snow_albedo.tileX.nc}
+FNVMNC=${FNVMNC:-${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.vegetation_greenness.tileX.nc}
+FNVMXC=${FNVMXC:-${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.vegetation_greenness.tileX.nc}
+FNSLPC=${FNSLPC:-${FIXgfs}/orog/${CASE}/sfc/${CASE}.mx${OCNRES}.slope_type.tileX.nc}
 FNMSKH=${FNMSKH:-${FIXgfs}/am/global_slmask.t1534.3072.1536.grb}
 NST_FILE=${NST_FILE:-"NULL"}
 LND_SOI_FILE=${LND_SOI_FILE:-"NULL"}

diff --git a/ush/global_cycle_driver.sh b/ush/global_cycle_driver.sh
@@ -20,8 +20,6 @@ export envir=${envir:-prod}
 export gfs_ver=${gfs_ver:-v15.0.0}
 export HOMEgfs=${HOMEgfs:-/nw${envir}/gfs.${gfs_ver}}
 export FIXgfs=${FIXgfs:-$HOMEgfs/fix}   
-export OROFIX=${OROFIX:-$FIXgfs/orog/${CASE}}
-export FIX_SFC=${FIX_SFC:-$OROFIX/sfc}
 
 ntiles=${ntiles:-6}
 DONST=${DONST:-"NO"}
@@ -88,11 +86,11 @@ for n in $(seq 1 $ntiles); do
   chmod 644  $COMOUT/$PDY.${cyc}0000.sfcanl_data.tile${n}.nc
   ln -fs $COMOUT/$PDY.${cyc}0000.sfcanl_data.tile${n}.nc  $DATA/fnbgso.00$n
 
-  ln -fs $OROFIX/C${CRES}_grid.tile${n}.nc       $DATA/fngrid.00$n
+  ln -fs $FIXgfs/orog/${CASE}/C${CRES}_grid.tile${n}.nc       $DATA/fngrid.00$n
   if (( OCNRES > 9999 ));then
-    ln -fs $OROFIX/C${CRES}_oro_data.tile${n}.nc   $DATA/fnorog.00$n
+    ln -fs $FIXgfs/orog/${CASE}/C${CRES}_oro_data.tile${n}.nc   $DATA/fnorog.00$n
   else
-    ln -fs $OROFIX/C${CRES}.mx${OCNRES}_oro_data.tile${n}.nc   $DATA/fnorog.00$n
+    ln -fs $FIXgfs/orog/${CASE}/C${CRES}.mx${OCNRES}_oro_data.tile${n}.nc   $DATA/fnorog.00$n
   fi
 
   if [[ "$DO_SNO_INC" == ".true." ]] ; then