stream_gribapi: added support for level type HYBRID_HALF

7e19ef71 · Uwe Schulzweida · a13e4b71 · 7e19ef71 · 7e19ef71 · 7e19ef71
Commit 7e19ef71 authored Jun 01, 2012 by Uwe Schulzweida
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

ChangeLog ChangeLog +4 -0

src/stream_cgribex.c src/stream_cgribex.c +1 -1

src/stream_gribapi.c src/stream_gribapi.c +3 -2

No files found.
--- a/ChangeLog
+++ b/ChangeLog
+2012-06-01  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* stream_gribapi: added support for level type HYBRID_HALF
+
 2012-05-18  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>

 	* stream_cdf::cdfDefUnstructured: fixed memory bug [ICON - Bug #2398]

--- a/src/stream_cgribex.c
+++ b/src/stream_cgribex.c
@@ -63,7 +63,7 @@ int cgribexGetIsRotated(int *isec2)
    {
      isRotated = 1;
    }
-
+ 
  return (isRotated);
 }
 #endif

--- a/src/stream_gribapi.c
+++ b/src/stream_gribapi.c
@@ -2767,12 +2767,13 @@ void gribapiDefLevel(grib_handle *gh, int param, int zaxisID, int levelID)
 		double level1, level2;
 		level1 = zaxisInqLbound(zaxisID, levelID);
 		level2 = zaxisInqUbound(zaxisID, levelID);
+
 		GRIB_CHECK(grib_set_long(gh, "typeOfFirstFixedSurface", GRIB2_LTYPE_LANDDEPTH), 0);
 		GRIB_CHECK(grib_set_long(gh, "scaleFactorOfFirstFixedSurface", factor), 0);
-		GRIB_CHECK(grib_set_double(gh, "scaledValueOfFirstFixedSurface", level1*factor), 0);
+		GRIB_CHECK(grib_set_double(gh, "scaledValueOfFirstFixedSurface", level1), 0);
 		GRIB_CHECK(grib_set_long(gh, "typeOfSecondFixedSurface", GRIB2_LTYPE_LANDDEPTH), 0);
 		GRIB_CHECK(grib_set_long(gh, "scaleFactorOfSecondFixedSurface", factor), 0);
-		GRIB_CHECK(grib_set_double(gh, "scaledValueOfSecondFixedSurface", level2*factor), 0);
+		GRIB_CHECK(grib_set_double(gh, "scaledValueOfSecondFixedSurface", level2), 0);
 	      }
 	    else
 	      {