[Ncep.list.fv3-announce] fv3gfs r96049: merge EXP-cyc to teh trunk. update exglobal_fcst an...
Samuel.Trahan at noaa.gov
Samuel.Trahan at noaa.gov
Thu Jul 27 22:13:13 UTC 2017
Friendly fv3gfs developers,
This is an automated email about a fv3gfs commit.
Project: fv3gfs
URL: https://svnemc.ncep.noaa.gov/projects/fv3gfs/trunk
Revision: 96049
Author: fanglin.yang at noaa.gov
Date: 2017-07-26T15:16:25.515422Z
Message:
merge EXP-cyc to teh trunk. update exglobal_fcst and fvegfs workflow
See attached file for full differences.
First 4000 bytes of differences:
Index: checkout/gfs_workflow.v15.0.0/ush
===================================================================
--- checkout/gfs_workflow.v15.0.0/ush (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/ush (revision 96049)
Property changes on: checkout/gfs_workflow.v15.0.0/ush
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs_workflow.v15.0.0/ush:r94537-96048
Index: checkout/gfs_workflow.v15.0.0/scripts
===================================================================
--- checkout/gfs_workflow.v15.0.0/scripts (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/scripts (revision 96049)
Property changes on: checkout/gfs_workflow.v15.0.0/scripts
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs_workflow.v15.0.0/scripts:r94537-96048
Index: checkout/gfs_workflow.v15.0.0/bin
===================================================================
--- checkout/gfs_workflow.v15.0.0/bin (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/bin (revision 96049)
Property changes on: checkout/gfs_workflow.v15.0.0/bin
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs_workflow.v15.0.0/bin:r94537-96048
Index: checkout/gfs_workflow.v15.0.0/exp
===================================================================
--- checkout/gfs_workflow.v15.0.0/exp (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/exp (revision 96049)
Property changes on: checkout/gfs_workflow.v15.0.0/exp
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs_workflow.v15.0.0/exp:r94537-96048
Index: checkout/gfs_workflow.v15.0.0/jobs
===================================================================
--- checkout/gfs_workflow.v15.0.0/jobs (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/jobs (revision 96049)
Property changes on: checkout/gfs_workflow.v15.0.0/jobs
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs_workflow.v15.0.0/jobs:r94537-96048
Index: checkout/gfs_workflow.v15.0.0/util
===================================================================
--- checkout/gfs_workflow.v15.0.0/util (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/util (revision 96049)
Property changes on: checkout/gfs_workflow.v15.0.0/util
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs_workflow.v15.0.0/util:r94537-96048
Index: checkout/gfs_workflow.v15.0.0/fv3gfs/ush/setup_workflow.py
===================================================================
--- checkout/gfs_workflow.v15.0.0/fv3gfs/ush/setup_workflow.py (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/fv3gfs/ush/setup_workflow.py (revision 96049)
@@ -273,8 +273,7 @@
strings.append('\t<!ENTITY EDATE "%s">\n' % base['EDATE'].strftime('%Y%m%d%H%M'))
strings.append('\n')
strings.append('\t<!ENTITY REALTIME "%s">\n' % base['REALTIME'])
- if base['REALTIME'] in ['T']:
- strings.append('\t<!ENTITY DMPDIR "%s">\n' % base['DMPDIR'])
+ strings.append('\t<!ENTITY DMPDIR "%s">\n' % base['DMPDIR'])
strings.append('\n')
strings.append('\t<!-- Experiment and Rotation directory -->\n')
strings.append('\t<!ENTITY EXPDIR "%s">\n' % base['EXPDIR'])
@@ -508,7 +507,7 @@
return ''.join(task)
-def get_gdasgfs_tasks(realtime='F', cdump='gdas', dohybvar='NO'):
+def get_gdasgfs_tasks(cdump='gdas', dohybvar='NO'):
'''
Create GDAS or GFS tasks
'''
@@ -525,13 +524,10 @@
deps = []
dep_dict = {'name':'post', 'type':'task', 'offset':'
... see attachment for the rest ...
-------------- next part --------------
Index: checkout/gfs_workflow.v15.0.0/ush
===================================================================
--- checkout/gfs_workflow.v15.0.0/ush (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/ush (revision 96049)
Property changes on: checkout/gfs_workflow.v15.0.0/ush
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs_workflow.v15.0.0/ush:r94537-96048
Index: checkout/gfs_workflow.v15.0.0/scripts
===================================================================
--- checkout/gfs_workflow.v15.0.0/scripts (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/scripts (revision 96049)
Property changes on: checkout/gfs_workflow.v15.0.0/scripts
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs_workflow.v15.0.0/scripts:r94537-96048
Index: checkout/gfs_workflow.v15.0.0/bin
===================================================================
--- checkout/gfs_workflow.v15.0.0/bin (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/bin (revision 96049)
Property changes on: checkout/gfs_workflow.v15.0.0/bin
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs_workflow.v15.0.0/bin:r94537-96048
Index: checkout/gfs_workflow.v15.0.0/exp
===================================================================
--- checkout/gfs_workflow.v15.0.0/exp (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/exp (revision 96049)
Property changes on: checkout/gfs_workflow.v15.0.0/exp
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs_workflow.v15.0.0/exp:r94537-96048
Index: checkout/gfs_workflow.v15.0.0/jobs
===================================================================
--- checkout/gfs_workflow.v15.0.0/jobs (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/jobs (revision 96049)
Property changes on: checkout/gfs_workflow.v15.0.0/jobs
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs_workflow.v15.0.0/jobs:r94537-96048
Index: checkout/gfs_workflow.v15.0.0/util
===================================================================
--- checkout/gfs_workflow.v15.0.0/util (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/util (revision 96049)
Property changes on: checkout/gfs_workflow.v15.0.0/util
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs_workflow.v15.0.0/util:r94537-96048
Index: checkout/gfs_workflow.v15.0.0/fv3gfs/ush/setup_workflow.py
===================================================================
--- checkout/gfs_workflow.v15.0.0/fv3gfs/ush/setup_workflow.py (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/fv3gfs/ush/setup_workflow.py (revision 96049)
@@ -273,8 +273,7 @@
strings.append('\t<!ENTITY EDATE "%s">\n' % base['EDATE'].strftime('%Y%m%d%H%M'))
strings.append('\n')
strings.append('\t<!ENTITY REALTIME "%s">\n' % base['REALTIME'])
- if base['REALTIME'] in ['T']:
- strings.append('\t<!ENTITY DMPDIR "%s">\n' % base['DMPDIR'])
+ strings.append('\t<!ENTITY DMPDIR "%s">\n' % base['DMPDIR'])
strings.append('\n')
strings.append('\t<!-- Experiment and Rotation directory -->\n')
strings.append('\t<!ENTITY EXPDIR "%s">\n' % base['EXPDIR'])
@@ -508,7 +507,7 @@
return ''.join(task)
-def get_gdasgfs_tasks(realtime='F', cdump='gdas', dohybvar='NO'):
+def get_gdasgfs_tasks(cdump='gdas', dohybvar='NO'):
'''
Create GDAS or GFS tasks
'''
@@ -525,13 +524,10 @@
deps = []
dep_dict = {'name':'post', 'type':'task', 'offset':'-06:00:00'}
deps.append(rocoto.add_dependency(dep_dict))
- if realtime in ['T']:
- data = '&DMPDIR;/@Y at m@d at H/%s/%s.t at Hz.updated.status.tm00.bufr_d' % (cdump, cdump)
- dep_dict = {'type':'data', 'data':data}
- deps.append(rocoto.add_dependency(dep_dict))
- dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
- else:
- dependencies = rocoto.create_dependency(dep=deps)
+ data = '&DMPDIR;/@Y at m@d at H/%s/%s.t at Hz.updated.status.tm00.bufr_d' % (cdump, cdump)
+ dep_dict = {'type':'data', 'data':data}
+ deps.append(rocoto.add_dependency(dep_dict))
+ dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
task = create_wf_task(taskname, cdump=cdump, envar=envars, dependency=dependencies)
tasks.append(task)
@@ -620,7 +616,7 @@
return ''.join(tasks)
-def get_hyb_tasks(EOMGGROUPS, EFCSGROUPS, cdump='gdas'):
+def get_hyb_tasks(EOMGGROUPS, EFCSGROUPS, EARCGROUPS, cdump='gdas'):
'''
Create Hybrid tasks
'''
@@ -716,13 +712,18 @@
tasks.append(task)
tasks.append('\n')
- # earc
+ # eamn
+ metataskname = 'eamn'
+ varname = 'grp'
+ varval = EARCGROUPS
taskname = 'earc'
deps = []
dep_dict = {'name':'epos', 'type':'task'}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep=deps)
- task = create_wf_task(taskname, cdump=cdump, envar=envars, dependency=dependencies)
+ earcenvars = envars + [ensgrp]
+ task = create_wf_task(taskname, cdump=cdump, envar=earcenvars, dependency=dependencies, \
+ metatask=metataskname, varname=varname, varval=varval)
tasks.append(task)
tasks.append('\n')
@@ -826,7 +827,7 @@
# Get GDAS related entities, resources, workflow
gdas_resources = get_gdasgfs_resources(dict_configs)
- gdas_tasks = get_gdasgfs_tasks(dohybvar=base['DOHYBVAR'], realtime=base['REALTIME'])
+ gdas_tasks = get_gdasgfs_tasks(dohybvar=base['DOHYBVAR'])
# Get hybrid related entities, resources, workflow
if base['DOHYBVAR'] == "YES":
@@ -835,21 +836,25 @@
nens = base['NMEM_ENKF']
eobs = dict_configs['eobs']
efcs = dict_configs['efcs']
+ earc = dict_configs['earc']
nens_eomg = eobs['NMEM_EOMGGRP']
nens_efcs = efcs['NMEM_EFCSGRP']
+ nens_earc = earc['NMEM_EARCGRP']
neomg_grps = nens / nens_eomg
nefcs_grps = nens / nens_efcs
+ nearc_grps = nens / nens_earc
EOMGGROUPS = ' '.join(['%02d' % x for x in range(1, neomg_grps+1)])
EFCSGROUPS = ' '.join(['%02d' % x for x in range(1, nefcs_grps+1)])
+ EARCGROUPS = ' '.join(['%02d' % x for x in range(0, nearc_grps+1)])
hyb_resources = get_hyb_resources(dict_configs)
- hyb_tasks = get_hyb_tasks(EOMGGROUPS, EFCSGROUPS)
+ hyb_tasks = get_hyb_tasks(EOMGGROUPS, EFCSGROUPS, EARCGROUPS )
# Get GFS cycle related entities, resources, workflow
if base['gfs_cyc'] != 0:
gfs_dates = get_gfs_dates(base)
gfs_resources = get_gdasgfs_resources(dict_configs, cdump='gfs')
- gfs_tasks = get_gdasgfs_tasks(cdump='gfs', dohybvar=base['DOHYBVAR'], realtime=base['REALTIME'])
+ gfs_tasks = get_gdasgfs_tasks(cdump='gfs', dohybvar=base['DOHYBVAR'])
xmlfile = []
xmlfile.append(preamble)
Index: checkout/gfs_workflow.v15.0.0/fv3gfs/ush/setup_expt.py
===================================================================
--- checkout/gfs_workflow.v15.0.0/fv3gfs/ush/setup_expt.py (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/fv3gfs/ush/setup_expt.py (revision 96049)
@@ -16,6 +16,9 @@
from argparse import ArgumentParser,ArgumentDefaultsHelpFormatter
+machines = ['THEIA', 'WCOSS_C']
+
+
def create_EXPDIR(expdir, configdir):
if configdir is None:
@@ -71,7 +74,18 @@
fh = open(base_config,'r')
lines = fh.readlines()
fh.close()
+
lines = [l.replace('@MACHINE@', machine.upper()) for l in lines]
+
+ # Only keep current machine information, remove others
+ # A better way would be to cat from another machine specific file
+ for m in machines:
+ if m in [machine.upper()]:
+ continue
+ ind_begin = lines.index('# BEGIN: %s\n' % m)
+ ind_end = lines.index('# END: %s\n' % m)
+ lines = lines[:ind_begin] + lines[ind_end+1:]
+
lines = [l.replace('@PSLOT@', pslot) for l in lines]
lines = [l.replace('@SDATE@', idate.strftime('%Y%m%d%H')) for l in lines]
if expdir is not None:
@@ -102,7 +116,7 @@
link initial condition files from $ICSDIR to $COMROT'''
parser = ArgumentParser(description=description,formatter_class=ArgumentDefaultsHelpFormatter)
- parser.add_argument('--machine', help='machine name', type=str, choices=['THEIA', 'WCOSS_C'], default='WCOSS_C', required=False)
+ parser.add_argument('--machine', help='machine name', type=str, choices=machines, default='WCOSS_C', required=False)
parser.add_argument('--pslot', help='parallel experiment name', type=str, required=True)
parser.add_argument('--configdir', help='full path to directory containing the config files', type=str, required=False, default=None)
parser.add_argument('--idate', help='date of initial conditions', type=str, required=False, default='2016100100')
Index: checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.anal
===================================================================
--- checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.anal (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.anal (revision 96049)
@@ -16,12 +16,7 @@
. $EXPDIR/config.resources anal
export ANALYSISSH="$BASE_GSI/scripts/exglobal_analysis_fv3gfs.sh.ecf"
-export GSIEXEC="$BASE_GSI/src/global_gsi"
export npe_gsi=$npe_anal
export nth_gsi=4
-#export BERROR="$EXPDIR/global_berror.l63y386.f77"
-#export ANAVINFO="$EXPDIR/global_anavinfo.l63.txt"
-#export HYBENSINFO="$EXPDIR/global_hybens_info.l63.txt"
-
echo "END: config.anal"
Index: checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.efcs
===================================================================
--- checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.efcs (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.efcs (revision 96049)
@@ -26,11 +26,17 @@
export RERUN_EFCSGRP="NO"
# Stochastic physics parameters (only for ensemble forecasts)
-export USE_STOCH_PHYS="NO"
-export SET_STP_SEED="NO"
+export SET_STP_SEED="YES"
+export DO_SKEB=".false."
+export SKEB=0.8
+export SKEB_TAU=21600.
+export SKEB_LSCALE=500000.
+export SKEBNORM=1
+export DO_SHUM=".false."
export SHUM=0.006
export SHUM_TAU=21600.
export SHUM_LSCALE=250000.
+export DO_SPPT=".false."
export SPPT=0.8
export SPPT_TAU=21600.
export SPPT_LSCALE=500000.
Index: checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.eupd
===================================================================
--- checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.eupd (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.eupd (revision 96049)
@@ -16,7 +16,6 @@
. $EXPDIR/config.resources eupd
export ENKFUPDSH="$BASE_GSI/scripts/EnKF/scripts_ncep/exglobal_enkf_update_fv3gfs.sh.ecf"
-export ENKFEXEC="$BASE_GSI/src/enkf/global_enkf"
export npe_enkf=$npe_eupd
export nth_enkf=4
Index: checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.fcst
===================================================================
--- checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.fcst (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.fcst (revision 96049)
@@ -29,8 +29,8 @@
# Otherwise, the ensemble forecast will inherit from config.fcst
# Model configuration
-export TYPE="hydro"
-export MONO="mono"
+export TYPE="nh"
+export MONO="non-mono"
export do_vort_damp=".true." # vorticity and divergence damping
export consv_te="0." # conserve total energy
Index: checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.base
===================================================================
--- checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.base (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.base (revision 96049)
@@ -15,119 +15,94 @@
# Machine environment
export machine="@MACHINE@"
+# BEGIN: THEIA
# Account, queue, etc.
-if [ $machine = "THEIA" ]; then
+export ACCOUNT="da-cpu"
+export QUEUE="batch"
+export QUEUE_ARCH="service"
- export ACCOUNT="da-cpu"
- export QUEUE="batch"
- export QUEUE_ARCH="service"
+# GLOBAL static environment parameters
+export NWPROD="/scratch4/NCEPDEV/global/save/glopara/nwpara"
+export DMPDIR="/scratch4/NCEPDEV/global/noscrub/dump"
+export RTMFIX="/scratch4/NCEPDEV/da/save/Michael.Lueken/nwprod/lib/crtm/2.2.3/fix_update"
-elif [ $machine = "WCOSS_C" ]; then
+# Machine specific paths used everywhere
+# USER specific paths
+export HOMEDIR="/scratch4/NCEPDEV/global/save/$USER"
+export STMP="/scratch3/NCEPDEV/stmp1/$USER"
+export PTMP="/scratch3/NCEPDEV/stmp2/$USER"
+export NOSCRUB="/scratch4/NCEPDEV/global/noscrub/$USER"
- export ACCOUNT="FV3GFS-T2O"
- export QUEUE="dev"
- export QUEUE_ARCH="dev_transfer"
+# Base directories for various builds
+export BASE_SVN="/scratch4/NCEPDEV/global/save/glopara/svn"
+export MYBASE_SVN="/scratch4/NCEPDEV/global/save/$USER/svn"
+export BASE_GFS="/scratch4/NCEPDEV/global/save/glopara/svn/gfs/branches/gfs_q3fy17/global_shared.v14.1.0"
-fi
+# Utilities needed in the scripts (mostly post)
+export NEMSIOGET="$NWPROD/util/exec/nemsio_get"
+export NDATE="$NWPROD/util/exec/ndate"
+export NHOUR="$NWPROD/util/exec/nhour"
+export WGRIB="$NWPROD/util/exec/wgrib"
+export WGRIB2="$NWPROD/util/exec/wgrib2"
+export COPYGB="$NWPROD/util/exec/copygb"
+export COPYGB2="$NWPROD/util/exec/copygb2"
+export GRBINDEX="$NWPROD/util/exec/grbindex"
+export GRB2INDEX="$NWPROD/util/exec/grb2index"
+export GRBINDEX2="$NWPROD/util/exec/grb2index"
+export CNVGRIB="/apps/cnvgrib/1.4.0/bin/cnvgrib"
-# Load modules specific on WCOSS and WCOSS-Cray
-if [ $machine = "WCOSS" ]; then
+# Post requires grib2 table
+export POSTGRB2TBL="/scratch3/NCEPDEV/nwprod/lib/sorc/g2tmpl/params_grib2_tbl_new"
+# END: THEIA
- . /usrx/local/Modules/3.2.10/init/ksh
+# BEGIN: WCOSS_C
+# Account, queue, etc.
+export ACCOUNT="FV3GFS-T2O"
+export QUEUE="dev"
+export QUEUE_ARCH="dev_transfer"
-elif [ $machine = "WCOSS_C" ]; then
+# Load specific modules
+. $MODULESHOME/init/ksh >> /dev/null 2>&1
+module load PrgEnv-intel >> /dev/null 2>&1
+module load cray-mpich >> /dev/null 2>&1
+module load hpss >> /dev/null 2>&1
+module load g2tmpl-intel/1.4.0 >> /dev/null 2>&1
- . $MODULESHOME/init/ksh >> /dev/null 2>&1
- module load PrgEnv-intel >> /dev/null 2>&1
- module load cray-mpich >> /dev/null 2>&1
- module load hpss >> /dev/null 2>&1
- module load g2tmpl-intel/1.4.0 >> /dev/null 2>&1
-
-fi
-
# GLOBAL static environment parameters
-if [ $machine = "THEIA" ]; then
-
- export NWPROD="/scratch4/NCEPDEV/global/save/glopara/nwpara"
- export DMPDIR="/scratch4/NCEPDEV/global/noscrub/dump"
- export RTMFIX="/scratch4/NCEPDEV/da/save/Michael.Lueken/nwprod/lib/crtm/2.2.3/fix_update"
-
-elif [ $machine = "WCOSS_C" ]; then
-
- export NWPROD="/gpfs/hps/nco/ops/nwprod"
- if [ -d /gpfs/tp1 ]; then
- export SITE="LUNA"
- export DMPDIR="/gpfs/tp1/emc/globaldump"
- elif [ -d /gpfs/gp1 ]; then
- export SITE="SURGE"
- export DMPDIR="/gpfs/gp1/emc/globaldump"
- fi
- module load crtm-intel/2.2.4 >> /dev/null 2>&1
- export RTMFIX=$CRTM_FIX
-
+export NWPROD="/gpfs/hps/nco/ops/nwprod"
+if [ -d /gpfs/tp1 ]; then
+ export SITE="LUNA"
+ export DMPDIR="/gpfs/tp1/emc/globaldump"
+elif [ -d /gpfs/gp1 ]; then
+ export SITE="SURGE"
+ export DMPDIR="/gpfs/gp1/emc/globaldump"
fi
+module load crtm-intel/2.2.4 >> /dev/null 2>&1
+export RTMFIX=$CRTM_FIX
# Machine specific paths used everywhere
-if [ $machine = "THEIA" ]; then
+# USER specific paths
+export HOMEDIR="/gpfs/hps/emc/global/noscrub/$USER"
+export STMP="/gpfs/hps/stmp/$USER"
+export PTMP="/gpfs/hps/ptmp/$USER"
+export NOSCRUB="/gpfs/hps/emc/global/noscrub/$USER"
- # USER specific paths
- export HOMEDIR="/scratch4/NCEPDEV/global/save/$USER"
- export STMP="/scratch3/NCEPDEV/stmp1/$USER"
- export PTMP="/scratch3/NCEPDEV/stmp2/$USER"
- export NOSCRUB="/scratch4/NCEPDEV/global/noscrub/$USER"
+# Base directories for various builds
+export BASE_SVN="/gpfs/hps/emc/global/noscrub/emc.glopara/svn"
+export MYBASE_SVN="/gpfs/hps/emc/global/noscrub/$USER/svn"
+export BASE_GFS="/gpfs/hps/emc/global/noscrub/emc.glopara/svn/gfs/q3fy17_final/global_shared.v14.1.0"
- # Base directories for various builds
- export BASE_SVN="/scratch4/NCEPDEV/global/save/glopara/svn"
- export MYBASE_SVN="/scratch4/NCEPDEV/global/save/$USER/svn"
- export BASE_GFS="/scratch4/NCEPDEV/global/save/glopara/svn/gfs/branches/gfs_q3fy17/global_shared.v14.1.0"
-
-elif [ $machine = "WCOSS_C" ]; then
-
- # USER specific paths
- export HOMEDIR="/gpfs/hps/emc/global/noscrub/$USER"
- export STMP="/gpfs/hps/stmp/$USER"
- export PTMP="/gpfs/hps/ptmp/$USER"
- export NOSCRUB="/gpfs/hps/emc/global/noscrub/$USER"
-
- # Base directories for various builds
- export BASE_SVN="/gpfs/hps/emc/global/noscrub/emc.glopara/svn"
- export MYBASE_SVN="/gpfs/hps/emc/global/noscrub/$USER/svn"
- export BASE_GFS="/gpfs/hps/emc/global/noscrub/emc.glopara/svn/gfs/q3fy17_final/global_shared.v14.1.0"
-
-fi
-
# Utilities needed in the scripts (mostly post)
-if [ $machine = "THEIA" ]; then
+export NEMSIOGET="/gpfs/hps/emc/global/noscrub/emc.glopara/bin/nemsio_get"
+module load grib_util/1.0.3 >> /dev/null 2>&1
+module load prod_util/1.0.7 >> /dev/null 2>&1
- export NEMSIOGET="$NWPROD/util/exec/nemsio_get"
- export NDATE="$NWPROD/util/exec/ndate"
- export NHOUR="$NWPROD/util/exec/nhour"
- export WGRIB="$NWPROD/util/exec/wgrib"
- export WGRIB2="$NWPROD/util/exec/wgrib2"
- export COPYGB="$NWPROD/util/exec/copygb"
- export COPYGB2="$NWPROD/util/exec/copygb2"
- export GRBINDEX="$NWPROD/util/exec/grbindex"
- export GRB2INDEX="$NWPROD/util/exec/grb2index"
- export GRBINDEX2="$NWPROD/util/exec/grb2index"
- export CNVGRIB="/apps/cnvgrib/1.4.0/bin/cnvgrib"
+export USE_CFP="YES"
+module load cfp-intel-sandybridge/1.1.0 >> /dev/null 2>&1
-elif [ $machine = "WCOSS_C" ]; then
-
- export NEMSIOGET="/gpfs/hps/emc/global/noscrub/emc.glopara/bin/nemsio_get"
- module load grib_util/1.0.3 >> /dev/null 2>&1
- module load prod_util/1.0.7 >> /dev/null 2>&1
-
- export USE_CFP="YES"
- module load cfp-intel-sandybridge/1.1.0 >> /dev/null 2>&1
-
-fi
-
# Post requires grib2 table
-if [ $machine = "WCOSS_C" ]; then
- export POSTGRB2TBL="/gpfs/hps/nco/ops/nwprod/lib/g2tmpl/v1.3.0/src/params_grib2_tbl_new"
-elif [ $machine = "THEIA" ]; then
- export POSTGRB2TBL="/scratch3/NCEPDEV/nwprod/lib/sorc/g2tmpl/params_grib2_tbl_new"
-fi
+export POSTGRB2TBL="/gpfs/hps/nco/ops/nwprod/lib/g2tmpl/v1.3.0/src/params_grib2_tbl_new"
+# END: WCOSS_C
####################################################
# DO NOT ADD MACHINE DEPENDENT STUFF BELOW THIS LINE
@@ -151,7 +126,7 @@
export NMV="/bin/mv"
export NLN="/bin/ln -sf"
export VERBOSE="YES"
-export KEEPDATA="YES"
+export KEEPDATA="NO"
export NCO_NAMING_CONV="YES"
# Machine environment, jobs, and other utility scripts
@@ -184,7 +159,7 @@
export FHOUT=3
# GFS cycle info
-export gfs_cyc=1 # 0: no GFS cycle, 1: 00Z only, 2: 00Z and 12Z only, 4: all 4 cycles.
+export gfs_cyc=0 # 0: no GFS cycle, 1: 00Z only, 2: 00Z and 12Z only, 4: all 4 cycles.
# GFS output and frequency
export FHMIN_GFS=0
@@ -212,7 +187,6 @@
fi
# Shared scripts
-export REGRID_NEMSIO_SH="$BASE_GSM/ush/fv3gfs_regrid_nemsio.sh"
# Shared tables
export REGRID_NEMSIO_TBL="$BASE_GSM/parm/parm_fv3diag/variable_table_da.txt"
Index: checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.earc
===================================================================
--- checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.earc (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/fv3gfs/config/config.earc (revision 96049)
@@ -15,4 +15,6 @@
# Get task specific resources
. $EXPDIR/config.resources earc
+export NMEM_EARCGRP=10
+
echo "END: config.earc"
Index: checkout/gfs_workflow.v15.0.0/fv3gfs/jobs/eomg.sh
===================================================================
--- checkout/gfs_workflow.v15.0.0/fv3gfs/jobs/eomg.sh (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/fv3gfs/jobs/eomg.sh (revision 96049)
@@ -89,5 +89,20 @@
[[ $status -ne 0 ]] && exit $status
###############################################################
+# Double check the status of members in ENSGRP
+EOMGGRP=$ROTDIR/enkf.${CDUMP}.$cymd/$chh/eomg.grp${ENSGRP}
+if [ -f $EOMGGRP ]; then
+ npass=$(grep "PASS" $EOMGGRP | wc -l)
+else
+ npass=0
+fi
+echo "$npass/$NMEM_EOMGGRP members successfull in eomg.grp$ENSGRP"
+if [ $npass -ne $NMEM_EOMGGRP ]; then
+ echo "ABORT!"
+ cat $EOMGGRP
+ exit 99
+fi
+
+###############################################################
# Exit out cleanly
exit 0
Index: checkout/gfs_workflow.v15.0.0/fv3gfs/jobs/earc.sh
===================================================================
--- checkout/gfs_workflow.v15.0.0/fv3gfs/jobs/earc.sh (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/fv3gfs/jobs/earc.sh (revision 96049)
@@ -15,6 +15,7 @@
## EXPDIR : /full/path/to/config/files
## CDATE : current analysis date (YYYYMMDDHH)
## CDUMP : cycle name (gdas / gfs)
+## ENSGRP : ensemble sub-group to archive (0, 1, 2, ...)
###############################################################
###############################################################
@@ -37,138 +38,148 @@
COMIN_ENS="$ROTDIR/enkf.$CDUMP.$cymd/$chh"
-DATA="$RUNDIR/$CDATE/$CDUMP/earc"
+DATA="$RUNDIR/$CDATE/$CDUMP/earc$ENSGRP"
[[ -d $DATA ]] && rm -rf $DATA
mkdir -p $DATA
cd $DATA
###############################################################
-# Archive what is needed to restart the experiment
-mkdir -p $DATA/enkf.${CDUMP}restart
-cd $DATA/enkf.${CDUMP}restart
+# ENSGRP -gt 0 archives ensemble member restarts
+if [ $ENSGRP -gt 0 ]; then
-for imem in `seq 1 $NMEM_ENKF`; do
+ mkdir -p $DATA/enkf.${CDUMP}restart
+ cd $DATA/enkf.${CDUMP}restart
- memchar="mem"`printf %03i $imem`
+ # Get ENSBEG/ENSEND from ENSGRP and NMEM_EARCGRP
+ ENSEND=$(echo "$NMEM_EARCGRP * $ENSGRP" | bc)
+ ENSBEG=$(echo "$ENSEND - $NMEM_EARCGRP + 1" | bc)
- memdir="$COMIN_ENS/$memchar"
- tmpmemdir="$DATA/enkf.${CDUMP}restart/$memchar"
+ for imem in `seq $ENSBEG $ENSEND`; do
- mkdir -p $tmpmemdir
- cd $tmpmemdir
+ memchar="mem"`printf %03i $imem`
- restart_dir="$memdir/RESTART"
- if [ -d $restart_dir ]; then
- mkdir -p RESTART
- files=`ls -1 $restart_dir`
- for file in $files; do
- $NCP $restart_dir/$file RESTART/$file
- done
- fi
+ memdir="$COMIN_ENS/$memchar"
+ tmpmemdir="$DATA/enkf.${CDUMP}restart/$memchar"
- increment_file="$memdir/${APREFIX}atminc.nc"
- [[ -f $increment_file ]] && $NCP $increment_file .
+ mkdir -p $tmpmemdir
+ cd $tmpmemdir
- cd $DATA/enkf.${CDUMP}restart
+ restart_dir="$memdir/RESTART"
+ if [ -d $restart_dir ]; then
+ mkdir -p RESTART
+ files=`ls -1 $restart_dir`
+ for file in $files; do
+ $NCP $restart_dir/$file RESTART/$file
+ done
+ fi
- htar -P -cvf $ATARDIR/$CDATE/enkf.${CDUMP}restart.$memchar.tar $memchar
- status=$?
- if [ $status -ne 0 ]; then
- echo "HTAR $CDATE enkf.${CDUMP}restart.$memchar.tar failed"
- exit $status
- fi
+ increment_file="$memdir/${APREFIX}atminc.nc"
+ [[ -f $increment_file ]] && $NCP $increment_file .
- hsi ls -l $ATARDIR/$CDATE/enkf.${CDUMP}restart.$memchar.tar
- status=$?
- if [ $status -ne 0 ]; then
- echo "HSI $CDATE enkf.${CDUMP}restart.$memchar.tar failed"
- exit $status
- fi
+ cd $DATA/enkf.${CDUMP}restart
- rm -rf $tmpmemdir
+ htar -P -cvf $ATARDIR/$CDATE/enkf.${CDUMP}restart.$memchar.tar $memchar
+ status=$?
+ if [ $status -ne 0 ]; then
+ echo "HTAR $CDATE enkf.${CDUMP}restart.$memchar.tar failed"
+ exit $status
+ fi
-done
+ hsi ls -l $ATARDIR/$CDATE/enkf.${CDUMP}restart.$memchar.tar
+ status=$?
+ if [ $status -ne 0 ]; then
+ echo "HSI $CDATE enkf.${CDUMP}restart.$memchar.tar failed"
+ exit $status
+ fi
-cd $DATA
+ rm -rf $tmpmemdir
-rm -rf enkf.${CDUMP}restart
+ done
-###############################################################
-# Archive extra information that is good to have
-mkdir -p $DATA/enkf.$CDUMP
-cd $DATA/enkf.$CDUMP
+ cd $DATA
-# Ensemble mean related files
-files="gsistat.ensmean cnvstat.ensmean enkfstat atmf006.ensmean.nc4 atmf006.ensspread.nc4"
-for file in $files; do
- $NCP $COMIN_ENS/${APREFIX}$file .
-done
+ rm -rf enkf.${CDUMP}restart
-# Ensemble member related files
-files="gsistat cnvstat"
-for imem in `seq 1 $NMEM_ENKF`; do
+else # ENSGRP 0 archives extra info, ensemble mean, verification stuff and cleans up
- memchar="mem"`printf %03i $imem`
+ ###############################################################
+ # Archive extra information that is good to have
+ mkdir -p $DATA/enkf.$CDUMP
+ cd $DATA/enkf.$CDUMP
- memdir="$COMIN_ENS/$memchar"
- tmpmemdir="$DATA/enkf.${CDUMP}/$memchar"
+ # Ensemble mean related files
+ files="gsistat.ensmean cnvstat.ensmean enkfstat atmf006.ensmean.nc4 atmf006.ensspread.nc4"
+ for file in $files; do
+ $NCP $COMIN_ENS/${APREFIX}$file .
+ done
- mkdir -p $tmpmemdir
+ # Ensemble member related files
+ files="gsistat cnvstat"
+ for imem in `seq 1 $NMEM_ENKF`; do
- for file in $files; do
- $NCP $memdir/${APREFIX}$file $tmpmemdir/.
+ memchar="mem"`printf %03i $imem`
+
+ memdir="$COMIN_ENS/$memchar"
+ tmpmemdir="$DATA/enkf.${CDUMP}/$memchar"
+
+ mkdir -p $tmpmemdir
+
+ for file in $files; do
+ $NCP $memdir/${APREFIX}$file $tmpmemdir/.
+ done
+
+ cd $DATA/enkf.$CDUMP
+
done
- cd $DATA/enkf.$CDUMP
+ cd $DATA
-done
+ htar -P -cvf $ATARDIR/$CDATE/enkf.${CDUMP}.tar enkf.$CDUMP
+ status=$?
+ if [ $status -ne 0 ]; then
+ echo "HTAR $CDATE enkf.${CDUMP}.tar failed"
+ exit $status
+ fi
-cd $DATA
+ hsi ls -l $ATARDIR/$CDATE/enkf.${CDUMP}.tar
+ status=$?
+ if [ $status -ne 0 ]; then
+ echo "HSI $CDATE enkf.${CDUMP}.tar failed"
+ exit $status
+ fi
-htar -P -cvf $ATARDIR/$CDATE/enkf.${CDUMP}.tar enkf.$CDUMP
-status=$?
-if [ $status -ne 0 ]; then
- echo "HTAR $CDATE enkf.${CDUMP}.tar failed"
- exit $status
-fi
+ rm -rf enkf.$CDUMP
-hsi ls -l $ATARDIR/$CDATE/enkf.${CDUMP}.tar
-status=$?
-if [ $status -ne 0 ]; then
- echo "HSI $CDATE enkf.${CDUMP}.tar failed"
- exit $status
-fi
+ ###############################################################
+ # Archive online for verification and diagnostics
+ [[ ! -d $ARCDIR ]] && mkdir -p $ARCDIR
+ cd $ARCDIR
-rm -rf enkf.$CDUMP
+ $NCP $COMIN_ENS/${APREFIX}enkfstat enkfstat.${CDUMP}.$CDATE
+ $NCP $COMIN_ENS/${APREFIX}gsistat.ensmean gsistat.${CDUMP}.${CDATE}.ensmean
-###############################################################
-# Archive online for verification and diagnostics
-[[ ! -d $ARCDIR ]] && mkdir -p $ARCDIR
-cd $ARCDIR
+ ###############################################################
+ # Clean up previous cycles; various depths
+ # PRIOR CYCLE: Leave the prior cycle alone
+ GDATE=`$NDATE -$assim_freq $CDATE`
-$NCP $COMIN_ENS/${APREFIX}enkfstat enkfstat.${CDUMP}.$CDATE
-$NCP $COMIN_ENS/${APREFIX}gsistat.ensmean gsistat.${CDUMP}.${CDATE}.ensmean
+ # PREVIOUS to the PRIOR CYCLE
+ # Now go 2 cycles back and remove the directory
+ GDATE=`$NDATE -$assim_freq $GDATE`
+ gymd=`echo $GDATE | cut -c1-8`
+ ghh=`echo $GDATE | cut -c9-10`
-###############################################################
-# Clean up previous cycles; various depths
-# PRIOR CYCLE: Leave the prior cycle alone
-GDATE=`$NDATE -$assim_freq $CDATE`
+ COMIN_ENS="$ROTDIR/enkf.$CDUMP.$gymd/$ghh"
+ [[ -d $COMIN_ENS ]] && rm -rf $COMIN_ENS
-# PREVIOUS to the PRIOR CYCLE
-# Now go 2 cycles back and remove the directory
-GDATE=`$NDATE -$assim_freq $GDATE`
-gymd=`echo $GDATE | cut -c1-8`
-ghh=`echo $GDATE | cut -c9-10`
+ # PREVIOUS day 00Z remove the whole day
+ GDATE=`$NDATE -48 $CDATE`
+ gymd=`echo $GDATE | cut -c1-8`
+ ghh=`echo $GDATE | cut -c9-10`
-COMIN_ENS="$ROTDIR/enkf.$CDUMP.$gymd/$ghh"
-[[ -d $COMIN_ENS ]] && rm -rf $COMIN_ENS
+ COMIN_ENS="$ROTDIR/enkf.$CDUMP.$gymd"
+ [[ -d $COMIN_ENS ]] && rm -rf $COMIN_ENS
-# PREVIOUS day 00Z remove the whole day
-GDATE=`$NDATE -48 $CDATE`
-gymd=`echo $GDATE | cut -c1-8`
-ghh=`echo $GDATE | cut -c9-10`
+fi
-COMIN_ENS="$ROTDIR/enkf.$CDUMP.$gymd"
-[[ -d $COMIN_ENS ]] && rm -rf $COMIN_ENS
-
exit 0
Index: checkout/gfs_workflow.v15.0.0/fv3gfs/jobs/fcst.sh
===================================================================
--- checkout/gfs_workflow.v15.0.0/fv3gfs/jobs/fcst.sh (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/fv3gfs/jobs/fcst.sh (revision 96049)
@@ -62,14 +62,6 @@
fi
fi
-# Since we do not update SST, SNOW or ICE via global_cycle;
-# Pass these to the model; it calls surface cycle internally
-if [ $warm_start = ".true." ]; then
- export FNTSFA="$DMPDIR/$CDATE/$CDUMP/${CDUMP}.t${chh}z.sstgrb"
- export FNACNA="$DMPDIR/$CDATE/$CDUMP/${CDUMP}.t${chh}z.engicegrb"
- export FNSNOA="$DMPDIR/$CDATE/$CDUMP/${CDUMP}.t${chh}z.snogrb"
-fi
-
# Forecast length for GFS forecast
if [ $CDUMP = "gfs" ]; then
export FHMIN=$FHMIN_GFS
Index: checkout/gfs_workflow.v15.0.0/fv3gfs/jobs/efcs.sh
===================================================================
--- checkout/gfs_workflow.v15.0.0/fv3gfs/jobs/efcs.sh (revision 95312)
+++ checkout/gfs_workflow.v15.0.0/fv3gfs/jobs/efcs.sh (revision 96049)
@@ -62,14 +62,6 @@
fi
fi
-# Since we do not update SST, SNOW or ICE via global_cycle;
-# Pass these to the model; it calls surface cycle internally
-if [ $warm_start = ".true." ]; then
- export FNTSFA="$DMPDIR/$CDATE/$CDUMP/${CDUMP}.t${chh}z.sstgrb"
- export FNACNA="$DMPDIR/$CDATE/$CDUMP/${CDUMP}.t${chh}z.engicegrb"
- export FNSNOA="$DMPDIR/$CDATE/$CDUMP/${CDUMP}.t${chh}z.snogrb"
-fi
-
# Forecast length for EnKF forecast
export FHMIN=$FHMIN_ENKF
export FHOUT=$FHOUT_ENKF
@@ -82,5 +74,20 @@
[[ $status -ne 0 ]] && exit $status
###############################################################
+# Double check the status of members in ENSGRP
+EFCSGRP=$ROTDIR/enkf.${CDUMP}.$cymd/$chh/efcs.grp${ENSGRP}
+if [ -f $EFCSGRP ]; then
+ npass=$(grep "PASS" $EFCSGRP | wc -l)
+else
+ npass=0
+fi
+echo "$npass/$NMEM_EFCSGRP members successfull in efcs.grp$ENSGRP"
+if [ $npass -ne $NMEM_EFCSGRP ]; then
+ echo "ABORT!"
+ cat $EFCSGRP
+ exit 99
+fi
+
+###############################################################
# Exit out cleanly
exit 0
Index: checkout/gfs_workflow.v15.0.0
===================================================================
--- checkout/gfs_workflow.v15.0.0 (revision 95312)
+++ checkout/gfs_workflow.v15.0.0 (revision 96049)
Property changes on: checkout/gfs_workflow.v15.0.0
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs_workflow.v15.0.0:r94537-96048
Index: checkout/gdas.v15.0.0/ush
===================================================================
--- checkout/gdas.v15.0.0/ush (revision 95312)
+++ checkout/gdas.v15.0.0/ush (revision 96049)
Property changes on: checkout/gdas.v15.0.0/ush
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/ush:r94537-96048
Index: checkout/gdas.v15.0.0/sorc/enkf_update.fd/constants.f90
===================================================================
--- checkout/gdas.v15.0.0/sorc/enkf_update.fd/constants.f90 (revision 95312)
+++ checkout/gdas.v15.0.0/sorc/enkf_update.fd/constants.f90 (revision 96049)
Property changes on: checkout/gdas.v15.0.0/sorc/enkf_update.fd/constants.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/sorc/enkf_update.fd/constants.f90:r94537-96048
Index: checkout/gdas.v15.0.0/sorc/enkf_update.fd/read_aerosol.f90
===================================================================
--- checkout/gdas.v15.0.0/sorc/enkf_update.fd/read_aerosol.f90 (revision 95312)
+++ checkout/gdas.v15.0.0/sorc/enkf_update.fd/read_aerosol.f90 (revision 96049)
Property changes on: checkout/gdas.v15.0.0/sorc/enkf_update.fd/read_aerosol.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/sorc/enkf_update.fd/read_aerosol.f90:r94537-96048
Index: checkout/gdas.v15.0.0/sorc/enkf_update.fd/normal_rh_to_q.f90
===================================================================
--- checkout/gdas.v15.0.0/sorc/enkf_update.fd/normal_rh_to_q.f90 (revision 95312)
+++ checkout/gdas.v15.0.0/sorc/enkf_update.fd/normal_rh_to_q.f90 (revision 96049)
Property changes on: checkout/gdas.v15.0.0/sorc/enkf_update.fd/normal_rh_to_q.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/sorc/enkf_update.fd/normal_rh_to_q.f90:r94537-96048
Index: checkout/gdas.v15.0.0/sorc/enkf_update.fd/read_files.f90
===================================================================
--- checkout/gdas.v15.0.0/sorc/enkf_update.fd/read_files.f90 (revision 95312)
+++ checkout/gdas.v15.0.0/sorc/enkf_update.fd/read_files.f90 (revision 96049)
Property changes on: checkout/gdas.v15.0.0/sorc/enkf_update.fd/read_files.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/sorc/enkf_update.fd/read_files.f90:r94537-96048
Index: checkout/gdas.v15.0.0/sorc/enkf_update.fd/gesinfo.f90
===================================================================
--- checkout/gdas.v15.0.0/sorc/enkf_update.fd/gesinfo.f90 (revision 95312)
+++ checkout/gdas.v15.0.0/sorc/enkf_update.fd/gesinfo.f90 (revision 96049)
Property changes on: checkout/gdas.v15.0.0/sorc/enkf_update.fd/gesinfo.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/sorc/enkf_update.fd/gesinfo.f90:r94537-96048
Index: checkout/gdas.v15.0.0/sorc/enkf_update.fd/bkgvar.f90
===================================================================
--- checkout/gdas.v15.0.0/sorc/enkf_update.fd/bkgvar.f90 (revision 95312)
+++ checkout/gdas.v15.0.0/sorc/enkf_update.fd/bkgvar.f90 (revision 96049)
Property changes on: checkout/gdas.v15.0.0/sorc/enkf_update.fd/bkgvar.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/sorc/enkf_update.fd/bkgvar.f90:r94537-96048
Index: checkout/gdas.v15.0.0/sorc/enkf_update.fd/setupbend.f90
===================================================================
--- checkout/gdas.v15.0.0/sorc/enkf_update.fd/setupbend.f90 (revision 95312)
+++ checkout/gdas.v15.0.0/sorc/enkf_update.fd/setupbend.f90 (revision 96049)
Property changes on: checkout/gdas.v15.0.0/sorc/enkf_update.fd/setupbend.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/sorc/enkf_update.fd/setupbend.f90:r94537-96048
Index: checkout/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2model_ad.f90
===================================================================
--- checkout/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2model_ad.f90 (revision 95312)
+++ checkout/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2model_ad.f90 (revision 96049)
Property changes on: checkout/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2model_ad.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2model_ad.f90:r94537-96048
Index: checkout/gdas.v15.0.0/sorc/enkf_update.fd/ncepnems_io.f90
===================================================================
--- checkout/gdas.v15.0.0/sorc/enkf_update.fd/ncepnems_io.f90 (revision 95312)
+++ checkout/gdas.v15.0.0/sorc/enkf_update.fd/ncepnems_io.f90 (revision 96049)
Property changes on: checkout/gdas.v15.0.0/sorc/enkf_update.fd/ncepnems_io.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/sorc/enkf_update.fd/ncepnems_io.f90:r94537-96048
Index: checkout/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2state_ad.f90
===================================================================
--- checkout/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2state_ad.f90 (revision 95312)
+++ checkout/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2state_ad.f90 (revision 96049)
Property changes on: checkout/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2state_ad.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2state_ad.f90:r94537-96048
Index: checkout/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2model.f90
===================================================================
--- checkout/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2model.f90 (revision 95312)
+++ checkout/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2model.f90 (revision 96049)
Property changes on: checkout/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2model.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2model.f90:r94537-96048
Index: checkout/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2state.f90
===================================================================
--- checkout/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2state.f90 (revision 95312)
+++ checkout/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2state.f90 (revision 96049)
Property changes on: checkout/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2state.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/sorc/enkf_update.fd/ensctl2state.f90:r94537-96048
Index: checkout/gdas.v15.0.0/scripts/exglobal_enkf_update.sh.ecf
===================================================================
--- checkout/gdas.v15.0.0/scripts/exglobal_enkf_update.sh.ecf (revision 95312)
+++ checkout/gdas.v15.0.0/scripts/exglobal_enkf_update.sh.ecf (revision 96049)
Property changes on: checkout/gdas.v15.0.0/scripts/exglobal_enkf_update.sh.ecf
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/scripts/exglobal_enkf_update.sh.ecf:r94537-96048
Index: checkout/gdas.v15.0.0/scripts
===================================================================
--- checkout/gdas.v15.0.0/scripts (revision 95312)
+++ checkout/gdas.v15.0.0/scripts (revision 96049)
Property changes on: checkout/gdas.v15.0.0/scripts
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/scripts:r94537-96048
Index: checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_INFLATE_RECENTER
===================================================================
--- checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_INFLATE_RECENTER (revision 95312)
+++ checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_INFLATE_RECENTER (revision 96049)
Property changes on: checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_INFLATE_RECENTER
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/jobs/JGDAS_ENKF_INFLATE_RECENTER:r94537-96048
Index: checkout/gdas.v15.0.0/jobs/JGDAS_EMCSFC_SFC_PREP
===================================================================
--- checkout/gdas.v15.0.0/jobs/JGDAS_EMCSFC_SFC_PREP (revision 95312)
+++ checkout/gdas.v15.0.0/jobs/JGDAS_EMCSFC_SFC_PREP (revision 96049)
Property changes on: checkout/gdas.v15.0.0/jobs/JGDAS_EMCSFC_SFC_PREP
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/jobs/JGDAS_EMCSFC_SFC_PREP:r94537-96048
Index: checkout/gdas.v15.0.0/jobs/JGDAS_ANALYSIS_HIGH
===================================================================
--- checkout/gdas.v15.0.0/jobs/JGDAS_ANALYSIS_HIGH (revision 95312)
+++ checkout/gdas.v15.0.0/jobs/JGDAS_ANALYSIS_HIGH (revision 96049)
Property changes on: checkout/gdas.v15.0.0/jobs/JGDAS_ANALYSIS_HIGH
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/jobs/JGDAS_ANALYSIS_HIGH:r94537-96048
Index: checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_SELECT_OBS
===================================================================
--- checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_SELECT_OBS (revision 95312)
+++ checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_SELECT_OBS (revision 96049)
Property changes on: checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_SELECT_OBS
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/jobs/JGDAS_ENKF_SELECT_OBS:r94537-96048
Index: checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_UPDATE
===================================================================
--- checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_UPDATE (revision 95312)
+++ checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_UPDATE (revision 96049)
Property changes on: checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_UPDATE
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/jobs/JGDAS_ENKF_UPDATE:r94537-96048
Index: checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_POST
===================================================================
--- checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_POST (revision 95312)
+++ checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_POST (revision 96049)
Property changes on: checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_POST
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/jobs/JGDAS_ENKF_POST:r94537-96048
Index: checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_INNOVATE_OBS
===================================================================
--- checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_INNOVATE_OBS (revision 95312)
+++ checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_INNOVATE_OBS (revision 96049)
Property changes on: checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_INNOVATE_OBS
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/jobs/JGDAS_ENKF_INNOVATE_OBS:r94537-96048
Index: checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_FCST
===================================================================
--- checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_FCST (revision 95312)
+++ checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_FCST (revision 96049)
Property changes on: checkout/gdas.v15.0.0/jobs/JGDAS_ENKF_FCST
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/jobs/JGDAS_ENKF_FCST:r94537-96048
Index: checkout/gdas.v15.0.0/jobs
===================================================================
--- checkout/gdas.v15.0.0/jobs (revision 95312)
+++ checkout/gdas.v15.0.0/jobs (revision 96049)
Property changes on: checkout/gdas.v15.0.0/jobs
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0/jobs:r94537-96048
Index: checkout/gdas.v15.0.0
===================================================================
--- checkout/gdas.v15.0.0 (revision 95312)
+++ checkout/gdas.v15.0.0 (revision 96049)
Property changes on: checkout/gdas.v15.0.0
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gdas.v15.0.0:r94537-96048
Index: checkout/gfs.v15.0.0/ush
===================================================================
--- checkout/gfs.v15.0.0/ush (revision 95312)
+++ checkout/gfs.v15.0.0/ush (revision 96049)
Property changes on: checkout/gfs.v15.0.0/ush
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs.v15.0.0/ush:r94537-96048
Index: checkout/gfs.v15.0.0/sorc/build_wafs_wcoss.sh
===================================================================
--- checkout/gfs.v15.0.0/sorc/build_wafs_wcoss.sh (revision 95312)
+++ checkout/gfs.v15.0.0/sorc/build_wafs_wcoss.sh (revision 96049)
Property changes on: checkout/gfs.v15.0.0/sorc/build_wafs_wcoss.sh
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs.v15.0.0/sorc/build_wafs_wcoss.sh:r94537-96048
Index: checkout/gfs.v15.0.0/scripts
===================================================================
--- checkout/gfs.v15.0.0/scripts (revision 95312)
+++ checkout/gfs.v15.0.0/scripts (revision 96049)
Property changes on: checkout/gfs.v15.0.0/scripts
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs.v15.0.0/scripts:r94537-96048
Index: checkout/gfs.v15.0.0/modulefiles/gfs
===================================================================
--- checkout/gfs.v15.0.0/modulefiles/gfs (revision 95312)
+++ checkout/gfs.v15.0.0/modulefiles/gfs (revision 96049)
Property changes on: checkout/gfs.v15.0.0/modulefiles/gfs
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs.v15.0.0/modulefiles/gfs:r94537-96048
Index: checkout/gfs.v15.0.0/jobs/JGFS_EMCSFC_SFC_PREP
===================================================================
--- checkout/gfs.v15.0.0/jobs/JGFS_EMCSFC_SFC_PREP (revision 95312)
+++ checkout/gfs.v15.0.0/jobs/JGFS_EMCSFC_SFC_PREP (revision 96049)
Property changes on: checkout/gfs.v15.0.0/jobs/JGFS_EMCSFC_SFC_PREP
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs.v15.0.0/jobs/JGFS_EMCSFC_SFC_PREP:r94537-96048
Index: checkout/gfs.v15.0.0/jobs
===================================================================
--- checkout/gfs.v15.0.0/jobs (revision 95312)
+++ checkout/gfs.v15.0.0/jobs (revision 96049)
Property changes on: checkout/gfs.v15.0.0/jobs
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs.v15.0.0/jobs:r94537-96048
Index: checkout/gfs.v15.0.0
===================================================================
--- checkout/gfs.v15.0.0 (revision 95312)
+++ checkout/gfs.v15.0.0 (revision 96049)
Property changes on: checkout/gfs.v15.0.0
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/gfs.v15.0.0:r94537-96048
Index: checkout/global_shared.v15.0.0/ush/emcsfc_snow.sh
===================================================================
--- checkout/global_shared.v15.0.0/ush/emcsfc_snow.sh (revision 95312)
+++ checkout/global_shared.v15.0.0/ush/emcsfc_snow.sh (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/ush/emcsfc_snow.sh
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/ush/emcsfc_snow.sh:r94537-96048
Index: checkout/global_shared.v15.0.0/ush/emcsfc_ice_blend.sh
===================================================================
--- checkout/global_shared.v15.0.0/ush/emcsfc_ice_blend.sh (revision 95312)
+++ checkout/global_shared.v15.0.0/ush/emcsfc_ice_blend.sh (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/ush/emcsfc_ice_blend.sh
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/ush/emcsfc_ice_blend.sh:r94537-96048
Index: checkout/global_shared.v15.0.0/ush/global_chgres.sh
===================================================================
--- checkout/global_shared.v15.0.0/ush/global_chgres.sh (revision 95312)
+++ checkout/global_shared.v15.0.0/ush/global_chgres.sh (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/ush/global_chgres.sh
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/ush/global_chgres.sh:r94537-96048
Index: checkout/global_shared.v15.0.0/ush/syndat_qctropcy.sh
===================================================================
--- checkout/global_shared.v15.0.0/ush/syndat_qctropcy.sh (revision 95312)
+++ checkout/global_shared.v15.0.0/ush/syndat_qctropcy.sh (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/ush/syndat_qctropcy.sh
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/ush/syndat_qctropcy.sh:r94537-96048
Index: checkout/global_shared.v15.0.0/ush/parse-storm-type.pl
===================================================================
--- checkout/global_shared.v15.0.0/ush/parse-storm-type.pl (revision 95312)
+++ checkout/global_shared.v15.0.0/ush/parse-storm-type.pl (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/ush/parse-storm-type.pl
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/ush/parse-storm-type.pl:r94537-96048
Index: checkout/global_shared.v15.0.0/ush
===================================================================
--- checkout/global_shared.v15.0.0/ush (revision 95312)
+++ checkout/global_shared.v15.0.0/ush (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/ush
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/ush:r94537-96048
Index: checkout/global_shared.v15.0.0/sorc/emcsfc_ice_blend.fd
===================================================================
--- checkout/global_shared.v15.0.0/sorc/emcsfc_ice_blend.fd (revision 95312)
+++ checkout/global_shared.v15.0.0/sorc/emcsfc_ice_blend.fd (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/sorc/emcsfc_ice_blend.fd
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/sorc/emcsfc_ice_blend.fd:r94537-96048
Index: checkout/global_shared.v15.0.0/sorc/emcsfc_snow2mdl.fd
===================================================================
--- checkout/global_shared.v15.0.0/sorc/emcsfc_snow2mdl.fd (revision 95312)
+++ checkout/global_shared.v15.0.0/sorc/emcsfc_snow2mdl.fd (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/sorc/emcsfc_snow2mdl.fd
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/sorc/emcsfc_snow2mdl.fd:r94537-96048
Index: checkout/global_shared.v15.0.0/sorc/global_chgres.fd
===================================================================
--- checkout/global_shared.v15.0.0/sorc/global_chgres.fd (revision 95312)
+++ checkout/global_shared.v15.0.0/sorc/global_chgres.fd (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/sorc/global_chgres.fd
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/sorc/global_chgres.fd:r94537-96048
Index: checkout/global_shared.v15.0.0/sorc/global_cycle.fd
===================================================================
--- checkout/global_shared.v15.0.0/sorc/global_cycle.fd (revision 95312)
+++ checkout/global_shared.v15.0.0/sorc/global_cycle.fd (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/sorc/global_cycle.fd
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/sorc/global_cycle.fd:r94537-96048
Index: checkout/global_shared.v15.0.0/sorc/gsi.fd/constants.f90
===================================================================
--- checkout/global_shared.v15.0.0/sorc/gsi.fd/constants.f90 (revision 95312)
+++ checkout/global_shared.v15.0.0/sorc/gsi.fd/constants.f90 (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/sorc/gsi.fd/constants.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/sorc/gsi.fd/constants.f90:r94537-96048
Index: checkout/global_shared.v15.0.0/sorc/gsi.fd/read_aerosol.f90
===================================================================
--- checkout/global_shared.v15.0.0/sorc/gsi.fd/read_aerosol.f90 (revision 95312)
+++ checkout/global_shared.v15.0.0/sorc/gsi.fd/read_aerosol.f90 (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/sorc/gsi.fd/read_aerosol.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/sorc/gsi.fd/read_aerosol.f90:r94537-96048
Index: checkout/global_shared.v15.0.0/sorc/gsi.fd/normal_rh_to_q.f90
===================================================================
--- checkout/global_shared.v15.0.0/sorc/gsi.fd/normal_rh_to_q.f90 (revision 95312)
+++ checkout/global_shared.v15.0.0/sorc/gsi.fd/normal_rh_to_q.f90 (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/sorc/gsi.fd/normal_rh_to_q.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/sorc/gsi.fd/normal_rh_to_q.f90:r94537-96048
Index: checkout/global_shared.v15.0.0/sorc/gsi.fd/read_files.f90
===================================================================
--- checkout/global_shared.v15.0.0/sorc/gsi.fd/read_files.f90 (revision 95312)
+++ checkout/global_shared.v15.0.0/sorc/gsi.fd/read_files.f90 (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/sorc/gsi.fd/read_files.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/sorc/gsi.fd/read_files.f90:r94537-96048
Index: checkout/global_shared.v15.0.0/sorc/gsi.fd/gesinfo.f90
===================================================================
--- checkout/global_shared.v15.0.0/sorc/gsi.fd/gesinfo.f90 (revision 95312)
+++ checkout/global_shared.v15.0.0/sorc/gsi.fd/gesinfo.f90 (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/sorc/gsi.fd/gesinfo.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/sorc/gsi.fd/gesinfo.f90:r94537-96048
Index: checkout/global_shared.v15.0.0/sorc/gsi.fd/bkgvar.f90
===================================================================
--- checkout/global_shared.v15.0.0/sorc/gsi.fd/bkgvar.f90 (revision 95312)
+++ checkout/global_shared.v15.0.0/sorc/gsi.fd/bkgvar.f90 (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/sorc/gsi.fd/bkgvar.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/sorc/gsi.fd/bkgvar.f90:r94537-96048
Index: checkout/global_shared.v15.0.0/sorc/gsi.fd/setupbend.f90
===================================================================
--- checkout/global_shared.v15.0.0/sorc/gsi.fd/setupbend.f90 (revision 95312)
+++ checkout/global_shared.v15.0.0/sorc/gsi.fd/setupbend.f90 (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/sorc/gsi.fd/setupbend.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/sorc/gsi.fd/setupbend.f90:r94537-96048
Index: checkout/global_shared.v15.0.0/sorc/gsi.fd/ensctl2model_ad.f90
===================================================================
--- checkout/global_shared.v15.0.0/sorc/gsi.fd/ensctl2model_ad.f90 (revision 95312)
+++ checkout/global_shared.v15.0.0/sorc/gsi.fd/ensctl2model_ad.f90 (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/sorc/gsi.fd/ensctl2model_ad.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/sorc/gsi.fd/ensctl2model_ad.f90:r94537-96048
Index: checkout/global_shared.v15.0.0/sorc/gsi.fd/ncepnems_io.f90
===================================================================
--- checkout/global_shared.v15.0.0/sorc/gsi.fd/ncepnems_io.f90 (revision 95312)
+++ checkout/global_shared.v15.0.0/sorc/gsi.fd/ncepnems_io.f90 (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/sorc/gsi.fd/ncepnems_io.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/sorc/gsi.fd/ncepnems_io.f90:r94537-96048
Index: checkout/global_shared.v15.0.0/sorc/gsi.fd/ensctl2state_ad.f90
===================================================================
--- checkout/global_shared.v15.0.0/sorc/gsi.fd/ensctl2state_ad.f90 (revision 95312)
+++ checkout/global_shared.v15.0.0/sorc/gsi.fd/ensctl2state_ad.f90 (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/sorc/gsi.fd/ensctl2state_ad.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/sorc/gsi.fd/ensctl2state_ad.f90:r94537-96048
Index: checkout/global_shared.v15.0.0/sorc/gsi.fd/ensctl2model.f90
===================================================================
--- checkout/global_shared.v15.0.0/sorc/gsi.fd/ensctl2model.f90 (revision 95312)
+++ checkout/global_shared.v15.0.0/sorc/gsi.fd/ensctl2model.f90 (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/sorc/gsi.fd/ensctl2model.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/sorc/gsi.fd/ensctl2model.f90:r94537-96048
Index: checkout/global_shared.v15.0.0/sorc/gsi.fd/ensctl2state.f90
===================================================================
--- checkout/global_shared.v15.0.0/sorc/gsi.fd/ensctl2state.f90 (revision 95312)
+++ checkout/global_shared.v15.0.0/sorc/gsi.fd/ensctl2state.f90 (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/sorc/gsi.fd/ensctl2state.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/sorc/gsi.fd/ensctl2state.f90:r94537-96048
Index: checkout/global_shared.v15.0.0/scripts/exemcsfc_global_sfc_prep.sh.ecf
===================================================================
--- checkout/global_shared.v15.0.0/scripts/exemcsfc_global_sfc_prep.sh.ecf (revision 95312)
+++ checkout/global_shared.v15.0.0/scripts/exemcsfc_global_sfc_prep.sh.ecf (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/scripts/exemcsfc_global_sfc_prep.sh.ecf
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/scripts/exemcsfc_global_sfc_prep.sh.ecf:r94537-96048
Index: checkout/global_shared.v15.0.0/scripts/exglobal_fcst_nems.sh.ecf
===================================================================
--- checkout/global_shared.v15.0.0/scripts/exglobal_fcst_nems.sh.ecf (revision 95312)
+++ checkout/global_shared.v15.0.0/scripts/exglobal_fcst_nems.sh.ecf (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/scripts/exglobal_fcst_nems.sh.ecf
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/scripts/exglobal_fcst_nems.sh.ecf:r94537-96048
Index: checkout/global_shared.v15.0.0/scripts/exglobal_analysis.sh.ecf
===================================================================
--- checkout/global_shared.v15.0.0/scripts/exglobal_analysis.sh.ecf (revision 95312)
+++ checkout/global_shared.v15.0.0/scripts/exglobal_analysis.sh.ecf (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/scripts/exglobal_analysis.sh.ecf
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/scripts/exglobal_analysis.sh.ecf:r94537-96048
Index: checkout/global_shared.v15.0.0/scripts/exglobal_fcst_nemsfv3gfs.sh
===================================================================
--- checkout/global_shared.v15.0.0/scripts/exglobal_fcst_nemsfv3gfs.sh (revision 95312)
+++ checkout/global_shared.v15.0.0/scripts/exglobal_fcst_nemsfv3gfs.sh (revision 96049)
@@ -62,7 +62,6 @@
# Directories.
pwd=$(pwd)
NWPROD=${NWPROD:-${NWROOT:-$pwd}}
-BASE_NEMSfv3gfs=${BASE_NEMSfv3gfs:-$NWPROD}
BASE_GSM=${BASE_GSM:-$NWPROD}
FIX_DIR=${FIX_DIR:-$BASE_GSM/fix}
FIX_AM=${FIX_AM:-$FIX_DIR/fix_am}
@@ -70,6 +69,7 @@
DATA=${DATA:-$pwd/fv3tmp$$} #temporary running directory
ROTDIR=${ROTDIR:-$pwd} #rotating archive directory
IC_DIR=${IC_DIR:-$pwd} #cold start initial conditions
+DMPDIR=${DMPDIR:-$pwd} # global dumps for seaice, snow and sst analysis
# Model resolution specific parameters
DELTIM=${DELTIM:-225}
@@ -143,7 +143,7 @@
done
fi
else
- if [ ${restart_test:-"NO"} = "YES" ]; then
+ if [ ${restart_test:-"NO"} = "YES" ]; then
# start from the end of last forecast run
$NLN $memdir/RESTART/* $DATA/INPUT/.
else
@@ -232,14 +232,30 @@
FNSOTC=${FNSOTC:-"$FIX_AM/global_soiltype.statsgo.t1534.3072.1536.rg.grb"}
FNSMCC=${FNSMCC:-"$FIX_AM/global_soilmgldas.t1534.3072.1536.grb"}
FNMSKH=${FNMSKH:-"$FIX_AM/seaice_newland.grb"}
-FNTSFA=${FNTSFA:-""}
-FNACNA=${FNACNA:-""}
-FNSNOA=${FNSNOA:-""}
FNVMNC=${FNVMNC:-"$FIX_AM/global_shdmin.0.144x0.144.grb"}
FNVMXC=${FNVMXC:-"$FIX_AM/global_shdmax.0.144x0.144.grb"}
FNSLPC=${FNSLPC:-"$FIX_AM/global_slope.1x1.grb"}
FNABSC=${FNABSC:-"$FIX_AM/global_mxsnoalb.uariz.t1534.3072.1536.rg.grb"}
+# Warm start and read increment, update surface variables
+# since we do not have SST, SNOW or ICE via global_cycle
+if [ $warm_start = ".true." -a $read_increment = ".true." ]; then
+ FNTSFA=${FNTSFA:-"$DMPDIR/$CDATE/$CDUMP/${CDUMP}.t${chh}z.rtgssthr.grb"}
+ FNACNA=${FNACNA:-"$DMPDIR/$CDATE/$CDUMP/${CDUMP}.t${chh}z.seaice.5min.blend.grb"}
+ FNSNOA=${FNSNOA:-"$DMPDIR/$CDATE/$CDUMP/${CDUMP}.t${chh}z.snogrb_t1534.3072.1536"}
+ FSMCL2=${FSMCL2:-60}
+ FSMCL3=${FSMCL3:-60}
+ FSMCL4=${FSMCL4:-60}
+ [[ $CDUMP = "gdas" ]] && FTSFS=${FTSFS:-0}
+ FAISS=${FAISS:-0}
+ FAISL=${FAISL:-0}
+ [[ $chh = 18 ]] && FSNOL=${FSNOL:-"-2"}
+else
+ FNTSFA=${FNTSFA:-""}
+ FNACNA=${FNACNA:-""}
+ FNSNOA=${FNSNOA:-""}
+fi
+
# NSST Options
# nstf_name contains the NSST related parameters
# nstf_name(1) : 0 = NSSTM off, 1 = NSSTM on but uncoupled, 2 = NSSTM on and coupled
@@ -597,6 +613,9 @@
debug = ${gfs_phys_debug:-".false."}
nstf_name = $nstf_name
nst_anl = $nst_anl
+ do_skeb = ${DO_SKEB:-".false."}
+ do_shum = ${DO_SHUM:-".false."}
+ do_sppt = ${DO_SPPT:-".false."}
$gfs_physics_nml
/
@@ -632,16 +651,18 @@
FNVMXC = '${FNVMXC}'
FNSLPC = '${FNSLPC}'
FNABSC = '${FNABSC}'
- LDEBUG = .false.
- FSMCL(2) = 99999
- FSMCL(3) = 99999
- FSMCL(4) = 99999
- FTSFS = 90
- FAISS = 99999
- FSNOL = 99999
+ LDEBUG = ${LDEBUG:-".false."}
+ FSMCL(2) = ${FSMCL2:-99999}
+ FSMCL(3) = ${FSMCL3:-99999}
+ FSMCL(4) = ${FSMCL4:-99999}
+ FTSFS = ${FTSFS:-90}
+ FAISL = ${FAISL:-99999}
+ FAISS = ${FAISS:-99999}
+ FSNOL = ${FSNOL:-99999}
+ FSNOS = ${FSNOS:-99999}
FSICL = 99999
+ FSICS = 99999
FTSFL = 99999
- FAISL = 99999
FVETL = 99999
FSOTL = 99999
FvmnL = 99999
@@ -648,8 +669,6 @@
FvmxL = 99999
FSLPL = 99999
FABSL = 99999
- FSNOS = 99999
- FSICS = 99999
$namsfc_nml
/
@@ -659,48 +678,62 @@
/
EOF
-# Add namelist for stochastic physics options for ensemble member forecast
+# Add namelist for stochastic physics options
echo "" >> input.nml
-if [ $MEMBER -gt 0 -a ${USE_STOCH_PHYS:-"YES"} = "YES" ]; then
- if [ "${SET_STP_SEED:-"NO"}" = "YES" ] ; then
- ISEED_SKEB=$((CDATE*1000 + MEMBER*10 + 1))
- ISEED_SHUM=$((CDATE*1000 + MEMBER*10 + 2))
- ISEED_SPPT=$((CDATE*1000 + MEMBER*10 + 3))
- ISEED_VC=$((CDATE*1000 + MEMBER*10 + 4))
- fi
- cat >> input.nml << EOF
+if [ $MEMBER -gt 0 ]; then
+
+ cat >> input.nml << EOF
&nam_stochy
ntrunc = ${JCAP:-$((`echo $CASE | cut -c 2-`*2-2))}
- lon_s = ${LONB:-$((`echo $CASE | cut -c 2-`*4))}
- lat_s = ${LATB:-$((`echo $CASE | cut -c 2-`*2))}
- skeb = ${SKEB:-"-999."}
- shum = ${SHUM:-"-999."}
- sppt = ${SPPT:-"-999."}
- vcamp = ${VCAMP:-"-999."}
+ lon_s = ${LONB:-$((`echo $CASE | cut -c 2-`*4))}
+ lat_s = ${LATB:-$((`echo $CASE | cut -c 2-`*2))}
+EOF
+
+ if [ ${DO_SKEB:-".false."} = ".true." ]; then
+ [[ ${SET_STP_SEED:-"NO"} = "YES" ]] && ISEED_SKEB=$((CDATE*1000 + MEMBER*10 + 1))
+ cat >> input.nml << EOF
+ skeb = $SKEB
iseed_skeb = ${ISEED_SKEB:-${ISEED:-"0"}}
+ skeb_tau = ${SKEB_TAU:-"-999."}
+ skeb_lscale = ${SKEB_LSCALE:-"-999."}
+ skebnorm = ${SKEBNORM:-"1"}
+EOF
+ fi
+
+ if [ ${DO_SHUM:-".false."} = ".true." ]; then
+ [[ ${SET_STP_SEED:-"NO"} = "YES" ]] && ISEED_SHUM=$((CDATE*1000 + MEMBER*10 + 2))
+ cat >> input.nml << EOF
+ shum = $SHUM
iseed_shum = ${ISEED_SHUM:-${ISEED:-"0"}}
+ shum_tau = ${SHUM_TAU:-"-999."}
+ shum_lscale = ${SHUM_LSCALE:-"-999."}
+EOF
+ fi
+
+ if [ ${DO_SPPT:-".false."} = ".true." ]; then
+ [[ ${SET_STP_SEED:-"NO"} = "YES" ]] && ISEED_SPPT=$((CDATE*1000 + MEMBER*10 + 3))
+ cat >> input.nml << EOF
+ sppt = $SPPT
iseed_sppt = ${ISEED_SPPT:-${ISEED:-"0"}}
- iseed_vc = ${ISEED_VC:-${ISEED:-"0"}}
- skeb_tau = ${SKEB_TAU:-"-999."}
- shum_tau = ${SHUM_TAU:-"-999."}
sppt_tau = ${SPPT_TAU:-"-999."}
- vc_tau = ${VC_TAU:-"-999."}
- skeb_lscale = ${SKEB_LSCALE:-"-999."}
- shum_lscale = ${SHUM_LSCALE:-"-999."}
sppt_lscale = ${SPPT_LSCALE:-"-999."}
- vc_lscale = ${VC_LSCALE:-"-999."}
sppt_logit = ${SPPT_LOGIT:-".true."}
sppt_sfclimit = ${SPPT_SFCLIMIT:-".true."}
- vc = ${VC:-"0."}
+EOF
+ fi
+
+ cat >> input.nml << EOF
$nam_stochy_nml
/
EOF
+
else
+
cat >> input.nml << EOF
&nam_stochy
- $nam_stochy_nml
/
EOF
+
fi
#------------------------------------------------------------------
Index: checkout/global_shared.v15.0.0/scripts
===================================================================
--- checkout/global_shared.v15.0.0/scripts (revision 95312)
+++ checkout/global_shared.v15.0.0/scripts (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/scripts
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/scripts:r94537-96048
Index: checkout/global_shared.v15.0.0/docs/Release_Notes.global_shared_gsm.v14.1.0.txt
===================================================================
--- checkout/global_shared.v15.0.0/docs/Release_Notes.global_shared_gsm.v14.1.0.txt (revision 95312)
+++ checkout/global_shared.v15.0.0/docs/Release_Notes.global_shared_gsm.v14.1.0.txt (revision 96049)
Property changes on: checkout/global_shared.v15.0.0/docs/Release_Notes.global_shared_gsm.v14.1.0.txt
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0/docs/Release_Notes.global_shared_gsm.v14.1.0.txt:r94537-96048
Index: checkout/global_shared.v15.0.0
===================================================================
--- checkout/global_shared.v15.0.0 (revision 95312)
+++ checkout/global_shared.v15.0.0 (revision 96049)
Property changes on: checkout/global_shared.v15.0.0
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc/global_shared.v15.0.0:r94537-96048
Index: checkout
===================================================================
--- checkout (revision 95312)
+++ checkout (revision 96049)
Property changes on: checkout
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /fv3gfs/branches/Rahul.Mahajan/EXP-cyc:r94537-96048
More information about the Ncep.list.fv3-announce
mailing list