diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/DIRC.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/DIRC.xml deleted file mode 100644 index ee280da415..0000000000 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/DIRC.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/OGRD.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/OGRD.xml deleted file mode 100644 index 76c03bf1af..0000000000 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/OGRD.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SPC.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SPC.xml deleted file mode 100644 index b1062e53fc..0000000000 --- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SPC.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml index f7c94d1d60..ad6a1c0d0c 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml @@ -464,16 +464,6 @@ key="VGP" indentText="true" /> - - - - - @@ -505,30 +495,6 @@ indentText="false" /> - - - - - - - - - - - - @@ -1368,14 +1334,6 @@ key="REFD" indentText="true" /> - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST1_6KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST1_6KM.xml deleted file mode 100644 index b8be73e955..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST1_6KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-EAST1_6KM - High Frequency Radar (EAST_6KM) total vector velocity (TVV) - Lon/Lat Resolution - - 21.73596 - 262.11615 - LowerLeft - 701 - 460 - 0.058075 - 0.05394 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST2_6KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST2_6KM.xml deleted file mode 100644 index 5ca706b6ad..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST2_6KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-EAST2_6KM - High Frequency Radar (EAST_6KM) total vector velocity (TVV) - Lon/Lat Resolution - - 14.5 - 289.5 - LowerLeft - 171 - 140 - 0.05574 - 0.05394 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_EAST_DELAWARE_1KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_EAST_DELAWARE_1KM.xml deleted file mode 100644 index 8dbab55356..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_EAST_DELAWARE_1KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-US_EAST_DELAWARE_1KM - High Frequency Radar (US_EAST_DELAWARE_1KM) total vector - velocity (TVV) Lon/Lat Resolution - - 38.007858 - 262.11615 - LowerLeft - 4205 - 222 - 0.009682 - 0.008992 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_EAST_FLORIDA_2KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_EAST_FLORIDA_2KM.xml deleted file mode 100644 index f9717da156..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_EAST_FLORIDA_2KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-US_EAST_FLORIDA_2KM - High Frequency Radar (US_EAST_FLORIDA_2KM) total vector - velocity (TVV) Lon/Lat Resolution - - 25.00832 - 262.11615 - LowerLeft - 2103 - 167 - 0.019356 - 0.01798 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_EAST_NORTH_2KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_EAST_NORTH_2KM.xml deleted file mode 100644 index 996fefe182..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_EAST_NORTH_2KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-US_EAST_NORTH_2KM - High Frequency Radar (US_EAST_NORTH_2KM) total vector velocity - (TVV) Lon/Lat Resolution - - 36.012081 - 262.11615 - LowerLeft - 2103 - 222 - 0.019356 - 0.017979 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_EAST_SOUTH_2KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_EAST_SOUTH_2KM.xml deleted file mode 100644 index dfc2bd2f93..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_EAST_SOUTH_2KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-US_EAST_SOUTH_2KM - High Frequency Radar (US_EAST_SOUTH_2KM) total vector velocity - (TVV) Lon/Lat Resolution - - 30.00676 - 262.11615 - LowerLeft - 2103 - 223 - 0.019356 - 0.01798 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_EAST_VIRGINIA_1KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_EAST_VIRGINIA_1KM.xml deleted file mode 100644 index b1926c81b1..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_EAST_VIRGINIA_1KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-US_EAST_VIRGINIA_1KM - High Frequency Radar (US_EAST_VIRGINIA_1KM) total vector - velocity (TVV) Lon/Lat Resolution - - 36.506531 - 262.11615 - LowerLeft - 4205 - 111 - 0.009682 - 0.008987 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_HAWAII_1KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_HAWAII_1KM.xml deleted file mode 100644 index 3a138b9e5e..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_HAWAII_1KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-US_HAWAII_1KM - High Frequency Radar (US_HAWAII_1KM) total vector velocity - (TVV) Lon/Lat Resolution - - 16.2204 - 196.855606 - LowerLeft - 1204 - 963 - 0.009293 - 0.009041 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_HAWAII_2KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_HAWAII_2KM.xml deleted file mode 100644 index d0dd615872..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_HAWAII_2KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-US_HAWAII_2KM - High Frequency Radar (US_HAWAII_2KM) total vector velocity - (TVV) Lon/Lat Resolution - - 16.2204 - 196.855606 - LowerLeft - 602 - 482 - 0.018601 - 0.01808 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_500M.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_500M.xml deleted file mode 100644 index 773027179b..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_500M.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-US_WEST_500M - High Frequency Radar (US_WEST_500M) total vector velocity (TVV) - Lon/Lat Resolution - - 37.455486 - 237.406532 - LowerLeft - 106 - 153 - 0.005204 - 0.004494 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_CENCAL_2KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_CENCAL_2KM.xml deleted file mode 100644 index ec42d77332..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_CENCAL_2KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-US_WEST_CENCAL_2KM - High Frequency Radar (US_WEST_CENCAL_2KM) total vector velocity - (TVV) Lon/Lat Resolution - - 36.003601 - 229.639999 - LowerLeft - 700 - 167 - 0.020829 - 0.017979 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_LOSANGELES_1KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_LOSANGELES_1KM.xml deleted file mode 100644 index 4f6ece71db..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_LOSANGELES_1KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-US_WEST_LOSANGELES_1KM - High Frequency Radar (US_WEST_LOSANGELES_1KM) total vector - velocity (TVV) Lon/Lat Resolution - - 32.003052 - 229.639999 - LowerLeft - 1399 - 278 - 0.010407 - 0.008987 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_LOSOSOS_1KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_LOSOSOS_1KM.xml deleted file mode 100644 index d6a095d845..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_LOSOSOS_1KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-US_WEST_LOSOSOS_1KM - High Frequency Radar (US_WEST_LOSOSOS_1KM) total vector - velocity (TVV) Lon/Lat Resolution - - 34.50227 - 229.639999 - LowerLeft - 1399 - 145 - 0.010407 - 0.008991 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_NORTH_2KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_NORTH_2KM.xml deleted file mode 100644 index ed04516836..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_NORTH_2KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-US_WEST_NORTH_2KM - High Frequency Radar (US_WEST_NORTH_2KM) total vector velocity - (TVV) Lon/Lat Resolution - - 43.0158 - 229.639999 - LowerLeft - 700 - 361 - 0.020829 - 0.017979 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_SANFRAN_1KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_SANFRAN_1KM.xml deleted file mode 100644 index 9e9339f065..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_SANFRAN_1KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-US_WEST_SANFRAN_1KM - High Frequency Radar (US_WEST_SANFRAN_1KM) total vector - velocity (TVV) Lon/Lat Resolution - - 37.001492 - 229.639999 - LowerLeft - 1399 - 167 - 0.010407 - 0.008987 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_SOCAL_2KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_SOCAL_2KM.xml deleted file mode 100644 index 7fe4e5c891..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_SOCAL_2KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-US_WEST_SOCAL_2KM - High Frequency Radar (US_WEST_SOCAL_2KM) total vector velocity - (TVV) Lon/Lat Resolution - - 32.012039 - 229.639999 - LowerLeft - 700 - 194 - 0.020829 - 0.017983 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_WASHINGTON_1KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_WASHINGTON_1KM.xml deleted file mode 100644 index 7def25feb4..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_WEST_WASHINGTON_1KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-US_WEST_WASHINGTON_1KM - High Frequency Radar (US_WEST_WASHINGTON_1KM) total vector - velocity (TVV) Lon/Lat Resolution - - 48.005249 - 229.639999 - LowerLeft - 1399 - 222 - 0.010407 - 0.008991 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-WEST1_6KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-WEST1_6KM.xml deleted file mode 100644 index d3625d69ad..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-WEST1_6KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-WEST1_6KM - High Frequency Radar (WEST_6KM) total vector velocity (TVV) - Lon/Lat Resolution - - 30.25 - 229.639999 - LowerLeft - 234 - 367 - 0.06247 - 0.05394 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-WEST2_6KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-WEST2_6KM.xml deleted file mode 100644 index f3b54b6923..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-WEST2_6KM.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - gridHFR-WEST2_6KM - High Frequency Radar (WEST_6KM) total vector velocity (TVV) - Lon/Lat Resolution - - 16.2204 - 196.855606 - LowerLeft - 201 - 161 - 0.055801 - 0.054239 - degree - diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_HFR-9.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_HFR-9.xml deleted file mode 100644 index e3083aca2e..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_HFR-9.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - HFR-US_EAST_FLORIDA_2KM -
9
- 0 - gridHFR-US_EAST_FLORIDA_2KM - - 255 - - - - - HFR-US_WEST_CENCAL_2KM -
9
- 0 - gridHFR-US_WEST_CENCAL_2KM - - 255 - - - - - HFR-US_EAST_DELAWARE_1KM -
9
- 0 - gridHFR-US_EAST_DELAWARE_1KM - - 255 - - - - - HFR-US_HAWAII_1KM -
9
- 0 - gridHFR-US_HAWAII_1KM - - 255 - - - - - HFR-US_WEST_500M -
9
- 0 - gridHFR-US_WEST_500M - - 255 - - - - - HFR-US_WEST_NORTH_2KM -
9
- 0 - gridHFR-US_WEST_NORTH_2KM - - 255 - - - - - HFR-US_WEST_LOSANGELES_1KM -
9
- 0 - gridHFR-US_WEST_LOSANGELES_1KM - - 255 - - - - - HFR-US_EAST_NORTH_2KM -
9
- 0 - gridHFR-US_EAST_NORTH_2KM - - 255 - - - - - HFR-US_EAST_SOUTH_2KM -
9
- 0 - gridHFR-US_EAST_SOUTH_2KM - - 255 - - - - - HFR-US_EAST_VIRGINIA_1KM -
9
- 0 - gridHFR-US_EAST_VIRGINIA_1KM - - 255 - - - - - HFR-US_WEST_SANFRAN_1KM -
9
- 0 - gridHFR-US_WEST_SANFRAN_1KM - - 255 - - - - - HFR-EAST_6KM -
9
- 0 - gridHFR-EAST1_6KM - - 255 - - - - - HFR-EAST_6KM -
9
- 0 - gridHFR-EAST2_6KM - - 255 - - - - - HFR-US_HAWAII_2KM -
9
- 0 - gridHFR-US_HAWAII_2KM - - 255 - - - - - HFR-WEST_6KM -
9
- 0 - gridHFR-WEST1_6KM - - 255 - - - - - HFR-WEST_6KM -
9
- 0 - gridHFR-WEST2_6KM - - 255 - - - - - HFR-US_WEST_WASHINGTON_1KM -
9
- 0 - gridHFR-US_WEST_WASHINGTON_1KM - - 255 - - - - - HFR-US_WEST_LOSOSOS_1KM -
9
- 0 - gridHFR-US_WEST_LOSOSOS_1KM - - 255 - - - - - HFR-US_WEST_SOCAL_2KM -
9
- 0 - gridHFR-US_WEST_SOCAL_2KM - - 255 - - - - diff --git a/nativeLib/rary.cots.g2clib/drstemplates.h b/nativeLib/rary.cots.g2clib/drstemplates.h old mode 100644 new mode 100755 index b94650eb68..5e4c7331a3 --- a/nativeLib/rary.cots.g2clib/drstemplates.h +++ b/nativeLib/rary.cots.g2clib/drstemplates.h @@ -3,7 +3,6 @@ #include "grib2.h" // PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-26 -// 2014-07-30 vkorolev Added template 5.4 // // ABSTRACT: This Fortran Module contains info on all the available // GRIB2 Data Representation Templates used in Section 5 (DRS). @@ -32,7 +31,7 @@ // /////////////////////////////////////////////////////////////////////// - #define MAXDRSTEMP 10 // maximum number of templates + #define MAXDRSTEMP 9 // maximum number of templates #define MAXDRSMAPLEN 200 // maximum template map length struct drstemplate @@ -50,8 +49,6 @@ { 2, 16, 0, {4,-2,-2,1,1,1,1,4,4,4,1,1,4,1,4,1} }, // 5.3: Grid point data - Complex Packing and spatial differencing { 3, 18, 0, {4,-2,-2,1,1,1,1,4,4,4,1,1,4,1,4,1,1,1} }, - // 5.4: Grid Point Data - IEEE Floating Point Data - { 4, 1, 0, {1} }, // 5.50: Spectral Data - Simple Packing { 50, 5, 0, {4,-2,-2,1,4} }, // 5.51: Spherical Harmonics data - Complex packing diff --git a/nativeLib/rary.cots.g2clib/g2_unpack7.c b/nativeLib/rary.cots.g2clib/g2_unpack7.c old mode 100644 new mode 100755 index d694c1e91c..372fea2fd5 --- a/nativeLib/rary.cots.g2clib/g2_unpack7.c +++ b/nativeLib/rary.cots.g2clib/g2_unpack7.c @@ -34,7 +34,6 @@ g2int g2_unpack7(unsigned char *cgrib,g2int *iofst,g2int igdsnum,g2int *igdstmpl // PNG now allowed to use WMO Template no. 5.41 // 2004-12-16 Taylor - Added check on comunpack return code. // 2008-12-23 Wesley - Initialize Number of data points unpacked -// 2014-07-29 vkorolev - Added processing Template no. 5.4 // // USAGE: int g2_unpack7(unsigned char *cgrib,g2int *iofst,g2int igdsnum, // g2int *igdstmpl, g2int idrsnum, @@ -82,9 +81,6 @@ g2int g2_unpack7(unsigned char *cgrib,g2int *iofst,g2int igdsnum,g2int *igdstmpl g2int ierr,isecnum; g2int ipos,lensec; g2float *lfld; - g2int *ifld; - - ierr=0; *fld=0; //NULL @@ -102,7 +98,6 @@ g2int g2_unpack7(unsigned char *cgrib,g2int *iofst,g2int igdsnum,g2int *igdstmpl ipos=(*iofst/8); lfld=(g2float *)calloc(ndpts ? ndpts : 1,sizeof(g2float)); - if (lfld == 0) { ierr=6; return(ierr); @@ -118,18 +113,6 @@ g2int g2_unpack7(unsigned char *cgrib,g2int *iofst,g2int igdsnum,g2int *igdstmpl return 7; } } - else if(idrsnum == 4) { - ifld=(g2int *)calloc(ndpts ? ndpts : 1, sizeof(g2int)); - if(ifld != 0){ - gbits(cgrib+ipos,ifld,0,32,0,ndpts); - rdieee(ifld,*fld,ndpts); - free(ifld); - } - else { - ierr=6; - return(ierr); - } - } else if (idrsnum == 50) { // Spectral Simple simunpack(cgrib+ipos,idrstmpl,ndpts-1,lfld+1); rdieee(idrstmpl+4,lfld+0,1);