From 4bb5872b75afa125e043a9ebde7b603b3a5d06e5 Mon Sep 17 00:00:00 2001 From: Carles Tena Date: Fri, 7 Feb 2020 16:08:42 +0100 Subject: [PATCH] Bug solving --- CHANGELOG | 5 +++++ .../emision_inventories/point_source_emission_inventory.py | 2 +- hermesv3_gr/modules/grids/grid.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b1ff499..0d4062f 100755 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +2.0.3 + 2020/02/07 + - Corrected bug on grid calculation for some versions of numpy. + - Corrected bug on reading vertical description for point source emission inventories + 2.0.2 2020/01/14 - Corrected bug on GFAS as point emissions. diff --git a/hermesv3_gr/modules/emision_inventories/point_source_emission_inventory.py b/hermesv3_gr/modules/emision_inventories/point_source_emission_inventory.py index 791f60f..5eab7dc 100755 --- a/hermesv3_gr/modules/emision_inventories/point_source_emission_inventory.py +++ b/hermesv3_gr/modules/emision_inventories/point_source_emission_inventory.py @@ -155,7 +155,7 @@ class PointSourceEmissionInventory(EmissionInventory): st_time = timeit.default_timer() settings.write_log("\t\tCalculating vertical allocation.", level=3) - df = pd.read_csv(vertical_description_path, sep=';') + df = pd.read_csv(vertical_description_path, sep=',') # df.sort_values(by='height_magl', ascending=False, inplace=True) self.location['layer'] = None diff --git a/hermesv3_gr/modules/grids/grid.py b/hermesv3_gr/modules/grids/grid.py index 7fe4bd5..79ebcb8 100755 --- a/hermesv3_gr/modules/grids/grid.py +++ b/hermesv3_gr/modules/grids/grid.py @@ -326,7 +326,7 @@ class Grid(object): # Calculate first center point. origin = center - abs(boundary) # Calculate the quantity of cells. - n = (abs(boundary) / inc) * 2 + n = int(abs(boundary) / inc) * 2 # Calculate all the values values = np.linspace(origin + inc, origin + ((n - 1) * inc), n - 1, dtype=np.float) -- GitLab