diff --git a/fix/link_fixdirs.sh b/fix/link_fixdirs.sh index e851bfb60..413d85d42 100755 --- a/fix/link_fixdirs.sh +++ b/fix/link_fixdirs.sh @@ -35,18 +35,18 @@ pwd=$(pwd -P) #--model fix fields #------------------------------ if [ $machine = "hera" ]; then - FIX_DIR="/scratch1/NCEPDEV/global/glopara/fix" + FIX_DIR="/scratch1/NCEPDEV/global/glopara/fix_NEW" elif [ $machine = "jet" ]; then - FIX_DIR="/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix" + FIX_DIR="/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix_NEW" elif [ $machine = "orion" ]; then - FIX_DIR="/work/noaa/global/glopara/fix" + FIX_DIR="/work/noaa/global/glopara/fix_NEW" elif [ $machine = "wcoss2" ]; then - FIX_DIR="/lfs/h2/emc/global/noscrub/kate.friedman/glopara/FIX/fix" + FIX_DIR="/lfs/h2/emc/global/save/emc.global/FIX/fix_NEW" elif [ $machine = "s4" ]; then FIX_DIR="/data/prod/glopara/fix" fi -for dir in fix_am fix_fv3 fix_orog fix_fv3_gmted2010 fix_sfc_climo; do +for dir in fix_am fix_orog fix_fv3_gmted2010 fix_sfc_climo fix_fv3_fracoro; do if [ -d $dir ]; then [[ $RUN_ENVIR = nco ]] && chmod -R 755 $dir rm -rf $dir diff --git a/ush/fv3gfs_driver_grid.sh b/ush/fv3gfs_driver_grid.sh index 00cdd201c..8e1250206 100755 --- a/ush/fv3gfs_driver_grid.sh +++ b/ush/fv3gfs_driver_grid.sh @@ -103,7 +103,6 @@ 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_am=$home_dir/fix/fix_am export NCDUMP=${NCDUMP:-ncdump} @@ -188,7 +187,7 @@ if [ $gtype = uniform ] || [ $gtype = stretch ] || [ $gtype = nest ]; then echo set -x export halo_tmp="-999" # no halo - $script_dir/fv3gfs_make_orog_gsl.sh $res $tile $halo_tmp $grid_dir $orog_dir $topo_am + $script_dir/fv3gfs_make_orog_gsl.sh $res $tile $halo_tmp $grid_dir $orog_dir $topo err=$? if [ $err != 0 ]; then exit $err @@ -457,7 +456,7 @@ elif [ $gtype = regional_gfdl ] || [ $gtype = regional_esg ]; then echo "............ Execute fv3gfs_make_orog_gsl.sh for tile $tile .................." echo set -x - $script_dir/fv3gfs_make_orog_gsl.sh $res $tile $halo_tmp $grid_dir $orog_dir $topo_am + $script_dir/fv3gfs_make_orog_gsl.sh $res $tile $halo_tmp $grid_dir $orog_dir $topo err=$? if [ $err != 0 ]; then exit $err diff --git a/ush/fv3gfs_make_orog_gsl.sh b/ush/fv3gfs_make_orog_gsl.sh index 40dfee059..201aefbd5 100755 --- a/ush/fv3gfs_make_orog_gsl.sh +++ b/ush/fv3gfs_make_orog_gsl.sh @@ -22,7 +22,7 @@ tile=$2 halo=$3 griddir=$4 outdir=$5 -topo_am=$6 +topo=$6 workdir=$TEMP_DIR/C${res}/orog/tile$tile @@ -46,8 +46,8 @@ fi cd $workdir ln -sf ${griddir}/$OUTGRID . -ln -sf ${topo_am}/"HGT.Beljaars_filtered.lat-lon.30s_res.nc" . -ln -sf ${topo_am}/"geo_em.d01.lat-lon.2.5m.HGT_M.nc" . +ln -sf ${topo}/"HGT.Beljaars_filtered.lat-lon.30s_res.nc" . +ln -sf ${topo}/"geo_em.d01.lat-lon.2.5m.HGT_M.nc" . cp $executable .