diff --git a/CHANGELOG b/CHANGELOG index b1ff4992558d240f766c663bd529aea306b89c69..0d4062fcdee16e40e47a1d7804a638e453548842 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 791f60fa09dc5b0bbf5e2a8442223860d8be5c23..5eab7dc7526bf7e03cb94d2bb151f2795fcd383a 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 7fe4bd5110af36142f58576f3ad28eed19713282..79ebcb8d08424c1ff8b621cdc8e085dbc6cc8572 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)