VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999

Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e

Conflicts:
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 4c585af933 [formerly 9ada9356c5 [formerly 7fa5b7a34613e88a77e4b32c79c6d8c3c6166ba2]]
Former-commit-id: 9ada9356c5
Former-commit-id: 11073fdece
This commit is contained in:
Ana Rivera 2014-06-11 17:01:44 +00:00 committed by Steve Harris
parent 85fc4aafa4
commit 2f13aed851
3 changed files with 9 additions and 4 deletions

View file

@ -31,7 +31,7 @@
<Method name="Alias" levels="MidLyr">
<Field abbreviation="MCDC" level="MidLyr"/>
</Method>
<Method name="Alias"levels="LowLyr">
<Method name="Alias" levels="LowLyr">
<Field abbreviation="LCDC" level="LowLyr"/>
</Method>
<Method models="HPCGuide" displayName="Total Cloud Cover" name="Multiply">

View file

@ -1595,7 +1595,7 @@ localRTMAParms = []
localNamDNG5Parms = []
localSREFParms = []
localTPCProbParms = []
localISCExtraParms = []
localHRRRParms = localESTOFSParms = localISCExtraParms = []
myOfficeType = SITES[GFESUITE_SITEID][5]
@ -1876,12 +1876,12 @@ DATABASES = [(Official, OFFICIALDBS + localParms),
(AKwave10, WAVEPARMS + localAKwave10Parms),
(AKwave4, WAVEPARMS + localAKwave4Parms),
(EPwave10, WAVEPARMS + localEPwave10Parms),
(ESTOFS, ESTOFSPARMS + localESTOFSparms),
(ESTOFS, ESTOFSPARMS + localESTOFSParms),
(GlobalWave, WAVEPARMS + localGlobalWaveParms),
(GLWM, GLWMPARMS + localGLWMParms), #####DCS3499
(HIRESWarw, STD3_MODEL + localHIRESWarwParms), #####DCS3501
(HIRESWnmm, STD3_MODEL + localHIRESWnmmParms),
(HRRR, HRRRPARMS + localHRRRparms),
(HRRR, HRRRPARMS + localHRRRParms),
#DR20634 (SPC, SPCPARMS + localSPCParms),
(WCwave10, WAVEPARMS + localWCwave10Parms),
(WCwave4, WAVEPARMS + localWCwave4Parms),

View file

@ -719,4 +719,9 @@ HDS ^(JUTX(([2-4]1)|53)) (.{4}) (..)(..)(..)
# ESTOFS
# Pattern provided by Joshua.Watson.
NGRID ^(E[EHC][IP][A-Z]88) (KWBM) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H
# HRRR
# Pattern provided by Joshua.Watson.
NGRID ^(Y.C[A-MZ][089][0-9]) (KWBY) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H