diff --git a/CHANGELOG b/CHANGELOG index 01c1087cb84f311bb4475741a9c696909ae51250..e48d83084d82d51a0338265fdb5c0cf4787f0ecb 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 58039f50515cbb160b60f797ba69002ba1f18f43..4eabd0b3fb42c89ac53f3ced7997c54912cb5f7f 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 820390e03801ef9c950d1f7d30fff4632e95c963..33037f9bf66c736020aa662a4d7511d9dca2405e 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()