Merge branch 'hotfix/4.15.3' into develop

ecmwf · Feb 21, 2024 · da1059e · da1059e
2 parents 1473bbc + eb25866
commit da1059e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ cmake_minimum_required( VERSION 3.12 FATAL_ERROR )
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild/cmake")
 find_package( ecbuild 3.4 REQUIRED )
 
-project( magics VERSION 4.16.0 LANGUAGES CXX )
+project( magics VERSION 4.15.3 LANGUAGES CXX )
 
 # make sure that the header files are installed into include/magics
 # note that this needs to be done before ecbuild_declare_project()

diff --git a/src/decoders/GribDecoder.cc b/src/decoders/GribDecoder.cc
@@ -159,11 +159,7 @@ long computeStep(const GribDecoder& grib, const string& key) {
         stepUnits["30Y"] = stepUnits["M"] * 30;
         stepUnits["C"]   = stepUnits["M"] * 100;
     }
-    string units;
-    if (grib.getstring("indicatorOfUnitOfTimeRange") == "m")
-        units = "m";
-    else
-        units = grib.getstring("stepUnits");
+    string units = grib.getstring("stepUnits");
 
     long step = grib.getLong(key);