xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1

Browse source 
Former-commit-id: e802508e98 [formerly a011c0b6bb] [formerly 6fcc2604e0 [formerly 0d441b5eebad07acf51d6d5c28ee5ac7770d9733]]
Former-commit-id: 6fcc2604e0
Former-commit-id: 10696504a0
This commit is contained in:
Brian.Dyke 2014-06-12 07:07:17 -04:00
commit 50073f34b2
4 changed files with 31 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
View file

@ -1635,7 +1635,7 @@ localRTMAParms = []
localNamDNG5Parms = []
localSREFParms = []
localTPCProbParms = []
localISCExtraParms = []
localHRRRParms = localESTOFSParms = localISCExtraParms = []
myOfficeType = SITES[GFESUITE_SITEID][5]
@ -1916,12 +1916,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),

63
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
View file

@ -10,46 +10,6 @@
<gribModelSet>
<!-- SUBCENTER 0 -->
<model>
<name>estofsHW</name>
<center>7</center>
<subcenter>4</subcenter>
<grid>321225001</grid>
<process>
<id>14</id>
</process>
</model>
<model>
<name>estofsAK</name>
<center>7</center>
<subcenter>4</subcenter>
<grid>825553001</grid>
<process>
<id>14</id>
</process>
</model>
<model>
<name>estofsPR</name>
<center>7</center>
<subcenter>4</subcenter>
<grid>339227001</grid>
<process>
<id>1</id>
<id>14</id>
</process>
</model>
<model>
<name>estofsUS</name>
<center>7</center>
<subcenter>0</subcenter>
<grid>888</grid>
<process>
<id>999</id>
</process>
</model>
<model>
<name>GFSLAMP</name>
@ -2915,7 +2875,28 @@
<name>estofsPR</name>
<center>7</center>
<subcenter>4</subcenter>
<grid>2145137701</grid>
<grid>339227001</grid>
<process>
<id>1</id>
<id>14</id>
</process>
</model>
<model>
<name>estofsHW</name>
<center>7</center>
<subcenter>4</subcenter>
<grid>321225001</grid>
<process>
<id>14</id>
</process>
</model>
<model>
<name>estofsAK</name>
<center>7</center>
<subcenter>4</subcenter>
<grid>825553001</grid>
<process>
<id>14</id>
</process>

2
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
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">

5
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
View file

@ -732,3 +732,8 @@ NGRID ^(E[HS-V][A-DG-KST][B-T]01) (KWBW) (..)(..)(..)
# 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