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

Merge pull request #51 from JustinB2011/JustinB2011-patch-1

Browse source 
Adding HIMAWARI-8 tables entries to satellite.mcidas decoder + wrf grid projection files. 

Former-commit-id: 1e36cb7e4d
This commit is contained in:
Michael James 2016-01-21 21:45:36 -06:00
commit b918204c4d
5 changed files with 96 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/hwrf.xml Normal file
View file

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<lambertConformalGridCoverage>
<name>551451</name>
<description>HWRF</description>
<la1>30.0</la1>
<lo1>11.8</lo1>
<firstGridPointCorner>UpperLeft</firstGridPointCorner>
<nx>551</nx>
<ny>451</ny>
<dx>.2</dx>
<dy>.2</dy>
<spacingUnit>degree</spacingUnit>
</lambertConformalGridCoverage>

39
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/nssl-wrf.xml Normal file
View file

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<lambertConformalGridCoverage>
<name>1199799</name>
<description>NSSL-WRF</description>
<la1>21.6410007476807</la1>
<lo1>-120.449996948242</lo1>
<firstGridPointCorner>LowerLeft</firstGridPointCorner>
<nx>1199</nx>
<ny>799</ny>
<dx>4.0</dx>
<dy>4.0</dy>
<spacingUnit>km</spacingUnit>
<minorAxis>6378160.0</minorAxis>
<majorAxis>6356775.0</majorAxis>
<lov>-98.0</lov>
<latin1>60.0</latin1>
<latin2>30.0</latin2>
</lambertConformalGridCoverage>

6
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/src/com/raytheon/uf/edex/plugin/satellite/mcidas/McidasSatelliteDecoder.java
View file

@ -511,6 +511,12 @@ public class McidasSatelliteDecoder {
// GOES-East UNIWISC McIDAS AREA files
} else if (1261 <= areaNumber && areaNumber <= 1524) {
areaNumber = 1261;
// HIMAWARI-8 McIDAS AREA files
} else if (5900 <= areaNumber && areaNumber <= 5999) {
areaNumber = 5900;
// METEOSAT-10 UNIWISC McIDAS AREA files
} else if (6000 <= areaNumber && areaNumber <= 6099) {
areaNumber = 6000;
}
String value = McidasSatelliteLookups.getInstance().getAreaName(
areaNumber);

1
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/creatingEntities.xml
View file

@ -46,6 +46,7 @@
<entry><key>78</key><value>GOES12</value></entry>
<entry><key>84</key><value>MTSAT-1R</value></entry>
<entry><key>85</key><value>MTSAT-2</value></entry>
<entry><key>86</key><value>HIMAWARI-8</value></entry>
<entry><key>180</key><value>GOES13</value></entry>
<entry><key>184</key><value>GOES15</value></entry>
<entry><key>185</key><value>SOUNDER</value></entry>

18
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/physicalElements.xml
View file

@ -43,6 +43,24 @@
<!-- Not documented, but this is what is actually being received. -->
<entry><key ss="85" band="6"/><value name="Imager 3.5-4.0 micro IR (Fog)" /></entry>
<!-- HIMAWARI-8 -->
<entry><key ss="86" band="1"/><value name="Imager Blue .47 micron Visible" /></entry>
<entry><key ss="86" band="2"/><value name="Imager Green .51 micron Visible" /></entry>
<entry><key ss="86" band="3"/><value name="Imager Red .64 micron Visible" /></entry>
<entry><key ss="86" band="4"/><value name="Imager .86 micron IR" /></entry>
<entry><key ss="86" band="5"/><value name="Imager 1.6 micron IR" /></entry>
<entry><key ss="86" band="6"/><value name="Imager 2.3 micron IR" /></entry>
<entry><key ss="86" band="7"/><value name="Imager 3.9 micron IR" units="IRPixel" /></entry>
<entry><key ss="86" band="8"/><value name="Imager 6.2 micron WV" units="IRPixel" /></entry>
<entry><key ss="86" band="9"/><value name="Imager 6.9 micron WV" units="IRPixel" /></entry>
<entry><key ss="86" band="10"/><value name="Imager 7.3 micron IR" /></entry>
<entry><key ss="86" band="11"/><value name="Imager 8.6 micron IR" /></entry>
<entry><key ss="86" band="12"/><value name="Imager 9.5 micron IR" /></entry>
<entry><key ss="86" band="13"/><value name="Imager 10.4 micron IR" /></entry>
<entry><key ss="86" band="14"/><value name="Imager 11.2 micron IR" /></entry>
<entry><key ss="86" band="15"/><value name="Imager 12.4 micron IR" /></entry>
<entry><key ss="86" band="16"/><value name="Imager 13.3 micron IR" /></entry>
<!-- GOES13 -->
<entry><key ss="180" band="1"/><value name="Imager Visible" /></entry>
<entry><key ss="180" band="2"/><value name="Imager 3.5-4.0 micro IR (Fog)" units="IRPixel" /></entry>