Merge branch 'develop' of https://github.com/NOAA-EMC/UFS_UTILS into …

…feature/chgres_rrfs_RLL
LarissaReames-NOAA · Feb 23, 2024 · 8ba94b8 · 8ba94b8
2 parents 8df41cc + 47956a9
commit 8ba94b8
Show file tree

Hide file tree

Showing 11 changed files with 116 additions and 138 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.11.0
+1.12.0
diff --git a/docs/main.md b/docs/main.md
@@ -9,6 +9,7 @@ https://github.com/ufs-community/UFS_UTILS.
 
 ## Documentation for Previous Versions of UFS_UTILS
 
+* [UFS_UTILS Version 1.12.0](ver-1.12.0/index.html)
 * [UFS_UTILS Version 1.11.0](ver-1.11.0/index.html)
 * [UFS_UTILS Version 1.10.0](ver-1.10.0/index.html)
 * [UFS_UTILS Version 1.9.0](ver-1.9.0/index.html)

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/scripts/exemcsfc_global_sfc_prep.sh b/scripts/exemcsfc_global_sfc_prep.sh
@@ -63,16 +63,12 @@ then
  set -x
 fi
 
-# path names
-export envir=${envir:-"prod"}
-export NWROOT=${NWROOT:-"/nw${envir}"}
-
 RUN=${RUN:-"gfs"}
 
-export HOMEgfs=${HOMEgfs:-$NWROOT/gfs.${gfs_ver:?}}
+export PACKAGEROOT=${PACKAGEROOT:-/lfs/h1/ops/prod/packages}
+export HOMEgfs=${HOMEgfs:-${PACKAGEROOT}/gfs.${gfs_ver:?}}
 export USHgfs=${USHgfs:-$HOMEgfs/ush}
 export FIXgfs=${FIXgfs:-$HOMEgfs/fix}
-FIXgfs_am=${FIXgfs_am:-$HOMEgfs/fix/am}
 export EXECgfs=${EXECgfs:-$HOMEgfs/exec}
 
 # output com directory.
@@ -116,7 +112,7 @@ export IMS_FILE=${IMS_FILE:-"ims.grib2"}
 export FIVE_MIN_ICE_FILE=${FIVE_MIN_ICE_FILE:-"seaice.5min.grib2"}
 
 # landmask file for global 5-minute data (grib 2)
-export FIVE_MIN_ICE_MASK_FILE=${FIVE_MIN_ICE_MASK_FILE:-${FIXgfs_am}/emcsfc_gland5min.grib2}
+export FIVE_MIN_ICE_MASK_FILE=${FIVE_MIN_ICE_MASK_FILE:-${FIXgfs}/am/emcsfc_gland5min.grib2}
 
 # the output ice blend data (grib)
 export BLENDED_ICE_FILE=${BLENDED_ICE_FILE:-seaice.5min.blend}
@@ -182,10 +178,10 @@ LATB=${LATB:-"1536"}
 
 resolution="${JCAP}.${LONB}.${LATB}"
 
-export MODEL_SLMASK_FILE=${SLMASK:-$FIXgfs_am/global_slmask.t${resolution}.grb}
-export MODEL_LATITUDE_FILE=${MDL_LATS:-$FIXgfs_am/global_latitudes.t${resolution}.grb}
-export MODEL_LONGITUDE_FILE=${MDL_LONS:-$FIXgfs_am/global_longitudes.t${resolution}.grb}
-export GFS_LONSPERLAT_FILE=${LONSPERLAT:-$FIXgfs_am/global_lonsperlat.t${resolution}.txt}
+export MODEL_SLMASK_FILE=${SLMASK:-${FIXgfs}/am/global_slmask.t${resolution}.grb}
+export MODEL_LATITUDE_FILE=${MDL_LATS:-${FIXgfs}/am/global_latitudes.t${resolution}.grb}
+export MODEL_LONGITUDE_FILE=${MDL_LONS:-${FIXgfs}/am/global_longitudes.t${resolution}.grb}
+export GFS_LONSPERLAT_FILE=${LONSPERLAT:-${FIXgfs}/am/global_lonsperlat.t${resolution}.txt}
 export MODEL_SNOW_FILE=${FNSNOAJCAP:-${RUN}.${cycle}.snogrb_t${resolution}}
 export MODEL_SNOW_FILE_m6hrs=${FNSNOGJCAP:-${COMINgfs_m6hrs}/${RUN}.${cycle_m6hrs}.snogrb_t${resolution}}
 
@@ -240,10 +236,10 @@ LATB_ENKF=${LATB_ENKF:-"576"}
 
 resolution="${JCAP_ENKF}.${LONB_ENKF}.${LATB_ENKF}"
 
-export MODEL_SLMASK_FILE=${SLMASK_ENKF:-$FIXgfs_am/global_slmask.t${resolution}.grb}
-export MODEL_LATITUDE_FILE=${MDL_LATS_ENKF:-$FIXgfs_am/global_latitudes.t${resolution}.grb}
-export MODEL_LONGITUDE_FILE=${MDL_LONS_ENKF:-$FIXgfs_am/global_longitudes.t${resolution}.grb}
-export GFS_LONSPERLAT_FILE=${LONSPERLAT_ENKF:-$FIXgfs_am/global_lonsperlat.t${resolution}.txt}
+export MODEL_SLMASK_FILE=${SLMASK_ENKF:-${FIXgfs}/am/global_slmask.t${resolution}.grb}
+export MODEL_LATITUDE_FILE=${MDL_LATS_ENKF:-${FIXgfs}/am/global_latitudes.t${resolution}.grb}
+export MODEL_LONGITUDE_FILE=${MDL_LONS_ENKF:-${FIXgfs}/am/global_longitudes.t${resolution}.grb}
+export GFS_LONSPERLAT_FILE=${LONSPERLAT_ENKF:-${FIXgfs}/am/global_lonsperlat.t${resolution}.txt}
 export MODEL_SNOW_FILE=${FNSNOAJCAP_ENKF:-${RUN}.${cycle}.snogrb_t${resolution}}
 export MODEL_SNOW_FILE_m6hrs=${FNSNOGJCAP_ENKF:-${COMINgfs_m6hrs}/${RUN}.${cycle_m6hrs}.snogrb_t${resolution}}
 

diff --git a/ush/emcsfc_ice_blend.sh b/ush/emcsfc_ice_blend.sh
@@ -78,20 +78,18 @@ cd $DATA
 # copy output ice blend data to com?
 SENDCOM=${SENDCOM:-"NO"}
 
-envir=${envir:-"prod"}
-NWROOT=${NWROOT:-"/nw${envir}"}
-
-HOMEgfs=${HOMEgfs:-${NWPROD:-$NWROOT/gfs.${gfs_ver:?}}}
-FIXam=${FIXam:-$HOMEgfs/fix/am}
+PACKAGEROOT=${PACKAGEROOT:-/lfs/h1/ops/prod/packages}
+HOMEgfs=${HOMEgfs:-$PACKAGEROOT/gfs.${gfs_ver:?}}
 EXECgfs=${EXECgfs:-$HOMEgfs/exec}
-
+FIXgfs=${FIXgfs:-$HOMEgfs/fix}
+
 # output com directory.
 COMOUT=${COMOUT:-$PWD}
 
 # the input data. ims may be grib1 or grib2. five_min files are grib 2.
 IMS_FILE=${IMS_FILE:-"ims.grib2"} 
 FIVE_MIN_ICE_FILE=${FIVE_MIN_ICE_FILE:-"seaice.5min.grib2"} 
-FIVE_MIN_ICE_MASK_FILE=${FIVE_MIN_ICE_MASK_FILE:-${FIXam}/emcsfc_gland5min.grib2}
+FIVE_MIN_ICE_MASK_FILE=${FIVE_MIN_ICE_MASK_FILE:-${FIXgfs}/am/emcsfc_gland5min.grib2}
 
 # the output ice blend data (grib)
 BLENDED_ICE_FILE=${BLENDED_ICE_FILE:-seaice.5min.blend}

diff --git a/ush/emcsfc_snow.sh b/ush/emcsfc_snow.sh
@@ -73,11 +73,10 @@ fi
 # Path names
 #------------------------------------------------------------------------
 
-envir=${envir:-"prod"}
-NWROOT=${NWROOT:-"/nw${envir}"}
-HOMEgfs=${HOMEgfs:-$NWROOT/gfs.${gfs_ver:?}}
+PACKAGEROOT=${PACKAGEROOT:-/lfs/h1/ops/prod/packages}
+HOMEgfs=${HOMEgfs:-$PACKAGEROOT/gfs.${gfs_ver:?}}
 EXECgfs=${EXECgfs:-$HOMEgfs/exec}
-FIXam=${FIXam:-$HOMEgfs/fix/am}
+FIXgfs=${FIXgfs:-$HOMEgfs/fix}
 
 COMOUT=${COMOUT:-$PWD}
 
@@ -114,7 +113,7 @@ IMS_FILE=${IMS_FILE:-"imssnow96.grb.grib2"}
 # File of snow cover climo used to qc the input snow data
 #------------------------------------------------------------------------
 
-CLIMO_QC=${CLIMO_QC:-${FIXam}/emcsfc_snow_cover_climo.grib2}
+CLIMO_QC=${CLIMO_QC:-${FIXgfs}/am/emcsfc_snow_cover_climo.grib2}
 
 #------------------------------------------------------------------------
 # Output snow analysis on model grid