From 0365c015f61782449501c1da41c7e549990ab1ca Mon Sep 17 00:00:00 2001 From: "Walter.Kolczynski" Date: Mon, 29 Aug 2022 04:30:05 +0000 Subject: [PATCH 1/3] Update for new fix strucutre Global workflow recently updated their fix directory structure to incorporate versioning using dates within the directory tree. Additionally, some files were moved and directories renamed (including removing all the 'fix_' prefixes of subdirectories). This commit updates the fix paths in UFS utils to match the new directory structure, and also take version numbers for each of the fix component directories, similar to how versions are used for modulefiles.) Fixes #687 Refs: NOAA-EMC/global-workflow#966 --- .gitignore | 4 ++++ fix/link_fixdirs.sh | 15 ++++++++++----- scripts/exemcsfc_global_sfc_prep.sh | 2 +- ush/chgres_cube.sh | 6 +++--- ush/cpld_gridgen.sh | 2 +- ush/emcsfc_ice_blend.sh | 2 +- ush/emcsfc_snow.sh | 2 +- ush/fv3gfs_driver_grid.sh | 4 ++-- ush/global_cycle.sh | 10 +++++----- ush/global_cycle_driver.sh | 4 ++-- 10 files changed, 30 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 683f653b3..6c3693e17 100644 --- 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 index 413d85d42..ee19afa22 100755 --- 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" 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/scripts/exemcsfc_global_sfc_prep.sh b/scripts/exemcsfc_global_sfc_prep.sh index 9587f2a07..bea65decb 100755 --- 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/ush/chgres_cube.sh b/ush/chgres_cube.sh index ec13ff75a..027b1e372 100755 --- 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}} -FIXsfc=${FIXsfc:-$FIXfv3/fix_sfc} -FIXam=${FIXam:-$FIXufs/fix_am} +FIXfv3=${FIXfv3:-$FIXufs/orog/C${CRES}} +FIXsfc=${FIXsfc:-$FIXfv3/sfc} +FIXam=${FIXam:-$FIXufs/am} #---------------------------------------------------------------------------- # CDATE - YYMMDDHH of your run. diff --git a/ush/cpld_gridgen.sh b/ush/cpld_gridgen.sh index bce186a62..f9c61ccea 100755 --- 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 index 20ddbb373..f1b9421b1 100755 --- 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 index 8071a18b5..2db1ebdfb 100755 --- 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 index 8e1250206..7aed682b4 100755 --- 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 diff --git a/ush/global_cycle.sh b/ush/global_cycle.sh index 92ad3a274..ec3c1da97 100755 --- a/ush/global_cycle.sh +++ b/ush/global_cycle.sh @@ -30,11 +30,11 @@ # HOMEgfs Directory for gfs. Default is # $BASEDIR/gfs.v15.0.0. # FIXSUBDA Sub-directory where fixed climatology files reside. -# Defaults to fix/fix_am. +# Defaults to fix/am. # FIXam Directory for the global fixed climatology files. -# Defaults to $HOMEgfs/fix/fix_am +# Defaults to $HOMEgfs/fix/am # FIXfv3 Directory for the model grid and orography netcdf -# files. Defaults to $HOMEgfs/fix/fix_fv3/${CASE} +# files. Defaults to $HOMEgfs/fix/orog/${CASE} # EXECgfs Directory of the program executable. Defaults to # $HOMEgfs/exec # DATA Working directory @@ -234,8 +234,8 @@ gfs_ver=${gfs_ver:-v15.0.0} BASEDIR=${BASEDIR:-${NWROOT:-/nwprod2}} HOMEgfs=${HOMEgfs:-$BASEDIR/gfs_ver.${gfs_ver}} EXECgfs=${EXECgfs:-$HOMEgfs/exec} -FIXfv3=${FIXfv3:-$HOMEgfs/fix/fix_fv3_gmted2010/$CASE} -FIXam=${FIXam:-$HOMEgfs/fix/fix_am} +FIXfv3=${FIXfv3:-$HOMEgfs/fix/orog/$CASE} +FIXam=${FIXam:-$HOMEgfs/fix/am} DATA=${DATA:-$(pwd)} COMIN=${COMIN:-$(pwd)} COMOUT=${COMOUT:-$(pwd)} diff --git a/ush/global_cycle_driver.sh b/ush/global_cycle_driver.sh index e5327970b..7a6b9e8ee 100755 --- a/ush/global_cycle_driver.sh +++ b/ush/global_cycle_driver.sh @@ -17,8 +17,8 @@ pwd=$(pwd) export NWPROD=${NWPROD:-$pwd} export DMPDIR=${DMPDIR:-$NWPROD} export HOMEgfs=${HOMEgfs:-$NWPROD/gfs.v15.0.0} -export FIXam=${FIXam:-$HOMEgfs/fix/fix_am} -export FIXfv3=${FIXfv3:-$HOMEgfs/fix/fix_fv3_gmted2010} +export FIXam=${FIXam:-$HOMEgfs/fix/am} +export FIXfv3=${FIXfv3:-$HOMEgfs/fix/orog} ntiles=${ntiles:-6} DONST=${DONST:-"NO"} From 9bf2ddbe849f1dc85f5a4a8e1db7e4876ad3738b Mon Sep 17 00:00:00 2001 From: "Walter.Kolczynski" Date: Thu, 1 Sep 2022 20:15:42 +0000 Subject: [PATCH 2/3] More updates for fix reorg Some additional scripts needed to be updated for the fix reorganization. A few files still contain paths remincent of the old paths, either to places the data is hosted on the web (FTP or AWS), or hard-coded locations not under global-workflow control. Refs: #688 --- reg_tests/chgres_cube/13km.conus.nam.grib2.sh | 2 +- reg_tests/chgres_cube/13km.conus.rap.grib2.sh | 4 ++-- reg_tests/chgres_cube/13km.na.gfs.ncei.grib2.sh | 2 +- reg_tests/chgres_cube/25km.conus.gfs.grib2.sh | 4 ++-- reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh | 2 +- reg_tests/chgres_cube/3km.conus.hrrr.gfssdf.grib2.sh | 4 ++-- reg_tests/chgres_cube/3km.conus.hrrr.newsfc.grib2.sh | 4 ++-- reg_tests/chgres_cube/c192.fv3.history.sh | 2 +- reg_tests/chgres_cube/c192.gfs.grib2.sh | 2 +- reg_tests/chgres_cube/c96.fv3.nemsio.sh | 2 +- reg_tests/chgres_cube/c96.fv3.netcdf.sh | 2 +- reg_tests/chgres_cube/c96.fv3.netcdf2wam.sh | 4 ++-- reg_tests/chgres_cube/c96.fv3.restart.sh | 2 +- reg_tests/chgres_cube/c96.gefs.grib2.sh | 2 +- reg_tests/chgres_cube/c96.gfs.nemsio.sh | 2 +- reg_tests/chgres_cube/c96.gfs.sigio.sh | 2 +- reg_tests/chgres_cube/c96.regional.sh | 2 +- reg_tests/global_cycle/C768.fv3gfs.sh | 2 +- reg_tests/global_cycle/C768.lndincsnow.sh | 2 +- reg_tests/global_cycle/C768.lndincsoil.sh | 2 +- reg_tests/snow2mdl/snow2mdl.global.sh | 8 ++++---- reg_tests/snow2mdl/snow2mdl.ops.sh | 8 ++++---- sorc/chgres_cube.fd/search_util.F90 | 2 +- sorc/orog_mask_tools.fd/lake.fd/lakefrac.F90 | 2 +- util/gdas_init/run_pre-v14.chgres.sh | 4 ++-- util/gdas_init/run_v14.chgres.sh | 4 ++-- util/gdas_init/run_v15.chgres.gfs.sh | 4 ++-- util/gdas_init/run_v15.chgres.sh | 4 ++-- util/gdas_init/run_v16.chgres.sh | 4 ++-- util/gdas_init/run_v16retro.chgres.sh | 4 ++-- util/sfc_climo_gen/run.wcoss2.sh | 4 ++-- 31 files changed, 49 insertions(+), 49 deletions(-) diff --git a/reg_tests/chgres_cube/13km.conus.nam.grib2.sh b/reg_tests/chgres_cube/13km.conus.nam.grib2.sh index f293f3874..16af5e42b 100755 --- 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 index 4c4f6df8b..e69bff8b0 100755 --- 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 index b8122703c..2e48b8095 100755 --- 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 index 10ead8ce6..b7cb4129d 100755 --- 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 index d56ebeef1..b104804a8 100755 --- 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 index f9cf35edc..63e7702c5 100755 --- 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 index 4f26a3f2d..a8dfcea9e 100755 --- 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 index 7bb587ff6..5c63765fd 100755 --- 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 index 6d6e0cba5..9b7baa99a 100755 --- 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 index 7a6463f70..fe7576206 100755 --- 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 index acd21c81d..dfdeb6282 100755 --- 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 index 74f301f87..e30e65d97 100755 --- 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 index c4f8ca95b..9e67bfa96 100755 --- 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 index 3b2823252..6d86a4a1f 100755 --- 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 index a965bfa10..d3714ca3e 100755 --- 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 index daf1145c9..25d0448ea 100755 --- 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 index b4807aa5e..f96716f3d 100755 --- 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 index 524f747b3..268c18f44 100755 --- 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 index c98d443ba..b0fe41a46 100755 --- 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 index 5e3a1da57..a344785e6 100755 --- 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 index 77b9b934d..c31c0a476 100755 --- 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 index 700839a3b..8024b3215 100755 --- 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/sorc/chgres_cube.fd/search_util.F90 b/sorc/chgres_cube.fd/search_util.F90 index e4d3d314f..fbab5e209 100644 --- 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 index fada9cd2b..47f2fff60 100644 --- 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/util/gdas_init/run_pre-v14.chgres.sh b/util/gdas_init/run_pre-v14.chgres.sh index b4417f71f..7dcd84902 100755 --- a/util/gdas_init/run_pre-v14.chgres.sh +++ b/util/gdas_init/run_pre-v14.chgres.sh @@ -10,8 +10,8 @@ set -x MEMBER=$1 FIX_FV3=$UFS_DIR/fix -FIX_ORO=${FIX_FV3}/fix_fv3_gmted2010 -FIX_AM=${FIX_FV3}/fix_am +FIX_ORO=${FIX_FV3}/orog +FIX_AM=${FIX_FV3}/am WORKDIR=${WORKDIR:-$OUTDIR/work.${MEMBER}} diff --git a/util/gdas_init/run_v14.chgres.sh b/util/gdas_init/run_v14.chgres.sh index 3ddf45e8d..2b5949fa7 100755 --- a/util/gdas_init/run_v14.chgres.sh +++ b/util/gdas_init/run_v14.chgres.sh @@ -9,8 +9,8 @@ set -x MEMBER=$1 FIX_FV3=$UFS_DIR/fix -FIX_ORO=${FIX_FV3}/fix_fv3_gmted2010 -FIX_AM=${FIX_FV3}/fix_am +FIX_ORO=${FIX_FV3}/orog +FIX_AM=${FIX_FV3}/am WORKDIR=${WORKDIR:-$OUTDIR/work.${MEMBER}} diff --git a/util/gdas_init/run_v15.chgres.gfs.sh b/util/gdas_init/run_v15.chgres.gfs.sh index 049450923..dfc35c2f7 100755 --- a/util/gdas_init/run_v15.chgres.gfs.sh +++ b/util/gdas_init/run_v15.chgres.gfs.sh @@ -8,8 +8,8 @@ set -x FIX_FV3=$UFS_DIR/fix -FIX_ORO=${FIX_FV3}/fix_fv3_gmted2010 -FIX_AM=${FIX_FV3}/fix_am +FIX_ORO=${FIX_FV3}/orog +FIX_AM=${FIX_FV3}/am WORKDIR=${WORKDIR:-$OUTDIR/work.gfs} diff --git a/util/gdas_init/run_v15.chgres.sh b/util/gdas_init/run_v15.chgres.sh index 41b7b3062..7610a4fde 100755 --- a/util/gdas_init/run_v15.chgres.sh +++ b/util/gdas_init/run_v15.chgres.sh @@ -9,8 +9,8 @@ set -x MEMBER=$1 FIX_FV3=$UFS_DIR/fix -FIX_ORO=${FIX_FV3}/fix_fv3_gmted2010 -FIX_AM=${FIX_FV3}/fix_am +FIX_ORO=${FIX_FV3}/orog +FIX_AM=${FIX_FV3}/am date10=`$NDATE -6 $yy$mm$dd$hh` yy_d=$(echo $date10 | cut -c1-4) diff --git a/util/gdas_init/run_v16.chgres.sh b/util/gdas_init/run_v16.chgres.sh index 3ffe8d1b5..0443035c2 100755 --- a/util/gdas_init/run_v16.chgres.sh +++ b/util/gdas_init/run_v16.chgres.sh @@ -26,8 +26,8 @@ set -x MEMBER=$1 FIX_FV3=$UFS_DIR/fix -FIX_ORO=${FIX_FV3}/fix_fv3_gmted2010 -FIX_AM=${FIX_FV3}/fix_am +FIX_ORO=${FIX_FV3}/orog +FIX_AM=${FIX_FV3}/am WORKDIR=${WORKDIR:-$OUTDIR/work.${MEMBER}} diff --git a/util/gdas_init/run_v16retro.chgres.sh b/util/gdas_init/run_v16retro.chgres.sh index 200b67f0d..cb747e96f 100755 --- a/util/gdas_init/run_v16retro.chgres.sh +++ b/util/gdas_init/run_v16retro.chgres.sh @@ -29,8 +29,8 @@ set -x MEMBER=$1 FIX_FV3=$UFS_DIR/fix -FIX_ORO=${FIX_FV3}/fix_fv3_gmted2010 -FIX_AM=${FIX_FV3}/fix_am +FIX_ORO=${FIX_FV3}/orog +FIX_AM=${FIX_FV3}/am date10=`$NDATE -6 $yy$mm$dd$hh` yy_d=$(echo $date10 | cut -c1-4) diff --git a/util/sfc_climo_gen/run.wcoss2.sh b/util/sfc_climo_gen/run.wcoss2.sh index 63e9c692f..91c48566a 100755 --- a/util/sfc_climo_gen/run.wcoss2.sh +++ b/util/sfc_climo_gen/run.wcoss2.sh @@ -37,7 +37,7 @@ export res=384 # Where the model "grid", "mosaic" and "oro" files reside. #------------------------------------- -export FIX_FV3=${BASE_DIR}/fix/fix_fv3_gmted2010/C${res} +export FIX_FV3=${BASE_DIR}/fix/orog/C${res} #------------------------------------- # Uncomment for regional grids. @@ -74,7 +74,7 @@ if [[ $GRIDTYPE = "regional" ]]; then ln -fs $FIX_FV3/C${res}_oro_data.tile7.halo${HALO}.nc $FIX_FV3/C${res}_oro_data.tile7.nc fi -export input_sfc_climo_dir=${BASE_DIR}/fix/fix_sfc_climo +export input_sfc_climo_dir=${BASE_DIR}/fix/sfc_climo ulimit -a ulimit -s unlimited From c8741b8c4a5807c9fe776204c2a586e21e677687 Mon Sep 17 00:00:00 2001 From: "Walter.Kolczynski" Date: Tue, 20 Sep 2022 11:24:46 +0000 Subject: [PATCH 3/3] Fix sfc fix for chgres_cube and fix path on Jet Refs: #687 --- fix/link_fixdirs.sh | 2 +- ush/chgres_cube.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fix/link_fixdirs.sh b/fix/link_fixdirs.sh index ee19afa22..a236de8e3 100755 --- a/fix/link_fixdirs.sh +++ b/fix/link_fixdirs.sh @@ -37,7 +37,7 @@ pwd=$(pwd -P) if [ $machine = "hera" ]; then 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" elif [ $machine = "wcoss2" ]; then diff --git a/ush/chgres_cube.sh b/ush/chgres_cube.sh index 027b1e372..40d91f543 100755 --- a/ush/chgres_cube.sh +++ b/ush/chgres_cube.sh @@ -34,7 +34,7 @@ HOMEufs=${HOMEufs:-${NWROOT}/ufs_util.${ufs_ver}} EXECufs=${EXECufs:-$HOMEufs/exec} FIXufs=${FIXufs:-$HOMEufs/fix} FIXfv3=${FIXfv3:-$FIXufs/orog/C${CRES}} -FIXsfc=${FIXsfc:-$FIXfv3/sfc} +FIXsfc=${FIXsfc:-$FIXfv3/fix_sfc} FIXam=${FIXam:-$FIXufs/am} #----------------------------------------------------------------------------