From 61f50e415112f39cdfe684ea5fde3da1139519a1 Mon Sep 17 00:00:00 2001 From: ctena Date: Thu, 2 Dec 2021 10:08:56 +0100 Subject: [PATCH] GFAS: Correcter random ror that where not using the correct shapefile index. --- CHANGELOG | 4 ++++ hermesv3_gr/__init__.py | 2 +- .../emision_inventories/point_gfas_emission_inventory.py | 7 +++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 01c1087..e48d830 100755 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +2.1.2 + 2021/12/01 + - Corrected error while processing GFAS emissions + 2.1.1 2021/07/29 - Added new Timezones diff --git a/hermesv3_gr/__init__.py b/hermesv3_gr/__init__.py index 58039f5..4eabd0b 100755 --- a/hermesv3_gr/__init__.py +++ b/hermesv3_gr/__init__.py @@ -1 +1 @@ -__version__ = "2.1.1" +__version__ = "2.1.2" diff --git a/hermesv3_gr/modules/emision_inventories/point_gfas_emission_inventory.py b/hermesv3_gr/modules/emision_inventories/point_gfas_emission_inventory.py index 820390e..33037f9 100755 --- a/hermesv3_gr/modules/emision_inventories/point_gfas_emission_inventory.py +++ b/hermesv3_gr/modules/emision_inventories/point_gfas_emission_inventory.py @@ -275,14 +275,13 @@ class PointGfasEmissionInventory(EmissionInventory): for num, pollutant in enumerate(self.pollutant_dicts): settings.write_log('\t\tPollutant {0} ({1}/{2})'.format( pollutant['name'], num + 1, len(self.pollutant_dicts)), level=3) - - aux = netcdf.variables[pollutant['name']][:].flatten()[gdf['src_index']] + aux = netcdf.variables[pollutant['name']][:].flatten()[gdf.loc[:, 'src_index'].values] if self.masking.scale_mask is not None: - aux = aux * self.masking.scale_mask.flatten()[gdf['src_index']] + aux = aux * self.masking.scale_mask.flatten()[gdf.loc[:, 'src_index'].values] gdf[pollutant['name']] = (aux / gdf['dst_area'].values) * \ - netcdf.variables['cell_area'][:].flatten()[gdf['src_index']] + netcdf.variables['cell_area'][:].flatten()[gdf.loc[:, 'src_index'].values] # print netcdf.variables['bc'][:].sum() netcdf.close() -- GitLab