Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 8dd631c56ab2e0ecfdcabec5fb81c3e738c54093
Author: xu.li <xu.li@noaa.gov>
Date:   Thu Dec 21 10:44:32 2017 -0500

    Change in gfs_workflow.v15.0.0/config/config.nsst (zsea to ZSEA)

commit 3ce3ce0d5203be9073983b8b0fbd5a55135db627
Merge: 8d947df 5cfe289
Author: Xu Li <xu.li@noaa.gov>
Date:   Wed Dec 13 22:30:20 2017 +0000

    Merge branch 'master' into task_40643_nsst

commit ce17838eb1fe8e0e3c4b1e6bc49e95e43f8c3cf7
Author: Rahul Mahajan <rahul.mahajan@noaa.gov>
Date:   Wed Dec 13 17:14:43 2017 -0500

    task_40643_nsst (Rahul.Mahajan): commit changes related to using parallel global_cycle and NSST in the workflow.

commit a7d334cdc619740552ee21b6731894e18f22c0da
Author: Xu Li <xu.li@noaa.gov>
Date:   Fri Dec 1 16:43:04 2017 +0000

    Remove COMOUT_ANL_ENS from ecen.sh

commit 9e82a4e43108df5809b4f8e8568c8058e3b731dd
Author: Xu Li <xu.li@noaa.gov>
Date:   Fri Dec 1 16:21:58 2017 +0000

    Commit one change in config.resources

commit 20ac52763a284c42f07b9f9362f0a4d76c74d2b1
Author: Xu Li <xu.li@noaa.gov>
Date:   Fri Dec 1 16:16:24 2017 +0000

    Commit changes based on Rahul's review

commit 5a5d2c394c94e8282ca9ea786c8aed2a2fffebbb
Author: Xu Li <xu.li@noaa.gov>
Date:   Sat Nov 25 22:30:57 2017 +0000

    Commit changes

commit 2a3d6719efe9231220f7f2cb366e07315195b103
Merge: 1ae7fc6 b1049f1
Author: Xu Li <xu.li@noaa.gov>
Date:   Mon Nov 20 18:26:20 2017 +0000

    Merge branch 'task_40643_nsst' of gerrit:fv3gfs into task_40643_nsst

    Conflicts:
    	gfs_workflow.v15.0.0/config/config.base

commit 7c01175f36649eb4ba26ded31cf61b9e8dc0ae00
Merge: 466e35d 1a6ae93
Author: Xu Li <xu.li@noaa.gov>
Date:   Mon Nov 20 17:57:16 2017 +0000

    Merge branch 'master' of gerrit:fv3gfs into task_40643_nsst

    Conflicts:
    	gfs_workflow.v15.0.0/config/config.base
    	gfs_workflow.v15.0.0/jobs/anal.sh
    	global_shared.v15.0.0/ush/global_cycle.sh

commit f0080386d67c747353c5474f962a939532edb798
Author: Xu Li <xu.li@noaa.gov>
Date:   Mon Nov 20 15:44:33 2017 +0000

    Commit changes to handle gvegfs gcycle

commit 16e936cfcb3f3d18bb079e0d9607ed52473b99e6
Merge: 27c80f0 41a6c5b
Author: xu.li <xu.li@noaa.gov>
Date:   Wed Nov 15 04:25:33 2017 +0000

    Merge branch 'master' of gerrit:fv3gfs into task_40643_nsst

commit 68d9fd26e96d992ac604bef70a2a00695c679acb
Author: xu.li <xu.li@noaa.gov>
Date:   Tue Nov 14 01:45:39 2017 +0000

    Commit changes for WriteComponent, nsst and fv3gfs gcycle
  • Loading branch information
@XuLi-NOAA
XuLi-NOAA committed Dec 21, 2017
1 parent a38cef8 commit 7bf492a
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 16 deletions.
6 changes: 3 additions & 3 deletions gfs_workflow.v15.0.0/config/config.nsst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ export NST_SPINUP=0
if [ ${CDATE:-0} -eq 2016100100 ] ; then export NST_SPINUP=1; fi

# NSST parameters: the two depths to apply vertical average (bias correction)
export zsea1=0
export zsea2=0
export ZSEA1=0
export ZSEA2=0

export nstf_name="2,$NST_SPINUP,0,$zsea1,$zsea2"
export nstf_name="2,$NST_SPINUP,0,$ZSEA1,$ZSEA2"
# nstf_name(1) : 0 (default) = No NSSTM; 1 = uncoupled; 2 = coupled (nstf_name(1) = NST_FCST)
# nstf_name(2) : 0 (default) = NSST Spinup off; 1 = NSST Spinup on
# nstf_name(3) : Reserved
Expand Down
7 changes: 2 additions & 5 deletions gfs_workflow.v15.0.0/env/THEIA.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ elif [ $step = "anal" ]; then

export NTHREADS_CYCLE=${nth_cycle:-$npe_node_max}
[[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
export APRUN_CYCLE="time"
npe_cycle=${ntiles:-6}
export APRUN_CYCLE="$launcher $npe_cycle"

elif [ $step = "eobs" ]; then

Expand All @@ -62,10 +63,6 @@ elif [ $step = "eobs" ]; then
[[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max
export APRUN_GSI="$launcher ${npe_gsi:-${npe_eobs:-$PBS_NP}}"

export NTHREADS_CYCLE=${nth_cycle:-$npe_node_max}
[[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
export APRUN_CYCLE="time"

elif [ $step = "eupd" ]; then

nth_max=$(($npe_node_max / $npe_node_eupd))
Expand Down
9 changes: 4 additions & 5 deletions gfs_workflow.v15.0.0/env/WCOSS_C.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ elif [ $step = "anal" ]; then

export NTHREADS_CYCLE=${nth_cycle:-$npe_node_max}
[[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
export APRUN_CYCLE="$launcher -j 1 -n 1 -N 1 -d $NTHREADS_CYCLE -cc depth"
npe_node_cycle=$(($npe_node_max / $NTHREADS_CYCLE))
npe_cycle=${ntiles:-6}
[[ $npe_node_cycle -gt $npe_cycle ]] && npe_node_cycle=$npe_cycle
export APRUN_CYCLE="$launcher -j 1 -n $npe_cycle -N $npe_node_cycle -d $NTHREADS_CYCLE -cc depth"

elif [ $step = "eobs" ]; then

Expand All @@ -65,10 +68,6 @@ elif [ $step = "eobs" ]; then
export APRUNCFP="$launcher -q -j 1 -n \$ncmd -N \$ncmd_max -d 1 cfp"
fi

export NTHREADS_CYCLE=${nth_cycle:-$npe_node_max}
[[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
export APRUN_CYCLE="$launcher -j 1 -n 1 -N 1 -d $NTHREADS_CYCLE -cc depth"

elif [ $step = "eupd" ]; then

nth_max=$(($npe_node_max / $npe_node_eupd))
Expand Down
3 changes: 3 additions & 0 deletions gfs_workflow.v15.0.0/jobs/anal.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ export PREPQC="${COMOUT}/${OPREFIX}prepbufr"
export PREPQCPF="${COMOUT}/${OPREFIX}prepbufr.acft_profiles"
[[ $DONST = "YES" ]] && export NSSTBF="${COMOUT}/${OPREFIX}nsstbufr"

# Update surface fields with global_cycle
export DOGCYCLE="YES"

###############################################################
# Run relevant exglobal script
$ANALYSISSH
Expand Down
4 changes: 4 additions & 0 deletions gfs_workflow.v15.0.0/jobs/arch.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ fi
increment_file="$COMIN/${APREFIX}atminc.nc"
[[ -f $increment_file ]] && $NCP $increment_file .

dtfanl_file="$COMIN/${APREFIX}dtfanl.nc"
[[ -f $dtfanl_file ]] && $NCP $dtfanl_file .

files="abias abias_pc abias_air radstat"
for file in $files; do
$NCP $COMIN/${APREFIX}$file .
Expand Down Expand Up @@ -92,6 +95,7 @@ files="gsistat cnvstat prepbufr prepbufr.acft_profiles"
for file in $files; do
$NCP $COMIN/${APREFIX}$file .
done
[[ $DONST = "YES" ]] && $NCP $COMIN/${APREFIX}nsstbufr .

$NCP $COMIN/${APREFIX}atmanl${ASUFFIX} .
$NCP $COMIN/${APREFIX}pgrb2.*.fanl* .
Expand Down
2 changes: 2 additions & 0 deletions gfs_workflow.v15.0.0/jobs/ecen.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@ status=$?

###############################################################
# Set script and dependency variables
export CASE=$CASE_ENKF
export GDATE=$($NDATE -$assim_freq $CDATE)

cymd=$(echo $CDATE | cut -c1-8)
chh=$(echo $CDATE | cut -c9-10)
gymd=$(echo $GDATE | cut -c1-8)
ghh=$(echo $GDATE | cut -c9-10)

export OPREFIX="${CDUMP}.t${chh}z."
export APREFIX="${CDUMP}.t${chh}z."
export ASUFFIX=".nemsio"
export GPREFIX="${CDUMP}.t${ghh}z."
Expand Down
3 changes: 0 additions & 3 deletions gfs_workflow.v15.0.0/jobs/eobs.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,6 @@ GSUFFIX_SAVE=$GSUFFIX
export COMIN_GES=$COMIN_GES_ENS
export GSUFFIX=".ensmean$GSUFFIX"

# Do not run global_cycle for ensemble mean
export DOGCYCLE="NO"

###############################################################
# Ensure clean stat tarballs for ensemble mean
for fstat in $CNVSTAT $OZNSTAT $RADSTAT; do
Expand Down

0 comments on commit 7bf492a

Please sign in to comment.