From cf0a87c538b6647535ae7067ce58d2594a13acbc Mon Sep 17 00:00:00 2001 From: mguevara Date: Thu, 19 Dec 2019 09:48:34 +0100 Subject: [PATCH 1/3] Updated specitation profiles for MONARCH Cb05 AERO5, added GFAS species --- .../speciation/Speciation_profile_cb05_aero5_MONARCH.csv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/profiles/speciation/Speciation_profile_cb05_aero5_MONARCH.csv b/data/profiles/speciation/Speciation_profile_cb05_aero5_MONARCH.csv index 4680845..d2f27f9 100755 --- a/data/profiles/speciation/Speciation_profile_cb05_aero5_MONARCH.csv +++ b/data/profiles/speciation/Speciation_profile_cb05_aero5_MONARCH.csv @@ -1,6 +1,6 @@ -ID;NO;NO2;HONO;CO;SO2;NH3;ALD2;ALDX;BENZENE;ETH;ETHA;ETOH;FORM;IOLE;ISOP;MEOH;OLE;PAR;SESQ;TERP;TOL;XYL;DMS;HCL;POA;PEC;PNO3;PSO4;PMFINE;PMC;SO2_GFAS;DMS_GFAS;POA_GFAS;PEC_GFAS;PSO4_GFAS;PMFINE_GFAS -units;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2 -short_description;nitrogen_monoxide;nitrogen_dioxide;nitrous_acid;carbon_monoxide;sulfur_dioxide;ammonia;acetaldehyde;higher_aldehydes;benzene;ethene;ethane;ethanol;formaldehyde;internal_olefin_carbon_bond;isoprene;methanol;terminal_olefin_carbon_bond;paraffin_carbon_bond;sesquiterpenes;terpene;toluene;xylene;dimethyl_sulfide;hydrogen_chloride;primary_organic_carbon;primary_elemental_carbon;primary_nitrate_fine;primary_sulfate_fine;primary_others_fine;pm_coarse;sulfur_dioxide_gfas;dimethyl_sulfide_gfas;primary_organic_aerosol_gfas;primary_elemental_carbon_gfas;primary_sulfate_fine_gfas;primary_others_fine_gfas +ID;NO;NO2;HONO;CO;SO2;NH3;ALD2;ALDX;BENZENE;ETH;ETHA;ETOH;FORM;IOLE;ISOP;MEOH;OLE;PAR;SESQ;TERP;TOL;XYL;DMS;HCL;POA;PEC;PNO3;PSO4;PMFINE;PMC;SO2_GFAS;DMS_GFAS;POA_GFAS;PEC_GFAS;PSO4_GFAS;PMFINE_GFAS;PMC_GFAS +units;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2;mol.s-1.m-2;mol.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2;kg.s-1.m-2 +short_description;nitrogen_monoxide;nitrogen_dioxide;nitrous_acid;carbon_monoxide;sulfur_dioxide;ammonia;acetaldehyde;higher_aldehydes;benzene;ethene;ethane;ethanol;formaldehyde;internal_olefin_carbon_bond;isoprene;methanol;terminal_olefin_carbon_bond;paraffin_carbon_bond;sesquiterpenes;terpene;toluene;xylene;dimethyl_sulfide;hydrogen_chloride;primary_organic_carbon;primary_elemental_carbon;primary_nitrate_fine;primary_sulfate_fine;primary_others_fine;pm_coarse;sulfur_dioxide_gfas;dimethyl_sulfide_gfas;primary_organic_aerosol_gfas;primary_elemental_carbon_gfas;primary_sulfate_fine_gfas;primary_others_fine_gfas;pm_coarse_gfas E001;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;so2;c2h6s;1.8*3*oc;5.9*bc;0;pm25-oc-bc;0 E002;0.9*nox_no2;0.1*nox_no2;0;co;so2;nh3;0.625*voc22;0.375*voc22;voc13;voc07;voc02;0.5*voc01;voc21;0.666*voc12;0;0.5*voc01;voc08+0.333*voc12;1.5*voc03+4*voc04+5*voc05+7.5*voc06+voc08+voc09+voc13+voc16+2.2*voc17+1.875*voc22+4*voc23+voc24;0;0;voc14+0.2*voc17;voc15+voc16+voc17;0;0;1.3*oc;bc;0;(pm25-oc-bc)*0.155;(pm25-oc-bc)*0.845;pm10-pm25;0;0;0;0;0;0;0 E003;0.9*nox_no2;0.1*nox_no2;0;co;so2;nh3;0.625*voc22;0.01*voc18+0.3*voc19+0.375*voc22;voc13;voc07;voc02;0.5*voc01;voc21;0.666*voc12;0;0.5*voc01;voc08+0.333*voc12;1.5*voc03+4*voc04+5*voc05+7.5*voc06+voc08+voc09+voc13+voc16+2.2*voc17+4.11*voc18+4*voc19+1.875*voc22+4*voc23+voc24;0;0;voc14+0.2*voc17;voc15+voc16+voc17;0;0;1.3*oc;bc;0;(pm25-oc-bc)*0.089;(pm25-oc-bc)*0.911;pm10-pm25;0;0;0;0;0;0;0 -- GitLab From bab0cab874755ca593f2e689108a932725d65b07 Mon Sep 17 00:00:00 2001 From: Carles Tena Date: Thu, 9 Jan 2020 11:21:04 +0100 Subject: [PATCH 2/3] Changed ; by , in the Molecular weights --- data/profiles/speciation/MolecularWeights.csv | 138 +++++++++--------- hermesv3_gr/modules/speciation/speciation.py | 2 +- 2 files changed, 70 insertions(+), 70 deletions(-) diff --git a/data/profiles/speciation/MolecularWeights.csv b/data/profiles/speciation/MolecularWeights.csv index 262b591..1a43266 100755 --- a/data/profiles/speciation/MolecularWeights.csv +++ b/data/profiles/speciation/MolecularWeights.csv @@ -1,69 +1,69 @@ -Specie;MW -nox_no;30.01 -nox_no2;46.01 -co;28.01 -so2;64.06 -nh3;17.03 -pm10;1.0 -pm25;1.0 -pm25_fossil;1.0 -pm25_bio;1.0 -oc;1.0 -bc;1.0 -ec;1.0 -so4;1.0 -ash;1.0 -c2h6s;62.13 -hcl;36.46 -c2h2;26.04 -ch3cooh;60.05 -c2h4o;44.05 -c4h10;58.12 -c2h5oh;46.07 -ch2o;30.03 -c6h14;86.18 -hialkanes;118.89 -c5h8;68.12 -c8h16;112.21 -c5h10;70.13 -c3h6;42.08 -c7h8;92.14 -c8h10;106.17 -c3h6o;58.08 -c6h6;78.11 -c4h8;56.11 -c2h6;30.07 -c2h4;28.05 -c7h16;100.2 -c6h12;84.16 -hialkenes;75.78 -ch3oh;32.04 -c5h12;72.15 -c3h8;44.1 -terpenes;160.0 -voc01;46.2 -voc02;30.07 -voc03;44.1 -voc04;58.12 -voc05;72.15 -voc06;106.8 -voc07;28.05 -voc08;42.08 -voc09;26.04 -voc10;68.12 -voc11;136.24 -voc12;67 -voc13;78.11 -voc14;92.14 -voc15;106.17 -voc16;120.0 -voc17;126.8 -voc18;104.7 -voc19;81.5 -voc20;138.8 -voc21;30.03 -voc22;68.8 -voc23;75.3 -voc24;59.1 -voc25;86.9 -nmvoc;1.0 \ No newline at end of file +Specie,MW +nox_no,30.01 +nox_no2,46.01 +co,28.01 +so2,64.06 +nh3,17.03 +pm10,1.0 +pm25,1.0 +pm25_fossil,1.0 +pm25_bio,1.0 +oc,1.0 +bc,1.0 +ec,1.0 +so4,1.0 +ash,1.0 +c2h6s,62.13 +hcl,36.46 +c2h2,26.04 +ch3cooh,60.05 +c2h4o,44.05 +c4h10,58.12 +c2h5oh,46.07 +ch2o,30.03 +c6h14,86.18 +hialkanes,118.89 +c5h8,68.12 +c8h16,112.21 +c5h10,70.13 +c3h6,42.08 +c7h8,92.14 +c8h10,106.17 +c3h6o,58.08 +c6h6,78.11 +c4h8,56.11 +c2h6,30.07 +c2h4,28.05 +c7h16,100.2 +c6h12,84.16 +hialkenes,75.78 +ch3oh,32.04 +c5h12,72.15 +c3h8,44.1 +terpenes,160.0 +voc01,46.2 +voc02,30.07 +voc03,44.1 +voc04,58.12 +voc05,72.15 +voc06,106.8 +voc07,28.05 +voc08,42.08 +voc09,26.04 +voc10,68.12 +voc11,136.24 +voc12,67 +voc13,78.11 +voc14,92.14 +voc15,106.17 +voc16,120.0 +voc17,126.8 +voc18,104.7 +voc19,81.5 +voc20,138.8 +voc21,30.03 +voc22,68.8 +voc23,75.3 +voc24,59.1 +voc25,86.9 +nmvoc,1.0 \ No newline at end of file diff --git a/hermesv3_gr/modules/speciation/speciation.py b/hermesv3_gr/modules/speciation/speciation.py index 713a484..a0e4b10 100755 --- a/hermesv3_gr/modules/speciation/speciation.py +++ b/hermesv3_gr/modules/speciation/speciation.py @@ -108,7 +108,7 @@ class Speciation(object): st_time = timeit.default_timer() - df = pd.read_csv(molecular_weights_path, sep=';') + df = pd.read_csv(molecular_weights_path, sep=',') dict_aux = {} -- GitLab From caa91269d10dfdca8fbd5da9a997d92b9fa8b166 Mon Sep 17 00:00:00 2001 From: Carles Tena Date: Tue, 14 Jan 2020 17:22:40 +0100 Subject: [PATCH 3/3] Corrected bug on GFAS as point source emission inventory --- CHANGELOG | 4 ++++ hermesv3_gr/__init__.py | 2 +- .../emision_inventories/point_gfas_emission_inventory.py | 4 +--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d759bf9..b1ff499 100755 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +2.0.2 + 2020/01/14 + - Corrected bug on GFAS as point emissions. + 2.0.1 2019/12/18 - Added unrecognized arguments diff --git a/hermesv3_gr/__init__.py b/hermesv3_gr/__init__.py index 159d48b..0309ae2 100755 --- a/hermesv3_gr/__init__.py +++ b/hermesv3_gr/__init__.py @@ -1 +1 @@ -__version__ = "2.0.1" +__version__ = "2.0.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 78167bb..db17855 100755 --- a/hermesv3_gr/modules/emision_inventories/point_gfas_emission_inventory.py +++ b/hermesv3_gr/modules/emision_inventories/point_gfas_emission_inventory.py @@ -280,9 +280,7 @@ class PointGfasEmissionInventory(EmissionInventory): if self.masking.scale_mask is not None: aux = aux * self.masking.scale_mask.flatten()[gdf['src_index']] - gdf[pollutant['name']] = aux * gdf['src_area'] - # print 'masa {0}: {1} '.format(pollutant['name'], gdf[pollutant['name']].sum()) - gdf[pollutant['name']] = (aux / gdf['dst_area']) * \ + gdf[pollutant['name']] = (aux / gdf['dst_area'].values) * \ netcdf.variables['cell_area'][:].flatten()[gdf['src_index']] # print netcdf.variables['bc'][:].sum() -- GitLab