From 9422758886466d40283c253dc2f00404bc4d4811 Mon Sep 17 00:00:00 2001 From: "russ.treadon" Date: Mon, 13 Dec 2021 14:39:14 +0000 Subject: [PATCH] GitHub Issue NOAA-EMC/GSI#266: remove DOGCYCLE and DOGAUSFCANL scripting and variables from j-jobs and scripts * jobs/JGDAS_ATMOS_ANALYSIS_DIAG - remove DOGCYCLE and DOGAUSFCANL * jobs/JGLOBAL_ATMOS_ANALYSIS - remove DOGCYCLE and DOGAUSFCANL * jobs/JGLOBAL_ATMOS_ANALYSIS_CALC - remove DOGCYCLE and DOGAUSFCANL * scripts/exglobal_atmos_analysis.sh - remove DOGCYCLE scripting and DOGAUSFCANL variables * scripts/exglobal_atmos_analysis_calc.sh - remove DOGAUSFCANL scripting --- jobs/JGDAS_ATMOS_ANALYSIS_DIAG | 9 --- jobs/JGLOBAL_ATMOS_ANALYSIS | 8 -- jobs/JGLOBAL_ATMOS_ANALYSIS_CALC | 9 --- scripts/exglobal_atmos_analysis.sh | 97 +------------------------ scripts/exglobal_atmos_analysis_calc.sh | 18 +---- 5 files changed, 2 insertions(+), 139 deletions(-) diff --git a/jobs/JGDAS_ATMOS_ANALYSIS_DIAG b/jobs/JGDAS_ATMOS_ANALYSIS_DIAG index 59d33e1d4b..81b580e96b 100755 --- a/jobs/JGDAS_ATMOS_ANALYSIS_DIAG +++ b/jobs/JGDAS_ATMOS_ANALYSIS_DIAG @@ -113,15 +113,6 @@ if [ $DOHYBVAR = "YES" ]; then fi - -# Update surface fields with global_cycle -export DOGCYCLE=${DOGCYCLE:-"YES"} - - -# Generate Gaussian surface analysis -export DOGAUSFCANL=${DOGAUSFCANL:-"YES"} - - ############################################################### # Run relevant script env diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS b/jobs/JGLOBAL_ATMOS_ANALYSIS index 5644c75305..34422e745b 100755 --- a/jobs/JGLOBAL_ATMOS_ANALYSIS +++ b/jobs/JGLOBAL_ATMOS_ANALYSIS @@ -136,14 +136,6 @@ export TCVITL="${COMOUT}/${OPREFIX}syndata.tcvitals.tm00" [[ $DONST = "YES" ]] && export NSSTBF="${COMOUT}/${OPREFIX}nsstbufr" -# Update surface fields with global_cycle -export DOGCYCLE=${DOGCYCLE:-"YES"} - - -# Generate Gaussian surface analysis -export DOGAUSFCANL=${DOGAUSFCANL:-"YES"} - - ############################################################### # Run relevant script env diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC b/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC index 7233684cc2..b8a61bce6b 100755 --- a/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC +++ b/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC @@ -124,15 +124,6 @@ if [ $DOHYBVAR = "YES" ]; then fi - -# Update surface fields with global_cycle -export DOGCYCLE=${DOGCYCLE:-"YES"} - - -# Generate Gaussian surface analysis -export DOGAUSFCANL=${DOGAUSFCANL:-"YES"} - - ############################################################### # Run relevant script env diff --git a/scripts/exglobal_atmos_analysis.sh b/scripts/exglobal_atmos_analysis.sh index 388fe9700d..e379be999e 100755 --- a/scripts/exglobal_atmos_analysis.sh +++ b/scripts/exglobal_atmos_analysis.sh @@ -53,29 +53,6 @@ APRUNCFP=${APRUNCFP:-""} APRUN_GSI=${APRUN_GSI:-${APRUN:-""}} NTHREADS_GSI=${NTHREADS_GSI:-${NTHREADS:-1}} -# Surface cycle related parameters -DOGCYCLE=${DOGCYCLE:-"NO"} -CYCLESH=${CYCLESH:-$HOMEgfs/ush/global_cycle.sh} -export CYCLEXEC=${CYCLEXEC:-$HOMEgfs/exec/global_cycle} -NTHREADS_CYCLE=${NTHREADS_CYCLE:-24} -APRUN_CYCLE=${APRUN_CYCLE:-${APRUN:-""}} -export SNOW_NUDGE_COEFF=${SNOW_NUDGE_COEFF:-'-2.'} -export CYCLVARS=${CYCLVARS:-""} -export FHOUR=${FHOUR:-0} -export DELTSFC=${DELTSFC:-6} -export FIXgsm=${FIXgsm:-$HOMEgfs/fix/fix_am} -export FIXfv3=${FIXfv3:-$HOMEgfs/fix/fix_fv3_gmted2010} - -DOGAUSFCANL=${DOGAUSFCANL-"NO"} -GAUSFCANLSH=${GAUSFCANLSH:-$HOMEgfs/ush/gaussian_sfcanl.sh} -export GAUSFCANLEXE=${GAUSFCANLEXE:-$HOMEgfs/exec/gaussian_sfcanl.exe} -NTHREADS_GAUSFCANL=${NTHREADS_GAUSFCANL:-1} -APRUN_GAUSFCANL=${APRUN_GAUSFCANL:-${APRUN:-""}} - -# FV3 specific info (required for global_cycle) -export CASE=${CASE:-"C384"} -ntiles=${ntiles:-6} - # Microphysics in the model; 99:ZC, 11:GFDLMP export imp_physics=${imp_physics:-99} lupp=${lupp:-".true."} @@ -630,7 +607,6 @@ fi ############################################################## # Output files -# $SFCANL is no longer created here since global_cycle is not called $NLN $ATMANL siganl $NLN $ATMINC siginc.nc if [ $DOHYBVAR = "YES" -a $l4densvar = ".true." -a $lwrite4danl = ".true." ]; then @@ -969,77 +945,6 @@ if [ $DO_CALC_INCREMENT = "YES" ]; then export err=$?; err_chk fi -############################################################## -# Update surface fields in the FV3 restart's using global_cycle -if [ $DOGCYCLE = "YES" ]; then - - mkdir -p $COMOUT/RESTART - - # Global cycle requires these files - export FNTSFA=${FNTSFA:-$COMIN_OBS/${OPREFIX}rtgssthr.grb} - export FNACNA=${FNACNA:-$COMIN_OBS/${OPREFIX}seaice.5min.blend.grb} - export FNSNOA=${FNSNOA:-$COMIN_OBS/${OPREFIX}snogrb_t${JCAP_CASE}.${LONB_CASE}.${LATB_CASE}} - [[ ! -f $FNSNOA ]] && export FNSNOA="$COMIN_OBS/${OPREFIX}snogrb_t1534.3072.1536" - FNSNOG=${FNSNOG:-$COMIN_GES_OBS/${GPREFIX}snogrb_t${JCAP_CASE}.${LONB_CASE}.${LATB_CASE}} - [[ ! -f $FNSNOG ]] && FNSNOG="$COMIN_GES_OBS/${GPREFIX}snogrb_t1534.3072.1536" - - # Set CYCLVARS by checking grib date of current snogrb vs that of prev cycle - if [ $RUN_GETGES = "YES" ]; then - snoprv=$($GETGESSH -q -t snogrb_$JCAP_CASE -e $gesenvir -n $GDUMP -v $GDATE) - else - snoprv=${snoprv:-$FNSNOG} - fi - - if [ $($WGRIB -4yr $FNSNOA 2>/dev/null | grep -i snowc | awk -F: '{print $3}' | awk -F= '{print $2}') -le \ - $($WGRIB -4yr $snoprv 2>/dev/null | grep -i snowc | awk -F: '{print $3}' | awk -F= '{print $2}') ] ; then - export FNSNOA=" " - export CYCLVARS="FSNOL=99999.,FSNOS=99999.," - else - export SNOW_NUDGE_COEFF=${SNOW_NUDGE_COEFF:-0.} - export CYCLVARS="FSNOL=${SNOW_NUDGE_COEFF},$CYCLVARS" - fi - - if [ $DONST = "YES" ]; then - export NST_ANL=".true." - export GSI_FILE=${GSI_FILE:-$COMOUT/${APREFIX}dtfanl.nc} - else - export NST_ANL=".false." - export GSI_FILE="NULL" - fi - - if [ $DOIAU = "YES" ]; then - # update surface restarts at the beginning of the window, if IAU - # For now assume/hold dtfanl.nc valid at beginning of window - for n in $(seq 1 $ntiles); do - $NLN $COMIN_GES/RESTART/$bPDY.${bcyc}0000.sfc_data.tile${n}.nc $DATA/fnbgsi.00$n - $NLN $COMOUT/RESTART/$bPDY.${bcyc}0000.sfcanl_data.tile${n}.nc $DATA/fnbgso.00$n - $NLN $FIXfv3/$CASE/${CASE}_grid.tile${n}.nc $DATA/fngrid.00$n - $NLN $FIXfv3/$CASE/${CASE}_oro_data.tile${n}.nc $DATA/fnorog.00$n - done - - export APRUNCY=$APRUN_CYCLE - export OMP_NUM_THREADS_CY=$NTHREADS_CYCLE - export MAX_TASKS_CY=$ntiles - - $CYCLESH - export err=$?; err_chk - fi - # update surface restarts at middle of window - for n in $(seq 1 $ntiles); do - $NLN $COMIN_GES/RESTART/$PDY.${cyc}0000.sfc_data.tile${n}.nc $DATA/fnbgsi.00$n - $NLN $COMOUT/RESTART/$PDY.${cyc}0000.sfcanl_data.tile${n}.nc $DATA/fnbgso.00$n - $NLN $FIXfv3/$CASE/${CASE}_grid.tile${n}.nc $DATA/fngrid.00$n - $NLN $FIXfv3/$CASE/${CASE}_oro_data.tile${n}.nc $DATA/fnorog.00$n - done - - export APRUNCY=$APRUN_CYCLE - export OMP_NUM_THREADS_CY=$NTHREADS_CYCLE - export MAX_TASKS_CY=$ntiles - - $CYCLESH - export err=$?; err_chk -fi - ############################################################## # For eupd @@ -1086,7 +991,7 @@ cd $pwd if [ $SENDECF = "YES" -a "$RUN" != "enkf" ]; then ecflow_client --event release_fcst fi -echo "$CDUMP $CDATE atminc and tiled sfcanl done at `date`" > $COMOUT/${APREFIX}loginc.txt +echo "$CDUMP $CDATE atminc done at `date`" > $COMOUT/${APREFIX}loginc.txt ################################################################################ set +x diff --git a/scripts/exglobal_atmos_analysis_calc.sh b/scripts/exglobal_atmos_analysis_calc.sh index 13e53874fa..9cc28d3350 100755 --- a/scripts/exglobal_atmos_analysis_calc.sh +++ b/scripts/exglobal_atmos_analysis_calc.sh @@ -73,12 +73,6 @@ export NTHREADS_CHGRES=${NTHREADS_CHGRES:-1} CALCINCPY=${CALCINCPY:-$HOMEgfs/ush/calcinc_gfs.py} CALCANLPY=${CALCANLPY:-$HOMEgfs/ush/calcanl_gfs.py} -DOGAUSFCANL=${DOGAUSFCANL-"NO"} -GAUSFCANLSH=${GAUSFCANLSH:-$HOMEgfs/ush/gaussian_sfcanl.sh} -export GAUSFCANLEXE=${GAUSFCANLEXE:-$HOMEgfs/exec/gaussian_sfcanl.exe} -NTHREADS_GAUSFCANL=${NTHREADS_GAUSFCANL:-1} -APRUN_GAUSFCANL=${APRUN_GAUSFCANL:-${APRUN:-""}} - # OPS flags RUN=${RUN:-""} SENDECF=${SENDECF:-"NO"} @@ -190,17 +184,7 @@ else echo "Neither increment nor analysis are generated by external utils" fi -############################################################## -# Create gaussian grid surface analysis file at middle of window -if [ $DOGAUSFCANL = "YES" ]; then - export APRUNSFC=$APRUN_GAUSFCANL - export OMP_NUM_THREADS_SFC=$NTHREADS_GAUSFCANL - - $GAUSFCANLSH - export err=$?; err_chk -fi - -echo "$CDUMP $CDATE atmanl and sfcanl done at `date`" > $COMOUT/${APREFIX}loganl.txt +echo "$CDUMP $CDATE atmanl done at `date`" > $COMOUT/${APREFIX}loganl.txt ################################################################################ # Postprocessing