Merge branch 'develop' into feature/new_ip

Fixes #242.
ufs-community · Sep 20, 2022 · 5cf0dd8 · 5cf0dd8
2 parents b187192 + 8b990c0
commit 5cf0dd8
Show file tree

Hide file tree

Showing 41 changed files with 79 additions and 70 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,10 @@ install/
 exec/
 lib/
 
+fix/am
+fix/orog
+fix/sfc_climo
+
 *.[ao]
 *.mod
 *.so

diff --git a/fix/link_fixdirs.sh b/fix/link_fixdirs.sh
@@ -35,23 +35,28 @@ pwd=$(pwd -P)
 #--model fix fields
 #------------------------------
 if [ $machine = "hera" ]; then
-    FIX_DIR="/scratch1/NCEPDEV/global/glopara/fix_NEW"
+    FIX_DIR="/scratch1/NCEPDEV/global/glopara/fix"
 elif [ $machine = "jet" ]; then
-    FIX_DIR="/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix_NEW"
+    FIX_DIR="/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix"
 elif [ $machine = "orion" ]; then
-    FIX_DIR="/work/noaa/global/glopara/fix_NEW"
+    FIX_DIR="/work/noaa/global/glopara/fix"
 elif [ $machine = "wcoss2" ]; then
-    FIX_DIR="/lfs/h2/emc/global/save/emc.global/FIX/fix_NEW"
+    FIX_DIR="/lfs/h2/emc/global/save/emc.global/FIX/fix"
 elif [ $machine = "s4" ]; then
     FIX_DIR="/data/prod/glopara/fix"
 fi
 
-for dir in fix_am fix_orog fix_fv3_gmted2010 fix_sfc_climo fix_fv3_fracoro; do
+am_ver=${am_ver:-20220805}
+orog_ver=${orog_ver:-20220805}
+sfc_climo_ver=${sfc_climo_ver:-20220805}
+
+for dir in am orog sfc_climo; do
     if [ -d $dir ]; then
       [[ $RUN_ENVIR = nco ]] && chmod -R 755 $dir
       rm -rf $dir
     fi
-    $LINK $FIX_DIR/$dir  .
+    fix_ver="${dir}_ver"
+    $LINK $FIX_DIR/$dir/${!fix_ver} ${dir}
 done
 
 exit 0
diff --git a/reg_tests/chgres_cube/13km.conus.nam.grib2.sh b/reg_tests/chgres_cube/13km.conus.nam.grib2.sh
@@ -19,7 +19,7 @@ export FIXsfc=${FIXfv3}/fix_sfc
 export COMIN=${HOMEreg}/input_data/nam.grib2
 
 export GRIB2_FILE_INPUT=nam_218_20200801_0000_000.grb2
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l64.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export VARMAP_FILE=${HOMEufs}/parm/varmap_tables/GFSphys_var_map.txt
 export INPUT_TYPE='grib2'
 export CONVERT_NST=".false."

diff --git a/reg_tests/chgres_cube/13km.conus.rap.grib2.sh b/reg_tests/chgres_cube/13km.conus.rap.grib2.sh
@@ -19,7 +19,7 @@ export FIXsfc=${FIXfv3}/fix_sfc
 export COMIN=${HOMEreg}/input_data/rap.grib2
 
 export GRIB2_FILE_INPUT=1921221000900
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l64.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export VARMAP_FILE=${HOMEufs}/parm/varmap_tables/GSDphys_var_map.txt
 export INPUT_TYPE='grib2'
 export CONVERT_NST=".false."
@@ -38,7 +38,7 @@ export VGFRC_FROM_CLIMO=.true.
 export MINMAX_VGFRC_FROM_CLIMO=.true.
 export TG3_FROM_SOIL=.true.
 export LAI_FROM_CLIMO=.true.
-export GEOGRID_FILE_INPUT=${HOMEufs}/fix/fix_am/geo_em.d01.nc_RAPX
+export GEOGRID_FILE_INPUT=${HOMEufs}/fix/am/geo_em.d01.nc_RAPX
 
 export OMP_NUM_THREADS_CH=${OMP_NUM_THREADS:-1}
 

diff --git a/reg_tests/chgres_cube/13km.na.gfs.ncei.grib2.sh b/reg_tests/chgres_cube/13km.na.gfs.ncei.grib2.sh
@@ -19,7 +19,7 @@ export FIXsfc=${FIXfv3}/fix_sfc
 export COMIN=${HOMEreg}/input_data/gfs.ncei.grib2
 
 export GRIB2_FILE_INPUT=gfs_4_20190801_0000_000.grb2
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l64.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export VARMAP_FILE=${HOMEufs}/parm/varmap_tables/GFSphys_var_map.txt
 export INPUT_TYPE='grib2'
 export CONVERT_NST=".false."

diff --git a/reg_tests/chgres_cube/25km.conus.gfs.grib2.sh b/reg_tests/chgres_cube/25km.conus.gfs.grib2.sh
@@ -19,11 +19,11 @@ export FIXsfc=${FIXfv3}/fix_sfc
 export COMIN=${HOMEreg}/input_data/gfs.grib2
 
 export GRIB2_FILE_INPUT=gfs.t00z.pgrb2.0p50.f000
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l64.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export VARMAP_FILE=${HOMEufs}/parm/varmap_tables/GSDphys_noaero_var_map.txt
 export INPUT_TYPE='grib2'
 export CONVERT_NST=".false."
-export THOMPSON_AEROSOL_FILE=${HOMEufs}/fix/fix_am/Thompson_MP_MONTHLY_CLIMO.nc
+export THOMPSON_AEROSOL_FILE=${HOMEufs}/fix/am/Thompson_MP_MONTHLY_CLIMO.nc
 export OROG_FILES_TARGET_GRID="C403_oro_data.tile7.halo4.nc"
 export REGIONAL=1
 export HALO_BLEND=0

diff --git a/reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh b/reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh
@@ -19,7 +19,7 @@ export FIXsfc=${FIXfv3}/fix_sfc
 export COMIN=${HOMEreg}/input_data/gfs.pbgrib2
 
 export GRIB2_FILE_INPUT=gfs.t18z.pgrb2.0p25.f006
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l64.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export VARMAP_FILE=${HOMEufs}/parm/varmap_tables/GFSphys_var_map.txt
 export INPUT_TYPE='grib2'
 export CONVERT_NST=".false."

diff --git a/reg_tests/chgres_cube/3km.conus.hrrr.gfssdf.grib2.sh b/reg_tests/chgres_cube/3km.conus.hrrr.gfssdf.grib2.sh
@@ -19,7 +19,7 @@ export FIXsfc=${FIXfv3}/fix_sfc
 export COMIN=${HOMEreg}/input_data/hrrr.grib2
 
 export GRIB2_FILE_INPUT=1918200000000
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l64.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export VARMAP_FILE=${HOMEufs}/parm/varmap_tables/GFSphys_var_map.txt
 export INPUT_TYPE='grib2'
 export CONVERT_NST=".false."
@@ -32,7 +32,7 @@ export EXTERNAL_MODEL="HRRR"
 export NSOILL_OUT=4
 export TRACERS_TARGET='"NULL"'
 export TRACERS_INPUT='"NULL"'
-export GEOGRID_FILE_INPUT=${HOMEufs}/fix/fix_am/geo_em.d01.nc_HRRRX
+export GEOGRID_FILE_INPUT=${HOMEufs}/fix/am/geo_em.d01.nc_HRRRX
 
 export OMP_NUM_THREADS_CH=${OMP_NUM_THREADS:-1}
 

diff --git a/reg_tests/chgres_cube/3km.conus.hrrr.newsfc.grib2.sh b/reg_tests/chgres_cube/3km.conus.hrrr.newsfc.grib2.sh
@@ -19,7 +19,7 @@ export FIXsfc=${FIXfv3}/fix_sfc
 export COMIN=${HOMEreg}/input_data/hrrr.grib2
 
 export GRIB2_FILE_INPUT=1921300000000
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l64.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export VARMAP_FILE=${HOMEufs}/parm/varmap_tables/GSDphys_var_map.txt
 export INPUT_TYPE='grib2'
 export CONVERT_NST=".false."
@@ -38,7 +38,7 @@ export VGFRC_FROM_CLIMO=.false.
 export MINMAX_VGFRC_FROM_CLIMO=.false.
 export TG3_FROM_SOIL=.true.
 export LAI_FROM_CLIMO=.false.
-export GEOGRID_FILE_INPUT=${HOMEufs}/fix/fix_am/geo_em.d01.nc_HRRRX
+export GEOGRID_FILE_INPUT=${HOMEufs}/fix/am/geo_em.d01.nc_HRRRX
 
 export OMP_NUM_THREADS_CH=${OMP_NUM_THREADS:-1}
 

diff --git a/reg_tests/chgres_cube/c192.fv3.history.sh b/reg_tests/chgres_cube/c192.fv3.history.sh
@@ -19,7 +19,7 @@ export COMIN=${HOMEreg}/input_data/fv3.history
 # Pay attention to the quotes.  Dont start/end with double quote.
 export ATM_FILES_INPUT='dynf000.tile1.nc","dynf000.tile2.nc","dynf000.tile3.nc","dynf000.tile4.nc","dynf000.tile5.nc","dynf000.tile6.nc'
 export SFC_FILES_INPUT='phyf000.tile1.nc","phyf000.tile2.nc","phyf000.tile3.nc","phyf000.tile4.nc","phyf000.tile5.nc","phyf000.tile6.nc'
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l64.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export INPUT_TYPE='history'
 export MOSAIC_FILE_INPUT_GRID="${HOMEreg}/fix/C96/C96_mosaic.nc"
 export OROG_DIR_INPUT_GRID=${HOMEreg}/fix/C96

diff --git a/reg_tests/chgres_cube/c192.gfs.grib2.sh b/reg_tests/chgres_cube/c192.gfs.grib2.sh
@@ -17,7 +17,7 @@ export FIXfv3=${HOMEreg}/fix/C192
 export COMIN=${HOMEreg}/input_data/gfs.grib2
 
 export GRIB2_FILE_INPUT=gfs.t00z.pgrb2.0p50.f000
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l65.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l65.txt
 export VARMAP_FILE=${HOMEufs}/parm/varmap_tables/GFSphys_var_map.txt
 export INPUT_TYPE='grib2'
 export CONVERT_NST=".false."

diff --git a/reg_tests/chgres_cube/c96.fv3.nemsio.sh b/reg_tests/chgres_cube/c96.fv3.nemsio.sh
@@ -16,7 +16,7 @@ export FIXfv3=${HOMEreg}/fix/C96
 export COMIN=${HOMEreg}/input_data/fv3.nemsio
 export ATM_FILES_INPUT=gfs.t12z.atmf000.nemsio
 export SFC_FILES_INPUT=gfs.t12z.sfcf000.nemsio
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l64.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 
 export CDATE=2019070412
 

diff --git a/reg_tests/chgres_cube/c96.fv3.netcdf.sh b/reg_tests/chgres_cube/c96.fv3.netcdf.sh
@@ -16,7 +16,7 @@ export FIXfv3=${HOMEreg}/fix/C96
 export COMIN=${HOMEreg}/input_data/fv3.netcdf
 export ATM_FILES_INPUT=gfs.t00z.atmf000.nc
 export SFC_FILES_INPUT=gfs.t00z.sfcf000.nc
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l64.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export INPUT_TYPE="gaussian_netcdf"
 
 export CDATE=2020020200

diff --git a/reg_tests/chgres_cube/c96.fv3.netcdf2wam.sh b/reg_tests/chgres_cube/c96.fv3.netcdf2wam.sh
@@ -15,7 +15,7 @@ rm -fr $DATA
 export FIXfv3=${HOMEreg}/fix/C96
 export COMIN=${HOMEreg}/input_data/fv3.netcdf
 export ATM_FILES_INPUT=gfs.t00z.atmf000.nc
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l64.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export INPUT_TYPE="gaussian_netcdf"
 export CONVERT_SFC=".false."
 export CONVERT_NST=".false."
@@ -25,7 +25,7 @@ export CDATE=2020020200
 # export TRACERS_INPUT='"sphum","liq_wat","o3mr","ice_wat","rainwat","snowwat","graupel"'
 export TRACERS_TARGET='"sphum","liq_wat","spo3","ice_wat","rainwat","snowwat","graupel","spo","spo2"'
 
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l150.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l150.txt
 export WAM_COLD_START=.true.
 
 export OMP_NUM_THREADS_CH=${OMP_NUM_THREADS:-1}

diff --git a/reg_tests/chgres_cube/c96.fv3.restart.sh b/reg_tests/chgres_cube/c96.fv3.restart.sh
@@ -14,7 +14,7 @@ rm -fr $DATA
 
 export FIXfv3=${HOMEreg}/fix/C96
 export COMIN=${HOMEreg}/input_data/fv3.restart
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l64.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export INPUT_TYPE='restart'
 export MOSAIC_FILE_INPUT_GRID="${HOMEreg}/fix/C384/C384_mosaic.nc"
 export OROG_DIR_INPUT_GRID=${HOMEreg}/fix/C384

diff --git a/reg_tests/chgres_cube/c96.gefs.grib2.sh b/reg_tests/chgres_cube/c96.gefs.grib2.sh
@@ -17,7 +17,7 @@ export FIXfv3=${HOMEreg}/fix/C96
 export COMIN=${HOMEreg}/input_data/gefs.grib2
 
 export GRIB2_FILE_INPUT=gec00.t06z.pgrb2abf00
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l65.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l65.txt
 export VARMAP_FILE=${HOMEufs}/parm/varmap_tables/GFSphys_var_map.txt
 export INPUT_TYPE='grib2'
 export CONVERT_NST=".false."

diff --git a/reg_tests/chgres_cube/c96.gfs.nemsio.sh b/reg_tests/chgres_cube/c96.gfs.nemsio.sh
@@ -17,7 +17,7 @@ export COMIN=${HOMEreg}/input_data/gfs.nemsio
 export ATM_FILES_INPUT=gfnanl.gdas.2017071700
 export SFC_FILES_INPUT=sfnanl.gdas.2017071700
 export NST_FILES_INPUT=nsnanl.gdas.2017071700
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l64.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export INPUT_TYPE="gfs_gaussian_nemsio"
 
 # dont start/end with double quotes.

diff --git a/reg_tests/chgres_cube/c96.gfs.sigio.sh b/reg_tests/chgres_cube/c96.gfs.sigio.sh
@@ -23,7 +23,7 @@ export COMIN=${HOMEreg}/input_data/gfs.sigio
 export ATM_FILES_INPUT=gdas.t00z.sanl
 export SFC_FILES_INPUT=gdas.t00z.sfcanl
 export CONVERT_NST='.false.'
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l64.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export INPUT_TYPE="gfs_sigio"
 
 # dont start/end with double quotes

diff --git a/reg_tests/chgres_cube/c96.regional.sh b/reg_tests/chgres_cube/c96.regional.sh
@@ -19,7 +19,7 @@ export OROG_FILES_TARGET_GRID="C96_oro_data.tile7.nc"
 export COMIN=${HOMEreg}/input_data/fv3.nemsio
 export ATM_FILES_INPUT=gfs.t12z.atmf000.nemsio
 export SFC_FILES_INPUT=gfs.t12z.sfcf000.nemsio
-export VCOORD_FILE=${HOMEufs}/fix/fix_am/global_hyblev.l64.txt
+export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export REGIONAL=1
 export HALO_BLEND=0
 export HALO_BNDY=4

diff --git a/reg_tests/global_cycle/C768.fv3gfs.sh b/reg_tests/global_cycle/C768.fv3gfs.sh
@@ -32,7 +32,7 @@ export JCAP=1534
 export LONB=3072
 export LATB=1536
 
-export FIXgsm=$BASE_GSM/fix/fix_am
+export FIXgsm=$BASE_GSM/fix/am
 export FNAISC=$FIXgsm/CFSR.SEAICE.1982.2012.monthly.clim.grb
 
 export DONST="YES"

diff --git a/reg_tests/global_cycle/C768.lndincsnow.sh b/reg_tests/global_cycle/C768.lndincsnow.sh
@@ -34,7 +34,7 @@ export JCAP=1534
 export LONB=3072
 export LATB=1536
 
-export FIXgsm=$BASE_GSM/fix/fix_am
+export FIXgsm=$BASE_GSM/fix/am
 
 export DONST="NO"
 export use_ufo=.true.

diff --git a/reg_tests/global_cycle/C768.lndincsoil.sh b/reg_tests/global_cycle/C768.lndincsoil.sh
@@ -36,7 +36,7 @@ export JCAP=1534
 export LONB=3072
 export LATB=1536
 
-export FIXgsm=$BASE_GSM/fix/fix_am
+export FIXgsm=$BASE_GSM/fix/am
 
 export DONST="NO"
 export use_ufo=.true.

diff --git a/reg_tests/snow2mdl/snow2mdl.global.sh b/reg_tests/snow2mdl/snow2mdl.global.sh
@@ -12,10 +12,10 @@ export AFWA_NH_FILE=""
 export AFWA_SH_FILE=""
 export AFWA_GLOBAL_FILE="$HOMEreg/input_data/afwa.global.grb2"
 
-export MODEL_LATITUDE_FILE=$HOMEgfs/fix/fix_am/global_latitudes.t1534.3072.1536.grb
-export MODEL_LONGITUDE_FILE=$HOMEgfs/fix/fix_am/global_longitudes.t1534.3072.1536.grb
-export MODEL_SLMASK_FILE=$HOMEgfs/fix/fix_am/global_slmask.t1534.3072.1536.grb
-export GFS_LONSPERLAT_FILE=$HOMEgfs/fix/fix_am/global_lonsperlat.t1534.3072.1536.txt
+export MODEL_LATITUDE_FILE=$HOMEgfs/fix/am/global_latitudes.t1534.3072.1536.grb
+export MODEL_LONGITUDE_FILE=$HOMEgfs/fix/am/global_longitudes.t1534.3072.1536.grb
+export MODEL_SLMASK_FILE=$HOMEgfs/fix/am/global_slmask.t1534.3072.1536.grb
+export GFS_LONSPERLAT_FILE=$HOMEgfs/fix/am/global_lonsperlat.t1534.3072.1536.txt
 
 export OMP_NUM_THREADS=1
 export OUTPUT_GRIB2=.false.

diff --git a/reg_tests/snow2mdl/snow2mdl.ops.sh b/reg_tests/snow2mdl/snow2mdl.ops.sh
@@ -11,10 +11,10 @@ export IMS_FILE=$HOMEreg/input_data/imssnow96.grb
 export AFWA_NH_FILE=$HOMEreg/input_data/NPR.SNWN.SP.S1200.MESH16
 export AFWA_SH_FILE=$HOMEreg/input_data/NPR.SNWS.SP.S1200.MESH16
 
-export MODEL_LATITUDE_FILE=$HOMEgfs/fix/fix_am/global_latitudes.t1534.3072.1536.grb
-export MODEL_LONGITUDE_FILE=$HOMEgfs/fix/fix_am/global_longitudes.t1534.3072.1536.grb
-export MODEL_SLMASK_FILE=$HOMEgfs/fix/fix_am/global_slmask.t1534.3072.1536.grb
-export GFS_LONSPERLAT_FILE=$HOMEgfs/fix/fix_am/global_lonsperlat.t1534.3072.1536.txt
+export MODEL_LATITUDE_FILE=$HOMEgfs/fix/am/global_latitudes.t1534.3072.1536.grb
+export MODEL_LONGITUDE_FILE=$HOMEgfs/fix/am/global_longitudes.t1534.3072.1536.grb
+export MODEL_SLMASK_FILE=$HOMEgfs/fix/am/global_slmask.t1534.3072.1536.grb
+export GFS_LONSPERLAT_FILE=$HOMEgfs/fix/am/global_lonsperlat.t1534.3072.1536.txt
 
 export OMP_NUM_THREADS=1
 export OUTPUT_GRIB2=.false.

diff --git a/scripts/exemcsfc_global_sfc_prep.sh b/scripts/exemcsfc_global_sfc_prep.sh
@@ -72,7 +72,7 @@ RUN=${RUN:-"gfs"}
 export HOMEgfs=${HOMEgfs:-$NWROOT/gfs.${gfs_ver:?}}
 export USHgfs=${USHgfs:-$HOMEgfs/ush}
 export FIXgfs=${FIXgfs:-$HOMEgfs/fix}
-FIXgfs_am=${FIXgfs_am:-$HOMEgfs/fix/fix_am}
+FIXgfs_am=${FIXgfs_am:-$HOMEgfs/fix/am}
 export EXECgfs=${EXECgfs:-$HOMEgfs/exec}
 
 # output com directory.

diff --git a/sorc/chgres_cube.fd/search_util.F90 b/sorc/chgres_cube.fd/search_util.F90
@@ -220,7 +220,7 @@ end subroutine search
 !> Set default Sea Surface Temperature (SST) based on latitude.
 !!
 !! Based loosely on the average annual SST
-!! values from ./fix_am/cfs_oi2sst1x1monclim19822001.grb
+!! values from ./am/cfs_oi2sst1x1monclim19822001.grb
 !!
 !! The temperature in the polar and tropical regions
 !! is set to 273.16 and 300.0 Kelvin respectively. Polar 

diff --git a/sorc/orog_mask_tools.fd/lake.fd/lakefrac.F90 b/sorc/orog_mask_tools.fd/lake.fd/lakefrac.F90
@@ -101,7 +101,7 @@ PROGRAM lake_frac
     ENDDO
 
     ! read in lake data file
-!    sfcdata_path = '/scratch1/NCEPDEV/global/glopara/fix/fix_orog/'
+!    sfcdata_path = '/scratch1/NCEPDEV/global/glopara/fix/orog/'
     lakedata_path = trim(lakedata_path) // "/"
     ALLOCATE(lakestatus(nlon*nlat),lakedepth(nlon*nlat)) 
     PRINT*, 'Read in lake data file ...'

diff --git a/ush/chgres_cube.sh b/ush/chgres_cube.sh
@@ -33,9 +33,9 @@ NWROOT=${NWROOT:-/nw${envir}}
 HOMEufs=${HOMEufs:-${NWROOT}/ufs_util.${ufs_ver}}
 EXECufs=${EXECufs:-$HOMEufs/exec}
 FIXufs=${FIXufs:-$HOMEufs/fix}
-FIXfv3=${FIXfv3:-$FIXufs/fix_fv3_gmted2010/C${CRES}}
+FIXfv3=${FIXfv3:-$FIXufs/orog/C${CRES}}
 FIXsfc=${FIXsfc:-$FIXfv3/fix_sfc}
-FIXam=${FIXam:-$FIXufs/fix_am}
+FIXam=${FIXam:-$FIXufs/am}
 
 #----------------------------------------------------------------------------
 # CDATE - YYMMDDHH of your run.

diff --git a/ush/cpld_gridgen.sh b/ush/cpld_gridgen.sh
@@ -23,7 +23,7 @@ export DEBUG=.false.
 export MASKEDIT=.false.
 export DO_POSTWGTS=.false.
 export OUTDIR_PATH=${OUTDIR_PATH:-/scratch2/NCEPDEV/climate/Denise.Worthen/grids-20220116}
-export MOSAICDIR_PATH=${MOSAICDIR_PATH:-$PATHTR/fix/fix_fv3_gmted2010}
+export MOSAICDIR_PATH=${MOSAICDIR_PATH:-$PATHTR/fix/orog}
 APRUN=${APRUN:-"srun"}
 
 if [ $RESNAME = 400 ]; then

diff --git a/ush/emcsfc_ice_blend.sh b/ush/emcsfc_ice_blend.sh
@@ -82,7 +82,7 @@ envir=${envir:-"prod"}
 NWROOT=${NWROOT:-"/nw${envir}"}
 
 HOMEgfs=${HOMEgfs:-${NWPROD:-$NWROOT/gfs.${gfs_ver:?}}}
-FIXam=${FIXam:-$HOMEgfs/fix/fix_am}
+FIXam=${FIXam:-$HOMEgfs/fix/am}
 EXECgfs=${EXECgfs:-$HOMEgfs/exec}
 
 # output com directory.

diff --git a/ush/emcsfc_snow.sh b/ush/emcsfc_snow.sh
@@ -77,7 +77,7 @@ envir=${envir:-"prod"}
 NWROOT=${NWROOT:-"/nw${envir}"}
 HOMEgfs=${HOMEgfs:-$NWROOT/gfs.${gfs_ver:?}}
 EXECgfs=${EXECgfs:-$HOMEgfs/exec}
-FIXam=${FIXam:-$HOMEgfs/fix/fix_am}
+FIXam=${FIXam:-$HOMEgfs/fix/am}
 
 COMOUT=${COMOUT:-$PWD}
 

diff --git a/ush/fv3gfs_driver_grid.sh b/ush/fv3gfs_driver_grid.sh
@@ -102,7 +102,7 @@ export out_dir=${out_dir:?}
 export home_dir=${home_dir:-"$PWD/../"}
 export script_dir=$home_dir/ush
 export exec_dir=${exec_dir:-"$home_dir/exec"}
-export topo=$home_dir/fix/fix_orog
+export topo=$home_dir/fix/orog
 
 export NCDUMP=${NCDUMP:-ncdump}
 
@@ -483,7 +483,7 @@ export WORK_DIR=$TEMP_DIR/sfcfields
 export SAVE_DIR=$out_dir/fix_sfc
 export BASE_DIR=$home_dir
 export FIX_FV3=$out_dir
-export input_sfc_climo_dir=$home_dir/fix/fix_sfc_climo
+export input_sfc_climo_dir=$home_dir/fix/sfc_climo
 
 if [ $gtype = regional_gfdl ] || [ $gtype = regional_esg ]; then
   export HALO=$halop1
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,10 @@ install/ @@
     exec/
     lib/
+    fix/am
+    fix/orog
+    fix/sfc_climo
     *.[ao]
     *.mod
     *.so
@@ Expand Down @@