Skip to content

Commit

Permalink
GitHub Issue NOAA-EMC#266. remove global_cycle from DA jobs and scripts
Browse files Browse the repository at this point in the history 
commit 112ca82
Merge: 257f6eb dd1bac5
Author: RussTreadon-NOAA <[email protected]>
Date:   Tue Jun 21 09:56:10 2022 -0400

    Merge branch 'NOAA-EMC:develop' into feature/rm_sfcanl

commit 257f6eb
Merge: 9c48261 ad84f17
Author: RussTreadon-NOAA <[email protected]>
Date:   Mon Jun 13 14:52:28 2022 +0000

    Merge branch 'develop' into feature/rm_sfcanl

commit 9c48261
Merge: dc62da7 eb220ca
Author: RussTreadon-NOAA <[email protected]>
Date:   Thu May 26 05:43:20 2022 -0400

    Merge branch 'NOAA-EMC:develop' into feature/rm_sfcanl

commit eb220ca
Author: michael.lueken <[email protected]>
Date:   Wed May 25 16:04:25 2022 +0000

    GitHub Issue NOAA-EMC#382.  Add GSI fix file changes for v16.3

commit 8c22b33
Merge: a90b632 cf4b323
Author: MichaelLueken-NOAA <[email protected]>
Date:   Wed May 25 15:56:49 2022 +0000

    Merge pull request NOAA-EMC#374 from ADCollard/IRBugFix

    GitHub Issue NOAA-EMC#371. Minor bug fixes to IR processing

commit dc62da7
Merge: b7afecf a90b632
Author: RussTreadon-NOAA <[email protected]>
Date:   Fri May 20 12:10:17 2022 -0400

    Merge branch 'NOAA-EMC:develop' into feature/rm_sfcanl

commit a90b632
Merge: 524527b 889cce5
Author: MichaelLueken-NOAA <[email protected]>
Date:   Fri May 20 16:08:11 2022 +0000

    Merge pull request NOAA-EMC#386 from HaixiaLiu-NOAA/master

    GitHub Issue NOAA-EMC#385. Add seviri_m09 to Radiance_Monitor util

commit 889cce5
Author: Haixia.Liu <[email protected]>
Date:   Fri May 20 04:27:21 2022 +0000

    GitHub Issue NOAA-EMC#385. Add seviri_m09 to Radiance_Monitor util

commit b7afecf
Merge: 58b52c6 524527b
Author: RussTreadon-NOAA <[email protected]>
Date:   Thu May 19 12:46:19 2022 -0400

    Merge branch 'NOAA-EMC:develop' into feature/rm_sfcanl

commit 524527b
Merge: 9946c69 002dc87
Author: MichaelLueken-NOAA <[email protected]>
Date:   Thu May 19 16:08:48 2022 +0000

    Merge pull request NOAA-EMC#379 from AndrewEichmann-NOAA/EXP-efso_fv3_issue_378

    Github issue NOAA-EMC#378: refactoring of EFSOI scripts and compiled code (EFSOI and EFSOI forecast scripts)

commit 9946c69
Merge: bcc0358 ccfda16
Author: MichaelLueken-NOAA <[email protected]>
Date:   Thu May 19 16:05:20 2022 +0000

    Merge pull request NOAA-EMC#381 from emilyhcliu/feature/gmi

    GitHub Issue NOAA-EMC#341. Add GMI for radmon

commit bcc0358
Merge: 7146a0b 7a4fa9b
Author: MichaelLueken-NOAA <[email protected]>
Date:   Thu May 19 16:02:55 2022 +0000

    Merge pull request NOAA-EMC#384 from christopherwharrop-noaa/feature/update-cheyenne-hpc-stack

    GitHub Issue NOAA-EMC#383 Update hpc-stack in Cheyenne modulefiles for GNU and Intel compilers.

commit 7a4fa9b
Author: Christopher Harrop <[email protected]>
Date:   Thu May 19 09:23:33 2022 -0600

    GitHub Issue NOAA-EMC#383

    Update hpc-stack in Cheyenne modulefiles for GNU and Intel compilers.

    A small workaround was necessary for the GNU modulefile to avoid
    a dependency issue with the GNU version of hpc-stack.

commit ccfda16
Author: Emily Liu <[email protected]>
Date:   Thu May 19 02:20:09 2022 +0000

    Add GMI for radmon

commit 58b52c6
Merge: c4c860b 7146a0b
Author: RussTreadon-NOAA <[email protected]>
Date:   Wed May 18 14:52:48 2022 -0400

    Merge branch 'NOAA-EMC:develop' into feature/rm_sfcanl

commit 7146a0b
Author: Rahul Mahajan <[email protected]>
Date:   Wed May 18 11:57:08 2022 -0400

    GitHub Issue NOAA-EMC#112.  A refactor of CMake build framework. (NOAA-EMC#327)

commit cf4b323
Author: Andrew Collard <[email protected]>
Date:   Fri Apr 29 21:34:22 2022 +0000

    GitHub Issue NOAA-EMC#371: Bug fixes to IR processing

commit 002dc87
Author: AndrewEichmann-NOAA <[email protected]>
Date:   Thu May 12 15:02:40 2022 -0500

    Removed extraneous lines from EFSOI script, and extraneous
    exgdas_efsoi_fcst.sh script

commit c4c860b
Merge: c9ac824 34294c1
Author: RussTreadon-NOAA <[email protected]>
Date:   Mon May 9 16:46:28 2022 +0000

    Merge branch 'develop' into feature/rm_sfcanl

commit 34294c1
Merge: ad2a3c0 20cf887
Author: MichaelLueken-NOAA <[email protected]>
Date:   Mon May 9 16:26:12 2022 +0000

    Merge pull request NOAA-EMC#376 from EdwardSafford-NOAA/develop

    GitHub Issue NOAA-EMC#373.  Compress RadMon data files.

commit ad2a3c0
Merge: e7f8c88 845b360
Author: MichaelLueken-NOAA <[email protected]>
Date:   Mon May 9 16:24:29 2022 +0000

    Merge pull request NOAA-EMC#369 from MichaelLueken-NOAA/feature/wcoss2_port

    GitHub Issue NOAA-EMC#368.  WCOSS2 port.

commit 20cf887
Author: Edward.Safford <[email protected]>
Date:   Thu May 5 12:04:30 2022 +0000

    Github issue NOAA-EMC#373.  Compress RadMon data files.  Completes NOAA-EMC#373.

commit 845b360
Author: Michael Lueken <[email protected]>
Date:   Fri Apr 29 11:00:52 2022 +0000

    GitHub Issue NOAA-EMC#368.  WCOSS2 port.

commit c9ac824
Merge: e577941 e7f8c88
Author: RussTreadon-NOAA <[email protected]>
Date:   Tue May 3 10:42:43 2022 -0400

    Merge branch 'NOAA-EMC:develop' into feature/rm_sfcanl

commit e7f8c88
Merge: 586c2df 0a5daea
Author: MichaelLueken-NOAA <[email protected]>
Date:   Tue May 3 10:08:34 2022 -0400

    Merge pull request NOAA-EMC#372 from RussTreadon-NOAA/feature/interp

    GitHub Issue NOAA-EMC#370: use nf90_inq_varid to set integer addresses for lon and lat variables

commit 0a5daea
Author: RussTreadon-NOAA <[email protected]>
Date:   Fri Apr 29 21:36:35 2022 +0000

    GitHub Issue NOAA-EMC/GSI NOAA-EMC#370: use nf90_inq_varid to set integer addresses for lon and lat variables

commit e577941
Merge: be550bf 586c2df
Author: RussTreadon-NOAA <[email protected]>
Date:   Tue May 3 09:52:08 2022 -0400

    Merge branch 'NOAA-EMC:develop' into feature/rm_sfcanl

commit 586c2df
Merge: 87fe77d f16e852
Author: MichaelLueken-NOAA <[email protected]>
Date:   Tue May 3 09:46:33 2022 -0400

    Merge pull request NOAA-EMC#366 from EdwardSafford-NOAA/develop

    GitHub Issue NOAA-EMC#310 and NOAA-EMC#367. Correct RadMon's mean correction time series plots and update html generation.

commit f16e852
Author: edward.safford <[email protected]>
Date:   Fri Apr 29 14:39:22 2022 +0000

    Github issue NOAA-EMC#310.  Correct mean correction time series plots.  Fixes NOAA-EMC#310.

commit be550bf
Merge: c0a5204 114ed31
Author: RussTreadon-NOAA <[email protected]>
Date:   Mon May 2 06:25:23 2022 -0400

    Merge branch 'NOAA-EMC:develop' into feature/rm_sfcanl

commit c0a5204
Merge: 8b376d1 498896b
Author: RussTreadon-NOAA <[email protected]>
Date:   Mon Apr 25 13:22:30 2022 -0400

    Merge branch 'NOAA-EMC:develop' into feature/rm_sfcanl

commit 8b376d1
Merge: 91a8077 0c6548e
Author: RussTreadon-NOAA <[email protected]>
Date:   Wed Apr 20 13:53:51 2022 -0400

    Merge branch 'NOAA-EMC:master' into feature/rm_sfcanl

commit 91a8077
Merge: dec3299 7201778
Author: RussTreadon-NOAA <[email protected]>
Date:   Wed Apr 13 10:27:36 2022 -0400

    Merge branch 'NOAA-EMC:master' into feature/rm_sfcanl

commit dec3299
Merge: 6204f98 5936a23
Author: RussTreadon-NOAA <[email protected]>
Date:   Tue Apr 5 10:49:24 2022 -0400

    Merge branch 'NOAA-EMC:master' into feature/rm_sfcanl

commit 6204f98
Merge: f7a1495 affe4ed
Author: RussTreadon-NOAA <[email protected]>
Date:   Thu Mar 31 12:38:40 2022 -0400

    Merge branch 'NOAA-EMC:master' into feature/rm_sfcanl

commit f7a1495
Merge: b592666 ef237ce
Author: RussTreadon-NOAA <[email protected]>
Date:   Thu Mar 24 08:57:46 2022 -0400

    Merge branch 'NOAA-EMC:master' into feature/rm_sfcanl

commit b592666
Merge: d0f7c20 47ee70b
Author: RussTreadon-NOAA <[email protected]>
Date:   Thu Mar 10 09:13:14 2022 -0500

    Merge branch 'NOAA-EMC:master' into feature/rm_sfcanl

commit d0f7c20
Merge: ed94193 828c0cf
Author: RussTreadon-NOAA <[email protected]>
Date:   Wed Mar 2 10:35:21 2022 -0500

    Merge branch 'NOAA-EMC:master' into feature/rm_sfcanl

commit ed94193
Merge: c63bd77 963b7e5
Author: RussTreadon-NOAA <[email protected]>
Date:   Tue Mar 1 16:04:48 2022 +0000

    Merge branch 'master' at 963b7e5 into feature/rm_sfcanl

    Conflicts:
    	scripts/exglobal_atmos_analysis.sh

commit c63bd77
Merge: 39912e1 0444258
Author: RussTreadon-NOAA <[email protected]>
Date:   Tue Feb 15 06:06:10 2022 -0500

    Merge branch 'NOAA-EMC:master' into feature/rm_sfcanl

commit 39912e1
Merge: f0161c8 9e765da
Author: RussTreadon-NOAA <[email protected]>
Date:   Tue Jan 11 06:40:58 2022 -0500

    Merge branch 'NOAA-EMC:master' into feature/rm_sfcanl

commit f0161c8
Merge: a75d6ed a62dec6
Author: RussTreadon-NOAA <[email protected]>
Date:   Tue Dec 14 11:40:31 2021 -0500

    Merge branch 'NOAA-EMC:master' into feature/rm_sfcanl

commit a75d6ed
Author: russ.treadon <[email protected]>
Date:   Tue Dec 14 14:38:57 2021 +0000

    GitHub Issue NOAA-EMC#266:  add DOGAUSFCANL capability back to JGLOBAL_ATMOS_ANALYSIS_CALC and exglobal_atmos_analysis_calc.sh

commit 9422758
Author: russ.treadon <[email protected]>
Date:   Mon Dec 13 14:39:14 2021 +0000

    GitHub Issue NOAA-EMC#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
  • Loading branch information
@RussTreadon-NOAA
RussTreadon-NOAA committed Jun 21, 2022
1 parent dd1bac5 commit d19b2b0
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 116 deletions.
9 changes: 0 additions & 9 deletions jobs/JGDAS_ATMOS_ANALYSIS_DIAG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,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
Expand Down
8 changes: 0 additions & 8 deletions jobs/JGLOBAL_ATMOS_ANALYSIS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,6 @@ export TCVITL="${COMOUT}/${OPREFIX}syndata.tcvitals.tm00"
[[ $DONST = "YES" ]] && export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr"


# Update surface fields with global_cycle
export DOGCYCLE=${DOGCYCLE:-"YES"}


# Generate Gaussian surface analysis
export DOGAUSFCANL=${DOGAUSFCANL:-"YES"}


# Copy fix file for obsproc
if [ $RUN = "gfs" ]; then
mkdir -p $ROTDIR/fix
Expand Down
5 changes: 0 additions & 5 deletions jobs/JGLOBAL_ATMOS_ANALYSIS_CALC
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,6 @@ if [ $DOHYBVAR = "YES" ]; then
fi



# Update surface fields with global_cycle
export DOGCYCLE=${DOGCYCLE:-"YES"}


# Generate Gaussian surface analysis
export DOGAUSFCANL=${DOGAUSFCANL:-"YES"}

Expand Down
95 changes: 1 addition & 94 deletions scripts/exglobal_atmos_analysis.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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."}
Expand Down Expand Up @@ -639,7 +616,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
Expand Down Expand Up @@ -990,75 +966,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/${OPREFIX}seaice.5min.blend.grb}
export FNSNOA=${FNSNOA:-$COMIN/${OPREFIX}snogrb_t${JCAP_CASE}.${LONB_CASE}.${LATB_CASE}}
[[ ! -f $FNSNOA ]] && export FNSNOA="$COMIN/${OPREFIX}snogrb_t1534.3072.1536"
FNSNOG=${FNSNOG:-$COMIN_GES/${GPREFIX}snogrb_t${JCAP_CASE}.${LONB_CASE}.${LATB_CASE}}
[[ ! -f $FNSNOG ]] && FNSNOG="$COMIN_GES/${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_FILE=${NST_FILE:-$COMOUT/${APREFIX}dtfanl.nc}
else
export NST_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
Expand Down Expand Up @@ -1105,7 +1012,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
Expand Down

0 comments on commit d19b2b0

Please sign in to comment.