diff --git a/sorc/global_cycle.fd/read_write_data.f90 b/sorc/global_cycle.fd/read_write_data.f90 index 1f569cfab..4eac568af 100644 --- a/sorc/global_cycle.fd/read_write_data.f90 +++ b/sorc/global_cycle.fd/read_write_data.f90 @@ -1161,12 +1161,10 @@ SUBROUTINE READ_DATA(LSOIL,LENSFC,DO_NSST,IS_NOAHMP, & ! Use the coordinate names to test whether this is ! a JEDI increment file - print *, 'CSD - testing' TEST=NF90_INQ_DIMID(NCID, 'xaxis_1', ID_DIM) IF ( TEST == NF90_NOERR ) THEN JEDI_INCR_FILE=.FALSE. - print *, 'CSD - gsi file' ERROR=NF90_INQ_DIMID(NCID, 'xaxis_1', ID_DIM) CALL NETCDF_ERR(ERROR, 'READING xaxis_1' ) @@ -1179,7 +1177,6 @@ SUBROUTINE READ_DATA(LSOIL,LENSFC,DO_NSST,IS_NOAHMP, & CALL NETCDF_ERR(ERROR, 'READING yaxis_1' ) ELSE - print *, 'CSD - jedi file' JEDI_INCR_FILE=.TRUE. ERROR=NF90_INQ_DIMID(NCID, 'grid_xt', ID_DIM) diff --git a/ush/global_cycle_driver.sh b/ush/global_cycle_driver.sh index a22915d53..bedfa6de0 100755 --- a/ush/global_cycle_driver.sh +++ b/ush/global_cycle_driver.sh @@ -53,9 +53,9 @@ fi export DO_SFCCYLE=${DO_SFCCYCLE:-".true."} export DO_LNDINC=${DO_LNDINC:-".false."} -export DO_SOI_INC_GSI=${DO_SOI_INC_GSI:-".false."} -export DO_SNO_INC_JEDI=${DO_SNO_INC_JEDI:-".false."} -export DO_SOI_INC_JEDI=${DO_SOI_INC_JEDI:-".false."} +export DO_SOI_INC=${DO_SOI_INC:-".false."} +export DO_SNO_INC=${DO_SNO_INC:-".false."} +export INTERP_LNDINC=${INTERP_LNDINC:-".false."} export FRAC_GRID=${FRAC_GRID:-".false."} CRES=$(echo $CASE | cut -c 2-) @@ -95,15 +95,15 @@ for n in $(seq 1 $ntiles); do ln -fs $FIXorog/${CASE}/C${CRES}.mx${OCNRES}_oro_data.tile${n}.nc $DATA/fnorog.00$n fi - if [[ "$DO_SNO_INC_JEDI" == ".true." ]] ; then + if [[ "$DO_SNO_INC" == ".true." ]] ; then ln -fs $COMIN/$PDY.${cyc}0000.xainc.tile${n}.nc $DATA/snow_xainc.00$n fi - if [[ "$DO_SOI_INC_JEDI" == ".true." ]] ; then + if [ "$DO_SOI_INC" == ".true." ] && [ "$INTERP_LNDINC" == ".false." ] ; then ln -fs $COMIN/soil_sfcincr_jedi.00$n $DATA/soil_xainc.00$n fi - if [[ "$DO_SOI_INC_GSI" == ".true." ]] ; then + if [ "$DO_SOI_INC" == ".true." ] && [ "$INTERP_LNDINC" == ".true." ] ; then ln -fs $COMIN/sfcincr_gsi.00$n $DATA/sfcincr_gsi.00$n fi done