From 47cff3cd28e1a357c8ac3b940d483037ec973f20 Mon Sep 17 00:00:00 2001 From: Iain Russell Date: Wed, 21 Feb 2024 15:19:21 +0000 Subject: [PATCH 1/2] Fix validity date in title when step is 60m [MAGP-1362] --- src/decoders/GribDecoder.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/decoders/GribDecoder.cc b/src/decoders/GribDecoder.cc index 72992912..634d5827 100644 --- 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); From eb25866fee0b8ea599b34453bd51e06cd4f2d1a1 Mon Sep 17 00:00:00 2001 From: Iain Russell Date: Wed, 21 Feb 2024 15:19:56 +0000 Subject: [PATCH 2/2] Version 4.15.3 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d920ca02..007cf434 100644 --- 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.15.2 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()