From 772083ec148e7c8c925d99766d80f469984659dd Mon Sep 17 00:00:00 2001 From: Carles Tena Date: Fri, 17 Jul 2020 11:18:24 +0200 Subject: [PATCH 1/3] Working on fixing bug while WFR-Chem writing --- hermesv3_bu/writer/monarch_writer.py | 1 - hermesv3_bu/writer/wrfchem_writer.py | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/hermesv3_bu/writer/monarch_writer.py b/hermesv3_bu/writer/monarch_writer.py index 0ac0ed0..caa0308 100755 --- a/hermesv3_bu/writer/monarch_writer.py +++ b/hermesv3_bu/writer/monarch_writer.py @@ -89,7 +89,6 @@ class MonarchWriter(Writer): if self.comm_write.Get_rank() == 0: self.grid.add_cell_area() cell_area = self.grid.shapefile[['cell_area']] - # cell_area.set_index('FID', inplace=True) else: cell_area = None cell_area = self.comm_write.bcast(cell_area, root=0) diff --git a/hermesv3_bu/writer/wrfchem_writer.py b/hermesv3_bu/writer/wrfchem_writer.py index 1f14dde..797edb9 100755 --- a/hermesv3_bu/writer/wrfchem_writer.py +++ b/hermesv3_bu/writer/wrfchem_writer.py @@ -106,23 +106,22 @@ class WrfChemWriter(Writer): if self.comm_write.Get_rank() == 0: self.grid.add_cell_area() - - cell_area = self.grid.shapefile[['FID', 'cell_area']] - cell_area.set_index('FID', inplace=True) + cell_area = self.grid.shapefile[['cell_area']] else: cell_area = None cell_area = self.comm_write.bcast(cell_area, root=0) + emissions = emissions.reset_index().groupby(['FID', 'layer', 'tstep']).sum() # From mol/h or g/h to mol/m2.h or g/m2.h emissions = emissions.divide(cell_area['cell_area'], axis=0, level='FID') - + print(emissions.columns) for pollutant, info in self.pollutant_info.iterrows(): if info.get('units') == "ug/m3 m/s": # From g/m2.h to ug/m2.s - emissions[[pollutant]] = emissions[[pollutant]].mul(10**6 / 3600) + emissions[pollutant] = emissions[pollutant].mul(10**6 / 3600) elif info.get('units') == "mol km^-2 hr^-1": # From mol/m2.h to mol/km2.h - emissions[[pollutant]] = emissions[[pollutant]].mul(10**6) + emissions[pollutant] = emissions[pollutant].mul(10**6) self.logger.write_time_log('WrfChemWriter', 'unit_change', timeit.default_timer() - spent_time) return emissions -- GitLab From c6a1fdad85d9bbaef5be0b02f12f393c52e0b36e Mon Sep 17 00:00:00 2001 From: Carles Tena Date: Fri, 17 Jul 2020 11:33:13 +0200 Subject: [PATCH 2/3] Working on fixing bug while WFR-Chem writing --- hermesv3_bu/writer/wrfchem_writer.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hermesv3_bu/writer/wrfchem_writer.py b/hermesv3_bu/writer/wrfchem_writer.py index 797edb9..0614921 100755 --- a/hermesv3_bu/writer/wrfchem_writer.py +++ b/hermesv3_bu/writer/wrfchem_writer.py @@ -116,12 +116,13 @@ class WrfChemWriter(Writer): emissions = emissions.divide(cell_area['cell_area'], axis=0, level='FID') print(emissions.columns) for pollutant, info in self.pollutant_info.iterrows(): - if info.get('units') == "ug/m3 m/s": - # From g/m2.h to ug/m2.s - emissions[pollutant] = emissions[pollutant].mul(10**6 / 3600) - elif info.get('units') == "mol km^-2 hr^-1": - # From mol/m2.h to mol/km2.h - emissions[pollutant] = emissions[pollutant].mul(10**6) + if pollutant in emissions.columns: + if info.get('units') == "ug/m3 m/s": + # From g/m2.h to ug/m2.s + emissions[pollutant] = emissions[pollutant].mul(10**6 / 3600) + elif info.get('units') == "mol km^-2 hr^-1": + # From mol/m2.h to mol/km2.h + emissions[pollutant] = emissions[pollutant].mul(10**6) self.logger.write_time_log('WrfChemWriter', 'unit_change', timeit.default_timer() - spent_time) return emissions -- GitLab From dc41f9e754745b464ef461a0573f4f78e6533df1 Mon Sep 17 00:00:00 2001 From: Carles Tena Date: Fri, 17 Jul 2020 12:14:13 +0200 Subject: [PATCH 3/3] Fixed bug on WFR-Chem writing --- CHANGELOG | 5 +++++ hermesv3_bu/__init__.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index a7b6e9c..de2b671 100755 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +1.0.4 + 2020/07/17 + + - Fixed bug on WRF-Chem writer + 1.0.3 2020/07/06 diff --git a/hermesv3_bu/__init__.py b/hermesv3_bu/__init__.py index 976498a..92192ee 100755 --- a/hermesv3_bu/__init__.py +++ b/hermesv3_bu/__init__.py @@ -1 +1 @@ -__version__ = "1.0.3" +__version__ = "1.0.4" -- GitLab