From ef4911e09b68a4666d39587431c43373ea7f99e4 Mon Sep 17 00:00:00 2001 From: lewisblake Date: Wed, 6 Apr 2022 10:46:11 +0200 Subject: [PATCH 01/15] first draft voc --- pyaerocom/data/ebas_config.ini | 6 +++++- pyaerocom/data/emep_variables.ini | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pyaerocom/data/ebas_config.ini b/pyaerocom/data/ebas_config.ini index 5aef52ff4..3d0cc963e 100644 --- a/pyaerocom/data/ebas_config.ini +++ b/pyaerocom/data/ebas_config.ini @@ -354,4 +354,8 @@ matrix=precip [prmm] # pyaerocom unit mm d-1 component=precipitation_amount_off,precipitation_amount -matrix=precip \ No newline at end of file +matrix=precip + +[vmrvoc] # pyaerocom unit mm d-1 +component=voc_complete +matrix=air \ No newline at end of file diff --git a/pyaerocom/data/emep_variables.ini b/pyaerocom/data/emep_variables.ini index 86f924944..a0ad33c1f 100644 --- a/pyaerocom/data/emep_variables.ini +++ b/pyaerocom/data/emep_variables.ini @@ -82,6 +82,7 @@ vmrc2h4=SURF_ppb_C2H4 vmrhcho=SURF_ppb_HCHO vmrglyoxal=SURF_ppb_GLYOX vmrisop=SURF_ppb_C5H8 +vmrvoc=SURF_ppbC_VOC wetbc=WDEP_EC wetdust=WDEP_DUST wetnh4=WDEP_NH4_f From a36bbed4e9f706c4572b3da70ceac2c92a707e9b Mon Sep 17 00:00:00 2001 From: lewisblake Date: Wed, 6 Apr 2022 11:30:54 +0200 Subject: [PATCH 02/15] removal of voc-complete --- pyaerocom/data/ebas_config.ini | 6 +----- pyaerocom/data/emep_variables.ini | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pyaerocom/data/ebas_config.ini b/pyaerocom/data/ebas_config.ini index 3d0cc963e..5aef52ff4 100644 --- a/pyaerocom/data/ebas_config.ini +++ b/pyaerocom/data/ebas_config.ini @@ -354,8 +354,4 @@ matrix=precip [prmm] # pyaerocom unit mm d-1 component=precipitation_amount_off,precipitation_amount -matrix=precip - -[vmrvoc] # pyaerocom unit mm d-1 -component=voc_complete -matrix=air \ No newline at end of file +matrix=precip \ No newline at end of file diff --git a/pyaerocom/data/emep_variables.ini b/pyaerocom/data/emep_variables.ini index a0ad33c1f..86f924944 100644 --- a/pyaerocom/data/emep_variables.ini +++ b/pyaerocom/data/emep_variables.ini @@ -82,7 +82,6 @@ vmrc2h4=SURF_ppb_C2H4 vmrhcho=SURF_ppb_HCHO vmrglyoxal=SURF_ppb_GLYOX vmrisop=SURF_ppb_C5H8 -vmrvoc=SURF_ppbC_VOC wetbc=WDEP_EC wetdust=WDEP_DUST wetnh4=WDEP_NH4_f From 719212e80cfd73cbb76579f38ec4d73307448912 Mon Sep 17 00:00:00 2001 From: Lewis Rae Blake Date: Thu, 7 Apr 2022 11:07:47 +0000 Subject: [PATCH 03/15] first priority voc list --- pyaerocom/data/ebas_config.ini | 24 +++++++++++++++++++++++- pyaerocom/data/emep_variables.ini | 5 +++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/pyaerocom/data/ebas_config.ini b/pyaerocom/data/ebas_config.ini index 3d0cc963e..303e5d0c9 100644 --- a/pyaerocom/data/ebas_config.ini +++ b/pyaerocom/data/ebas_config.ini @@ -356,6 +356,28 @@ matrix=precip component=precipitation_amount_off,precipitation_amount matrix=precip + +# VOCs [vmrvoc] # pyaerocom unit mm d-1 component=voc_complete -matrix=air \ No newline at end of file +matrix=air + +[vmrnc4h10] +component=2-methylpropane +matrix=air + +[vmrc6h6] +component=benzene +matrix=air + +[vmrapinene] +component=alpha-pinene +matrix=air + +[vmrch3cho] +component=ethanol +matrix=air + +[vmrtoluene] +component=toluene +matrix=air diff --git a/pyaerocom/data/emep_variables.ini b/pyaerocom/data/emep_variables.ini index a0ad33c1f..b16d49df3 100644 --- a/pyaerocom/data/emep_variables.ini +++ b/pyaerocom/data/emep_variables.ini @@ -73,15 +73,20 @@ concssf=SURF_ug_SEASALT_F concssc=SURF_ug_SEASALT_C concCocpm25=SURF_ugC_PM_OM25 concecpm25=SURF_ug_ECFINE +vmrapinene=SURF_ppb_APINENE vmro32m=SURF_2MO3 vmro3max=SURF_MAXO3 vmro3=SURF_ppb_O3 vmrco=SURF_ppb_CO vmrc2h6=SURF_ppb_C2H6 vmrc2h4=SURF_ppb_C2H4 +vmrc6h6=SURF_ppb_BENZENE +vmrch3cho=SURF_ppb_CH3CHO vmrhcho=SURF_ppb_HCHO +vmrnc4h10=SURF_ppb_NC4H10 vmrglyoxal=SURF_ppb_GLYOX vmrisop=SURF_ppb_C5H8 +vmrtoluene=SURF_ppb_TOLUENE vmrvoc=SURF_ppbC_VOC wetbc=WDEP_EC wetdust=WDEP_DUST From 525bbee2d329fc16b57508d96e15cf317fc0898a Mon Sep 17 00:00:00 2001 From: lewisblake Date: Fri, 8 Apr 2022 06:42:57 +0000 Subject: [PATCH 04/15] nCH4H10, benzene, apinene, toluene --- pyaerocom/data/ebas_config.ini | 14 +++++++------- pyaerocom/data/emep_variables.ini | 6 +++--- pyaerocom/data/variables.ini | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/pyaerocom/data/ebas_config.ini b/pyaerocom/data/ebas_config.ini index 303e5d0c9..5747050eb 100644 --- a/pyaerocom/data/ebas_config.ini +++ b/pyaerocom/data/ebas_config.ini @@ -362,22 +362,22 @@ matrix=precip component=voc_complete matrix=air +[vmrch3cho] +component=ethanol +matrix=air + [vmrnc4h10] component=2-methylpropane matrix=air -[vmrc6h6] +[vmrbenzene] component=benzene matrix=air -[vmrapinene] +[vmrc10h16] component=alpha-pinene matrix=air -[vmrch3cho] -component=ethanol -matrix=air - -[vmrtoluene] +[vmrtolu] component=toluene matrix=air diff --git a/pyaerocom/data/emep_variables.ini b/pyaerocom/data/emep_variables.ini index b16d49df3..3c8b08ad0 100644 --- a/pyaerocom/data/emep_variables.ini +++ b/pyaerocom/data/emep_variables.ini @@ -73,20 +73,20 @@ concssf=SURF_ug_SEASALT_F concssc=SURF_ug_SEASALT_C concCocpm25=SURF_ugC_PM_OM25 concecpm25=SURF_ug_ECFINE -vmrapinene=SURF_ppb_APINENE +vmrc10h16=SURF_ppb_APINENE vmro32m=SURF_2MO3 vmro3max=SURF_MAXO3 vmro3=SURF_ppb_O3 vmrco=SURF_ppb_CO vmrc2h6=SURF_ppb_C2H6 vmrc2h4=SURF_ppb_C2H4 -vmrc6h6=SURF_ppb_BENZENE +vmrbenzene=SURF_ppb_BENZENE vmrch3cho=SURF_ppb_CH3CHO vmrhcho=SURF_ppb_HCHO vmrnc4h10=SURF_ppb_NC4H10 vmrglyoxal=SURF_ppb_GLYOX vmrisop=SURF_ppb_C5H8 -vmrtoluene=SURF_ppb_TOLUENE +vmrtolu=SURF_ppb_TOLUENE vmrvoc=SURF_ppbC_VOC wetbc=WDEP_EC wetdust=WDEP_DUST diff --git a/pyaerocom/data/variables.ini b/pyaerocom/data/variables.ini index 729a8d83c..69381097b 100644 --- a/pyaerocom/data/variables.ini +++ b/pyaerocom/data/variables.ini @@ -5283,3 +5283,25 @@ minimum = -150 maximum = 150 dimensions = time,lev,station comments_and_purpose = For physics evaluation and chemistry interpretation above stations' locations. + +[vmrnc4h10] +var_name = vmrnc4h10 +description = mole_fraction_of_2-methylpropane_in_air +standard_name = 2-methylpropane +var_type = volume mixing ratios +unit = mol mol-1 +minimum = 0 +maximum = 0.1 +dimensions = time, lat, lon +comments_and_purpose = Verification of VOC speciation/chemistry. + +[vmrbenzene] +var_name = vmrbenzene +description = mole_fraction_of_benzene_in_air +standard_name = benzene +var_type = volume mixing ratios +unit = mol mol-1 +minimum = 0 +maximum = 0.1 +dimensions = time, lat, lon +comments_and_purpose = Verification of VOC speciation/chemistry. From 6b25f3aba0b717dc2809bc57cfd5c0401bdcd2a8 Mon Sep 17 00:00:00 2001 From: lewisblake Date: Fri, 8 Apr 2022 11:31:49 +0000 Subject: [PATCH 05/15] voc var web names --- pyaerocom/aeroval/glob_defaults.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pyaerocom/aeroval/glob_defaults.py b/pyaerocom/aeroval/glob_defaults.py index cd1cb6a99..475ef278a 100644 --- a/pyaerocom/aeroval/glob_defaults.py +++ b/pyaerocom/aeroval/glob_defaults.py @@ -247,4 +247,14 @@ vmrco=["CO", "3D", "Volume mixing ratios"], vmrno2=["NO2", "3D", "Volume mixing ratios"], concco=["CO", "3D", "Particle concentration"], + vmrhcho=["HCHO (Formaldehyde)", "3D", "Volume mixing ratios"], + vmrisop=["C5H8 (Isoprene)", "3D", "Volume mixing ratios"], + vmrc2h6=["C2H6 (Ethane)", "3D", "Volume mixing ratios"], + vmrc2h4=["C2H4 (Ethylene)", "3D", "Volume mixing ratios"], + vmrnc4h10=["nC4H10 (2-methylpropane)", "3D", "Volume mixing ratios"], + vmrbenzene=["C6H6 (Benzene)", "3D", "Volume mixing ratios"], + vmrc10h16=["C10H16 (Alpha-Pinene)", "3D", "Volume mixing ratios"], + vmrch3cho=["CH3CHO (Acetaldehyde)", "3D", "Volume mixing ratios"], + vmrglyoxal=["Glyoxal", "3D", "Volume mixing ratios"], + vmrtolu=["Toluene", "3D", "Volume mixing ratios"], ) From 5356d010bdb6b594c428692eb75feb60b357f561 Mon Sep 17 00:00:00 2001 From: lewisblake Date: Fri, 8 Apr 2022 13:19:59 +0000 Subject: [PATCH 06/15] fixed ch3cho units to nmol mol-1 --- pyaerocom/data/ebas_config.ini | 4 ++-- pyaerocom/data/variables.ini | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pyaerocom/data/ebas_config.ini b/pyaerocom/data/ebas_config.ini index 5747050eb..a894f7c25 100644 --- a/pyaerocom/data/ebas_config.ini +++ b/pyaerocom/data/ebas_config.ini @@ -358,12 +358,12 @@ matrix=precip # VOCs -[vmrvoc] # pyaerocom unit mm d-1 +[vmrvoc] component=voc_complete matrix=air [vmrch3cho] -component=ethanol +component=ethanal matrix=air [vmrnc4h10] diff --git a/pyaerocom/data/variables.ini b/pyaerocom/data/variables.ini index 69381097b..283c0a701 100644 --- a/pyaerocom/data/variables.ini +++ b/pyaerocom/data/variables.ini @@ -3101,9 +3101,9 @@ var_name = vmrch3cho description = acetaldehyde Volume Mixing Ratio standard_name = mole_fraction_of_acetaldehyde_in_air var_type = volume mixing ratios -unit = mol mol-1 -minimum = 0 -maximum = 0.1 +unit = nmol mol-1 +minimum = -1e12 +maximum = 1e12 dimensions = time,lat,lon comments_and_purpose = Verification of VOC speciation/chemistry @@ -3155,9 +3155,9 @@ var_name = vmrtolu description = toluene Volume Mixing Ratio standard_name = mole_fraction_of_toluene_in_air var_type = volume mixing ratios -unit = mol mol-1 -minimum = 0 -maximum = 0.1 +unit = nmol mol-1 +minimum = -1e12 +maximum = 1e12 dimensions = time,lat,lon comments_and_purpose = Verification of VOC speciation/chemistry @@ -3188,7 +3188,7 @@ var_name = vmrc10h16 description = alpha-pinene Volume Mixing Ratio standard_name = mole_fraction_of_alpha_pinene_in_air var_type = volume mixing ratios -unit = mol mol-1 +unit = nmol mol-1 minimum = 0 maximum = 0.1 dimensions = time,lat,lon @@ -5289,9 +5289,9 @@ var_name = vmrnc4h10 description = mole_fraction_of_2-methylpropane_in_air standard_name = 2-methylpropane var_type = volume mixing ratios -unit = mol mol-1 -minimum = 0 -maximum = 0.1 +unit = nmol mol-1 +minimum = -1e12 +maximum = 1e12 dimensions = time, lat, lon comments_and_purpose = Verification of VOC speciation/chemistry. @@ -5300,8 +5300,8 @@ var_name = vmrbenzene description = mole_fraction_of_benzene_in_air standard_name = benzene var_type = volume mixing ratios -unit = mol mol-1 -minimum = 0 -maximum = 0.1 +unit = nmol mol-1 +minimum = -1e12 +maximum = 1e12 dimensions = time, lat, lon comments_and_purpose = Verification of VOC speciation/chemistry. From b4c8dfb56cf80c4c88039e5472abbf63e9619cfc Mon Sep 17 00:00:00 2001 From: lewisblake Date: Wed, 11 May 2022 08:50:02 +0000 Subject: [PATCH 07/15] Fix nCH4H10 to be n-butane --- pyaerocom/data/variables.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyaerocom/data/variables.ini b/pyaerocom/data/variables.ini index 283c0a701..3ac780f64 100644 --- a/pyaerocom/data/variables.ini +++ b/pyaerocom/data/variables.ini @@ -5286,8 +5286,8 @@ comments_and_purpose = For physics evaluation and chemistry interpretation above [vmrnc4h10] var_name = vmrnc4h10 -description = mole_fraction_of_2-methylpropane_in_air -standard_name = 2-methylpropane +description = mole_fraction_of_n-butane_in_air +standard_name = n-butane var_type = volume mixing ratios unit = nmol mol-1 minimum = -1e12 From 690521e9415f0e05bd96aa538c0ba544834224d2 Mon Sep 17 00:00:00 2001 From: lewisblake Date: Wed, 11 May 2022 11:32:40 +0000 Subject: [PATCH 08/15] adding vmrbenzene to VAR_NAME_FILE --- pyaerocom/io/read_eea_aqerep_base.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyaerocom/io/read_eea_aqerep_base.py b/pyaerocom/io/read_eea_aqerep_base.py index ee461bff7..f43b557ff 100644 --- a/pyaerocom/io/read_eea_aqerep_base.py +++ b/pyaerocom/io/read_eea_aqerep_base.py @@ -76,6 +76,7 @@ class ReadEEAAQEREPBase(ReadUngriddedBase): VAR_NAMES_FILE["vmro3"] = "concentration" VAR_NAMES_FILE["vmro3max"] = "concentration" VAR_NAMES_FILE["vmrno2"] = "concentration" + VAR_NAMES_FILE["vmrbenezene"] = "concentration" #: units of variables in files (needs to be defined for each variable supported) VAR_UNITS_FILE = {"µg/m3": "ug m-3", "mg/m3": "mg m-3", "ppb": "ppb"} @@ -92,6 +93,7 @@ class ReadEEAAQEREPBase(ReadUngriddedBase): concco="**/??_10_*_timeseries.csv*", concno="**/??_38_*_timeseries.csv*", concpm25="**/??_6001_*_timeseries.csv*", + vmrbenzene="**/??_20_*_timeseries.csv*", ) # conversion factor between concX and vmrX @@ -127,6 +129,7 @@ class ReadEEAAQEREPBase(ReadUngriddedBase): VAR_CODES["10"] = "concco" VAR_CODES["38"] = "concno" VAR_CODES["6001"] = "concpm25" + VAR_CODES["20"] = "vmrbenzene" #: column name that holds the EEA variable code VAR_CODE_NAME = "airpollutantcode" From 23db2bb1d0dc607193b503766f6a1d2bffadccfa Mon Sep 17 00:00:00 2001 From: lewisblake Date: Fri, 10 Jun 2022 13:16:57 +0000 Subject: [PATCH 09/15] begin incorporating n-butane and i-butane --- pyaerocom/aeroval/glob_defaults.py | 3 +- pyaerocom/data/ebas_config.ini | 12 ++++++++ pyaerocom/data/emep_variables.ini | 5 +++- pyaerocom/data/paths.ini | 3 +- pyaerocom/data/variables.ini | 46 +++++++++++++++++++++++++++--- 5 files changed, 62 insertions(+), 7 deletions(-) diff --git a/pyaerocom/aeroval/glob_defaults.py b/pyaerocom/aeroval/glob_defaults.py index 8631e39c2..6b95b960e 100644 --- a/pyaerocom/aeroval/glob_defaults.py +++ b/pyaerocom/aeroval/glob_defaults.py @@ -252,7 +252,8 @@ vmrisop=["C5H8 (Isoprene)", "3D", "Volume mixing ratios"], vmrc2h6=["C2H6 (Ethane)", "3D", "Volume mixing ratios"], vmrc2h4=["C2H4 (Ethylene)", "3D", "Volume mixing ratios"], - vmrnc4h10=["nC4H10 (2-methylpropane)", "3D", "Volume mixing ratios"], + vmrnc4h10=["nC4H10 (n-Butane)", "3D", "Volume mixing ratios"], + vmric4h10=["iC4H10 (2-methylpropane)", "3D", "Volume mixing ratios"], vmrbenzene=["C6H6 (Benzene)", "3D", "Volume mixing ratios"], vmrc10h16=["C10H16 (Alpha-Pinene)", "3D", "Volume mixing ratios"], vmrch3cho=["CH3CHO (Acetaldehyde)", "3D", "Volume mixing ratios"], diff --git a/pyaerocom/data/ebas_config.ini b/pyaerocom/data/ebas_config.ini index 34ae55265..88f99eca9 100644 --- a/pyaerocom/data/ebas_config.ini +++ b/pyaerocom/data/ebas_config.ini @@ -371,6 +371,18 @@ component=ethanal matrix=air [vmrnc4h10] +component=n-butane +matrix=air + +[vmric4h10] +component=2-methylpropane +matrix=air + +[concnc4h10] +component=n-butane +matrix=air + +[concic4h10] component=2-methylpropane matrix=air diff --git a/pyaerocom/data/emep_variables.ini b/pyaerocom/data/emep_variables.ini index 3c8b08ad0..23784ceea 100644 --- a/pyaerocom/data/emep_variables.ini +++ b/pyaerocom/data/emep_variables.ini @@ -53,6 +53,8 @@ concbcc=SURF_ug_ECCOARSE concbcf=SURF_ug_ECFINE concdust=SURF_ug_DUST conchno3=SURF_ug_HNO3 +concnc4h10=SURF_ug_NC4H10_T +concic4h10=SURF_ug_IC4H10_T concnh3=SURF_ug_NH3 concnh4=SURF_ug_NH4_F concno2=SURF_ug_NO2 @@ -83,7 +85,8 @@ vmrc2h4=SURF_ppb_C2H4 vmrbenzene=SURF_ppb_BENZENE vmrch3cho=SURF_ppb_CH3CHO vmrhcho=SURF_ppb_HCHO -vmrnc4h10=SURF_ppb_NC4H10 +vmrnc4h10=SURF_ppb_NC4H10_T +vmric4h10=SURF_ppb_IC4H10_T vmrglyoxal=SURF_ppb_GLYOX vmrisop=SURF_ppb_C5H8 vmrtolu=SURF_ppb_TOLUENE diff --git a/pyaerocom/data/paths.ini b/pyaerocom/data/paths.ini index ef7cb6b6d..3477a8e6c 100644 --- a/pyaerocom/data/paths.ini +++ b/pyaerocom/data/paths.ini @@ -82,7 +82,8 @@ AERONET_INV_V3L15_DAILY = ${BASEDIR}/aerocom/aerocom1/AEROCOM_OBSDATA/Aeronet.In AERONET_INV_V3L2_DAILY = ${BASEDIR}/aerocom/aerocom1/AEROCOM_OBSDATA/Aeronet.Inv.V3L2.0.daily/renamed # other observations -EBAS_MULTICOLUMN = ${BASEDIR}/aerocom/aerocom1/AEROCOM_OBSDATA/EBASMultiColumn/data +#EBAS_MULTICOLUMN = ${BASEDIR}/aerocom/aerocom1/AEROCOM_OBSDATA/EBASMultiColumn/data +EBAS_MULTICOLUMN = /lustre/storeB/project/aerocom/aerocom1/AEROCOM_OBSDATA/EBASMultiColumn/data EEA = ${BASEDIR}/aerocom/aerocom1/AEROCOM_OBSDATA/EEA_AQeRep/renamed EARLINET = ${BASEDIR}/aerocom/aerocom1/AEROCOM_OBSDATA/Export/Earlinet/CAMS/data GAWTADsubsetAasEtAl = ${BASEDIR}/aerocom/aerocom1/AEROCOM_OBSDATA/PYAEROCOM/GAWTADSulphurSubset/data diff --git a/pyaerocom/data/variables.ini b/pyaerocom/data/variables.ini index 3ac780f64..f0c562716 100644 --- a/pyaerocom/data/variables.ini +++ b/pyaerocom/data/variables.ini @@ -5284,6 +5284,20 @@ maximum = 150 dimensions = time,lev,station comments_and_purpose = For physics evaluation and chemistry interpretation above stations' locations. + + +[vmrbenzene] +var_name = vmrbenzene +description = mole_fraction_of_benzene_in_air +standard_name = benzene +var_type = volume mixing ratios +unit = nmol mol-1 +minimum = -1e12 +maximum = 1e12 +dimensions = time, lat, lon +comments_and_purpose = Verification of VOC speciation/chemistry. + + [vmrnc4h10] var_name = vmrnc4h10 description = mole_fraction_of_n-butane_in_air @@ -5295,13 +5309,37 @@ maximum = 1e12 dimensions = time, lat, lon comments_and_purpose = Verification of VOC speciation/chemistry. -[vmrbenzene] -var_name = vmrbenzene -description = mole_fraction_of_benzene_in_air -standard_name = benzene +[vmric4h10] +var_name = vmric4h10 +description = mole_fraction_of_n-butane_in_air +standard_name = 2-methylpropane var_type = volume mixing ratios unit = nmol mol-1 minimum = -1e12 maximum = 1e12 dimensions = time, lat, lon comments_and_purpose = Verification of VOC speciation/chemistry. + +[concnc4h10] +var_name= concnc4h10 +description = concentration_of_i-butane_in_air +standard_name = n-butane +var_type = mass concentration +unit = ug S m-3 +minimum = -1e12 +maximum = 1e12 +dimensions = time, lat, lon +comments_and_purpose = Verification of VOC speciation/chemistry. + +[concic4h10] +var_name= concic4h10 +description = concentration_of_i-butane_in_air +standard_name = 2-methylpropane +var_type = mass concentration +unit = ug S m-3 +minimum = -1e12 +maximum = 1e12 +dimensions = time, lat, lon +comments_and_purpose = Verification of VOC speciation/chemistry. + + From 69df91c1e6dc759e42b151c35d5032bd2bdface5 Mon Sep 17 00:00:00 2001 From: lewisblake Date: Mon, 13 Jun 2022 13:18:31 +0000 Subject: [PATCH 10/15] benzene units --- pyaerocom/io/read_eea_aqerep_base.py | 8 ++++++-- pyaerocom/units_helpers.py | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pyaerocom/io/read_eea_aqerep_base.py b/pyaerocom/io/read_eea_aqerep_base.py index f43b557ff..5f1ee9a0f 100644 --- a/pyaerocom/io/read_eea_aqerep_base.py +++ b/pyaerocom/io/read_eea_aqerep_base.py @@ -76,7 +76,7 @@ class ReadEEAAQEREPBase(ReadUngriddedBase): VAR_NAMES_FILE["vmro3"] = "concentration" VAR_NAMES_FILE["vmro3max"] = "concentration" VAR_NAMES_FILE["vmrno2"] = "concentration" - VAR_NAMES_FILE["vmrbenezene"] = "concentration" + VAR_NAMES_FILE["vmrbenzene"] = "concentration" #: units of variables in files (needs to be defined for each variable supported) VAR_UNITS_FILE = {"µg/m3": "ug m-3", "mg/m3": "mg m-3", "ppb": "ppb"} @@ -107,13 +107,17 @@ class ReadEEAAQEREPBase(ReadUngriddedBase): CONV_FACTOR["vmrno2"] = np.float_( 0.514 ) # retrieved using STD atmosphere from geonum and pya.mathutils.concx_to_vmrx + # CONV_FACTOR["vmrbenzene"] = np.float_( + # 0.313 + # ) + # unit of the converted property after the conversion CONV_UNIT = {} CONV_UNIT["vmro3"] = "ppb" CONV_UNIT["vmro3max"] = "ppb" CONV_UNIT["vmrno2"] = "ppb" - + CONV_UNIT["vmrbenzene"] = "ppb" #: field name of the start time of the measurement (in lower case) START_TIME_NAME = "datetimebegin" diff --git a/pyaerocom/units_helpers.py b/pyaerocom/units_helpers.py index 119fae2c7..549131b92 100644 --- a/pyaerocom/units_helpers.py +++ b/pyaerocom/units_helpers.py @@ -54,6 +54,8 @@ # ["concnh4", "ug N/m3", "ug m-3", M_NH4 / M_N], ["wetso4", "kg S/ha", "kg m-2", M_SO4 / M_S / HA_TO_SQM], ["concso4pr", "mg S/L", "g m-3", M_SO4 / M_S], + ["vmrbenzene", "ug m-3", "ppb", 1/3.2430], # Source (EC): https://uk-air.defra.gov.uk/assets/documents/reports/cat06/0502160851_Conversion_Factors_Between_ppb_and.pdf + ], columns=["var_name", "from", "to", "fac"], ).set_index(["var_name", "from"]) From a51968f9f49b0be09aa70caa2b51b3572c3080ab Mon Sep 17 00:00:00 2001 From: lewisblake Date: Wed, 15 Jun 2022 08:48:42 +0000 Subject: [PATCH 11/15] bezene eea working. needs cleanup --- pyaerocom/data/aliases.ini | 1 + pyaerocom/data/emep_variables.ini | 1 + pyaerocom/data/variables.ini | 13 ++++++++++++- pyaerocom/io/read_eea_aqerep_base.py | 13 ++++++++----- pyaerocom/io/read_mscw_ctm.py | 1 + pyaerocom/units_helpers.py | 6 ++++-- 6 files changed, 27 insertions(+), 8 deletions(-) diff --git a/pyaerocom/data/aliases.ini b/pyaerocom/data/aliases.ini index 54aa19ac4..2a04f5d5b 100644 --- a/pyaerocom/data/aliases.ini +++ b/pyaerocom/data/aliases.ini @@ -49,6 +49,7 @@ dryoxs = drysox concss10 = concsscoarse concsscoarse=concss10 vmrglyoxal = vmrglyox +concbenzene = vmrbenzene [alias_families] # so far only works with beginning of name diff --git a/pyaerocom/data/emep_variables.ini b/pyaerocom/data/emep_variables.ini index 23784ceea..90e4b77f7 100644 --- a/pyaerocom/data/emep_variables.ini +++ b/pyaerocom/data/emep_variables.ini @@ -83,6 +83,7 @@ vmrco=SURF_ppb_CO vmrc2h6=SURF_ppb_C2H6 vmrc2h4=SURF_ppb_C2H4 vmrbenzene=SURF_ppb_BENZENE +#concbenzene = SURF_ppb_BENZENE vmrch3cho=SURF_ppb_CH3CHO vmrhcho=SURF_ppb_HCHO vmrnc4h10=SURF_ppb_NC4H10_T diff --git a/pyaerocom/data/variables.ini b/pyaerocom/data/variables.ini index f0c562716..ce8ffe388 100644 --- a/pyaerocom/data/variables.ini +++ b/pyaerocom/data/variables.ini @@ -5297,6 +5297,17 @@ maximum = 1e12 dimensions = time, lat, lon comments_and_purpose = Verification of VOC speciation/chemistry. +[concbenzene] +var_name = concbenzene +description = concentration_of_benzene_in_air +standard_name = benzene +var_type = mass concentration +unit = ug m-3 +minimum = -1e12 +maximum = 1e12 +dimensions = time, lat, lon +comments_and_purpose = Verification of VOC speciation/chemistry. + [vmrnc4h10] var_name = vmrnc4h10 @@ -5311,7 +5322,7 @@ comments_and_purpose = Verification of VOC speciation/chemistry. [vmric4h10] var_name = vmric4h10 -description = mole_fraction_of_n-butane_in_air +description = mole_fraction_of_2-methylpropane_in_air standard_name = 2-methylpropane var_type = volume mixing ratios unit = nmol mol-1 diff --git a/pyaerocom/io/read_eea_aqerep_base.py b/pyaerocom/io/read_eea_aqerep_base.py index 5f1ee9a0f..780c90a96 100644 --- a/pyaerocom/io/read_eea_aqerep_base.py +++ b/pyaerocom/io/read_eea_aqerep_base.py @@ -76,6 +76,7 @@ class ReadEEAAQEREPBase(ReadUngriddedBase): VAR_NAMES_FILE["vmro3"] = "concentration" VAR_NAMES_FILE["vmro3max"] = "concentration" VAR_NAMES_FILE["vmrno2"] = "concentration" + VAR_NAMES_FILE["concbenzene"] = "concentration" VAR_NAMES_FILE["vmrbenzene"] = "concentration" #: units of variables in files (needs to be defined for each variable supported) @@ -93,6 +94,7 @@ class ReadEEAAQEREPBase(ReadUngriddedBase): concco="**/??_10_*_timeseries.csv*", concno="**/??_38_*_timeseries.csv*", concpm25="**/??_6001_*_timeseries.csv*", + concbenzene="**/??_20_*_timeseries.csv*", vmrbenzene="**/??_20_*_timeseries.csv*", ) @@ -107,9 +109,9 @@ class ReadEEAAQEREPBase(ReadUngriddedBase): CONV_FACTOR["vmrno2"] = np.float_( 0.514 ) # retrieved using STD atmosphere from geonum and pya.mathutils.concx_to_vmrx - # CONV_FACTOR["vmrbenzene"] = np.float_( - # 0.313 - # ) + CONV_FACTOR["vmrbenzene"] = np.float_( + 1./3.2430 + ) # unit of the converted property after the conversion @@ -133,7 +135,7 @@ class ReadEEAAQEREPBase(ReadUngriddedBase): VAR_CODES["10"] = "concco" VAR_CODES["38"] = "concno" VAR_CODES["6001"] = "concpm25" - VAR_CODES["20"] = "vmrbenzene" + VAR_CODES["20"] = "concbenzene" #: column name that holds the EEA variable code VAR_CODE_NAME = "airpollutantcode" @@ -178,12 +180,13 @@ class ReadEEAAQEREPBase(ReadUngriddedBase): # and this constant, it can also read the E1a data set DATA_PRODUCT = "" - AUX_REQUIRES = {"vmro3max": ["conco3"], "vmro3": ["conco3"], "vmrno2": ["concno2"]} + AUX_REQUIRES = {"vmro3max": ["conco3"], "vmro3": ["conco3"], "vmrno2": ["concno2"], "vmrbenzene": ["concbenzene"]} AUX_FUNS = { "vmro3": NotImplementedError(), "vmro3max": NotImplementedError(), "vmrno2": NotImplementedError(), + "vmrbenzene": NotImplementedError(), } def __init__(self, data_id=None, data_dir=None): diff --git a/pyaerocom/io/read_mscw_ctm.py b/pyaerocom/io/read_mscw_ctm.py index 2b9f23df1..bd58d5c78 100755 --- a/pyaerocom/io/read_mscw_ctm.py +++ b/pyaerocom/io/read_mscw_ctm.py @@ -72,6 +72,7 @@ class ReadMscwCtm: "concCecpm25": ["concecpm25"], "vmrox": ["concno2", "vmro3"], "vmrno2": ["concno2"], + #"concbenzene": ["vmrbenezene"], } # Functions that are used to compute additional variables (i.e. one diff --git a/pyaerocom/units_helpers.py b/pyaerocom/units_helpers.py index 549131b92..ec3ee6b16 100644 --- a/pyaerocom/units_helpers.py +++ b/pyaerocom/units_helpers.py @@ -54,8 +54,10 @@ # ["concnh4", "ug N/m3", "ug m-3", M_NH4 / M_N], ["wetso4", "kg S/ha", "kg m-2", M_SO4 / M_S / HA_TO_SQM], ["concso4pr", "mg S/L", "g m-3", M_SO4 / M_S], - ["vmrbenzene", "ug m-3", "ppb", 1/3.2430], # Source (EC): https://uk-air.defra.gov.uk/assets/documents/reports/cat06/0502160851_Conversion_Factors_Between_ppb_and.pdf - + # ["vmrbenzene", "ppb", "ug m-3", 3.2430], # Source (EC): https://uk-air.defra.gov.uk/assets/documents/reports/cat06/0502160851_Conversion_Factors_Between_ppb_and.pdf + ["vmrbenzene", "ppb", "nmol mol-1", 1.0], + ["vmrbenzene", "pmol mol -1", "ppb", 1000.], + ["concbenzene", "ppb", "ug m-3", 3.2430] ], columns=["var_name", "from", "to", "fac"], ).set_index(["var_name", "from"]) From ae4e8416d8fa83735f8ead99fbefb704f4259bfb Mon Sep 17 00:00:00 2001 From: lewisblake Date: Wed, 14 Sep 2022 08:02:04 +0000 Subject: [PATCH 12/15] add qutotations for new vocs --- pyaerocom/plugins/mscw_ctm/emep_variables.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pyaerocom/plugins/mscw_ctm/emep_variables.toml b/pyaerocom/plugins/mscw_ctm/emep_variables.toml index 4aef350cc..1fade4b13 100644 --- a/pyaerocom/plugins/mscw_ctm/emep_variables.toml +++ b/pyaerocom/plugins/mscw_ctm/emep_variables.toml @@ -53,8 +53,8 @@ concbcc = "SURF_ug_ECCOARSE" concbcf = "SURF_ug_ECFINE" concdust = "SURF_ug_DUST" conchno3 = "SURF_ug_HNO3" -concnc4h10=SURF_ug_NC4H10_T -concic4h10=SURF_ug_IC4H10_T +concnc4h10= "SURF_ug_NC4H10_T" +concic4h10= "SURF_ug_IC4H10_T" concnh3 = "SURF_ug_NH3" concnh4 = "SURF_ug_NH4_F" concno2 = "SURF_ug_NO2" @@ -75,22 +75,22 @@ concssf = "SURF_ug_SEASALT_F" concssc = "SURF_ug_SEASALT_C" concCocpm25 = "SURF_ugC_PM_OM25" concecpm25 = "SURF_ug_ECFINE" -vmrc10h16=SURF_ppb_APINENE +vmrc10h16= "SURF_ppb_APINENE" vmro32m = "SURF_2MO3" vmro3max = "SURF_MAXO3" vmro3 = "SURF_ppb_O3" vmrco = "SURF_ppb_CO" vmrc2h6 = "SURF_ppb_C2H6" vmrc2h4 = "SURF_ppb_C2H4" -vmrbenzene=SURF_ppb_BENZENE -vmrch3cho=SURF_ppb_CH3CHO +vmrbenzene= "SURF_ppb_BENZENE" +vmrch3cho= "SURF_ppb_CH3CHO" vmrhcho = "SURF_ppb_HCHO" -vmrnc4h10=SURF_ppb_NC4H10_T -vmric4h10=SURF_ppb_IC4H10_T +vmrnc4h10= "SURF_ppb_NC4H10_T" +vmric4h10= "SURF_ppb_IC4H10_T" vmrglyoxal = "SURF_ppb_GLYOX" vmrisop = "SURF_ppb_C5H8" -vmrtolu=SURF_ppb_TOLUENE -vmrvoc=SURF_ppbC_VOC +vmrtolu= "SURF_ppb_TOLUENE" +vmrvoc= "SURF_ppbC_VOC" wetbc = "WDEP_EC" wetdust = "WDEP_DUST" wetnh4 = "WDEP_NH4_f" From 8d108c50c0f441dbe7cbda922da1061298b7ddcb Mon Sep 17 00:00:00 2001 From: lewisblake Date: Thu, 3 Nov 2022 15:51:24 +0000 Subject: [PATCH 13/15] remove duplicate dict entries --- pyaerocom/aeroval/glob_defaults.py | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/pyaerocom/aeroval/glob_defaults.py b/pyaerocom/aeroval/glob_defaults.py index e0f5aeac7..c96062f96 100644 --- a/pyaerocom/aeroval/glob_defaults.py +++ b/pyaerocom/aeroval/glob_defaults.py @@ -271,6 +271,18 @@ vmrox=["OX", "3D", "Gas volume mixing ratio"], concco=["CO", "3D", "Particle concentration"], vmrco=["CO", "3D", "Volume mixing ratios"], + concNnh4=["NH4", "3D", "Gas concentrations"], + vmrhcho=["HCHO (Formaldehyde)", "3D", "Volume mixing ratios"], + vmrisop=["C5H8 (Isoprene)", "3D", "Volume mixing ratios"], + vmrc2h6=["C2H6 (Ethane)", "3D", "Volume mixing ratios"], + vmrc2h4=["C2H4 (Ethylene)", "3D", "Volume mixing ratios"], + vmrnc4h10=["nC4H10 (n-Butane)", "3D", "Volume mixing ratios"], + vmric4h10=["iC4H10 (2-methylpropane)", "3D", "Volume mixing ratios"], + vmrbenzene=["C6H6 (Benzene)", "3D", "Volume mixing ratios"], + vmrc10h16=["C10H16 (Alpha-Pinene)", "3D", "Volume mixing ratios"], + vmrch3cho=["CH3CHO (Acetaldehyde)", "3D", "Volume mixing ratios"], + vmrglyoxal=["Glyoxal", "3D", "Volume mixing ratios"], + vmrtolu=["Toluene", "3D", "Volume mixing ratios"], # PMs concpm10=["PM10", "3D", "Particle concentrations"], concpm25=["PM2.5", "3D", "Particle concentrations"], @@ -299,22 +311,6 @@ dryoxs=["FakeDryOXS", "3D", "Deposition"], dryoxn=["FakeDryOXN", "3D", "Deposition"], dryrdn=["FakeDryRDN", "3D", "Deposition"], - concno2=["NO2", "3D", "Gas concentrations"], - concNnh4=["NH4", "3D", "Gas concentrations"], - vmrco=["CO", "3D", "Volume mixing ratios"], - vmrno2=["NO2", "3D", "Volume mixing ratios"], - concco=["CO", "3D", "Particle concentration"], - vmrhcho=["HCHO (Formaldehyde)", "3D", "Volume mixing ratios"], - vmrisop=["C5H8 (Isoprene)", "3D", "Volume mixing ratios"], - vmrc2h6=["C2H6 (Ethane)", "3D", "Volume mixing ratios"], - vmrc2h4=["C2H4 (Ethylene)", "3D", "Volume mixing ratios"], - vmrnc4h10=["nC4H10 (n-Butane)", "3D", "Volume mixing ratios"], - vmric4h10=["iC4H10 (2-methylpropane)", "3D", "Volume mixing ratios"], - vmrbenzene=["C6H6 (Benzene)", "3D", "Volume mixing ratios"], - vmrc10h16=["C10H16 (Alpha-Pinene)", "3D", "Volume mixing ratios"], - vmrch3cho=["CH3CHO (Acetaldehyde)", "3D", "Volume mixing ratios"], - vmrglyoxal=["Glyoxal", "3D", "Volume mixing ratios"], - vmrtolu=["Toluene", "3D", "Volume mixing ratios"], wetoxs=["WetOXS", "3D", "Deposition"], wetoxn=["WetOXN", "3D", "Deposition"], wetrdn=["WetRDN", "3D", "Deposition"], From 4aeba7ad9f2bef38e0650c7344e6b10d0e82e5a7 Mon Sep 17 00:00:00 2001 From: lewisblake Date: Thu, 3 Nov 2022 15:57:14 +0000 Subject: [PATCH 14/15] remove another duplicate --- pyaerocom/aeroval/glob_defaults.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/pyaerocom/aeroval/glob_defaults.py b/pyaerocom/aeroval/glob_defaults.py index c96062f96..ae6c5b62a 100644 --- a/pyaerocom/aeroval/glob_defaults.py +++ b/pyaerocom/aeroval/glob_defaults.py @@ -271,7 +271,6 @@ vmrox=["OX", "3D", "Gas volume mixing ratio"], concco=["CO", "3D", "Particle concentration"], vmrco=["CO", "3D", "Volume mixing ratios"], - concNnh4=["NH4", "3D", "Gas concentrations"], vmrhcho=["HCHO (Formaldehyde)", "3D", "Volume mixing ratios"], vmrisop=["C5H8 (Isoprene)", "3D", "Volume mixing ratios"], vmrc2h6=["C2H6 (Ethane)", "3D", "Volume mixing ratios"], @@ -315,5 +314,4 @@ wetoxn=["WetOXN", "3D", "Deposition"], wetrdn=["WetRDN", "3D", "Deposition"], prmm=["Precipitation", "3D", "Deposition"], - ) From 189ad58c8edabe9d32a01dfa3072a74abb266d37 Mon Sep 17 00:00:00 2001 From: lewisblake Date: Fri, 4 Nov 2022 10:43:43 +0000 Subject: [PATCH 15/15] update tests that failed locally --- tests/io/test_read_ebas.py | 142 ++++++++++++++------------ tests/plugins/mscw_ctm/test_reader.py | 33 +++--- tests/test_varcollection.py | 2 +- 3 files changed, 97 insertions(+), 80 deletions(-) diff --git a/tests/io/test_read_ebas.py b/tests/io/test_read_ebas.py index d5cff72e7..39aa3fb5b 100644 --- a/tests/io/test_read_ebas.py +++ b/tests/io/test_read_ebas.py @@ -225,93 +225,101 @@ def test_NAN_VAL(reader: ReadEbas): def test_PROVIDES_VARIABLES(reader: ReadEbas): PROVIDES_VARIABLES = [ "DEFAULT", - "concca", - "concmg", - "conck", - "sc550aer", - "sc440aer", - "sc700aer", - "sc550dryaer", - "sc440dryaer", - "sc700dryaer", - "sc550lt1aer", - "bsc550aer", + "SO4ugSm3", "ac550aer", "ac550dryaer", "ac550lt1aer", - "bsc550dryaer", - "scrh", "acrh", - "concso4", - "SO4ugSm3", - "concso4pm10", - "concso4pm25", - "concso2", - "vmrso2", - "concpm10", - "concpm25", - "concpm1", - "concso4t", - "concso4c", - "concbc", - "conceqbc", + "bsc550aer", + "bsc550dryaer", "concCec", + "concCecpm10", "concCecpm25", - "conctc", - "concoa", - "concoc", "concCoc", + "concCocpm10", "concCocpm25", - "concss", - "concsspm10", - "concsspm25", - "concnh3", + "concNhno3", "concNnh3", - "concno3", + "concNnh4", + "concNno", + "concNno2", "concNno3pm10", "concNno3pm25", - "concnh4", - "concNnh4", - "concNhno3", - "concNtno3", "concNtnh", + "concNtno3", + "concSso2", + "concbc", + "concca", + "concco", + "conceqbc", + "concglyoxal", + "conchcho", + "concic4h10", + "conck", + "concmg", + "concnc4h10", + "concnh3", + "concnh4", + "concnh4coarse", + "concnh4fine", "concno", "concno2", - "concNno2", - "conchcho", + "concno3", + "concno3pm10", + "concno3pm25", "conco3", - "concco", - "vmro3", - "vmro3max", - "vmrco", - "vmrno2", - "vmrno", - "vmrisop", - "vmrhcho", - "vmrglyoxal", - "vmrc2h6", - "vmrc2h4", - "concglyoxal", - "concprcpoxs", + "concoa", + "concoc", + "concpm1", + "concpm10", + "concpm25", "concprcpoxn", + "concprcpoxs", "concprcprdn", - "wetoxs", - "wetrdn", - "wetoxn", + "concso2", + "concso4", + "concso4c", + "concso4coarse", + "concso4fine", + "concso4pm10", + "concso4pm25", + "concso4t", + "concss", + "concsspm10", + "concsspm25", + "conctc", "pr", "prmm", - "concnh4fine", - "concCocpm10", - "concNno", - "concCecpm10", - "concno3pm10", - "concSso2", - "concso4fine", - "concso4coarse", - "concnh4coarse", - "concno3pm25", + "sc440aer", + "sc440dryaer", + "sc550aer", + "sc550dryaer", + "sc550lt1aer", + "sc700aer", + "sc700dryaer", + "scrh", + "vmrbenzene", + "vmrc10h16", + "vmrc2h4", + "vmrc2h6", + "vmrch3cho", + "vmrco", + "vmrglyoxal", + "vmrhcho", + "vmric4h10", + "vmrisop", + "vmrnc4h10", + "vmrno", + "vmrno2", + "vmro3", + "vmro3max", + "vmrso2", + "vmrtolu", + "vmrvoc", + "wetoxn", + "wetoxs", + "wetrdn", ] - assert sorted(reader.PROVIDES_VARIABLES) == sorted(PROVIDES_VARIABLES) diff --git a/tests/plugins/mscw_ctm/test_reader.py b/tests/plugins/mscw_ctm/test_reader.py index 800dcddac..ef9036d57 100644 --- a/tests/plugins/mscw_ctm/test_reader.py +++ b/tests/plugins/mscw_ctm/test_reader.py @@ -28,6 +28,9 @@ "dryoa": "DDEP_OM25_m2Grid", "dryso2": "DDEP_SO2_m2Grid", "dryso4": "DDEP_SO4_m2Grid", + "dryoxs": "DDEP_SOX_m2Grid", + "dryrdn": "DDEP_RDN_m2Grid", + "dryoxn": "DDEP_OXN_m2Grid", "dryss": "DDEP_SS_m2Grid", "ec550aer": "EXT_550nm", "ec550dryaer": "EXTdry_550nm", @@ -67,8 +70,12 @@ "concbcf": "SURF_ug_ECFINE", "concdust": "SURF_ug_DUST", "conchno3": "SURF_ug_HNO3", + "concnc4h10": "SURF_ug_NC4H10_T", + "concic4h10": "SURF_ug_IC4H10_T", "concnh3": "SURF_ug_NH3", "concnh4": "SURF_ug_NH4_F", + "concnh4coarse": "SURF_ug_NH4_F", + "concnh4fine": "SURF_ug_NH4_F", "concno2": "SURF_ug_NO2", "concno3c": "SURF_ug_NO3_C", "concno3f": "SURF_ug_NO3_F", @@ -81,18 +88,30 @@ "concrdn": "SURF_ugN_RDN", "concso2": "SURF_ug_SO2", "concso4": "SURF_ug_SO4", + "concso4c": "SURF_ug_SO4", + "concso4coarse": "SURF_ug_SO4", + "concso4fine": "SURF_ug_SO4", "concss": "SURF_ug_SS", "concssf": "SURF_ug_SEASALT_F", + "concssc": "SURF_ug_SEASALT_C", "concCocpm25": "SURF_ugC_PM_OM25", + "concecpm25": "SURF_ug_ECFINE", + "vmrc10h16": "SURF_ppb_APINENE", "vmro32m": "SURF_2MO3", "vmro3max": "SURF_MAXO3", "vmro3": "SURF_ppb_O3", "vmrco": "SURF_ppb_CO", "vmrc2h6": "SURF_ppb_C2H6", "vmrc2h4": "SURF_ppb_C2H4", + "vmrbenzene": "SURF_ppb_BENZENE", + "vmrch3cho": "SURF_ppb_CH3CHO", "vmrhcho": "SURF_ppb_HCHO", + "vmrnc4h10": "SURF_ppb_NC4H10_T", + "vmric4h10": "SURF_ppb_IC4H10_T", "vmrglyoxal": "SURF_ppb_GLYOX", "vmrisop": "SURF_ppb_C5H8", + "vmrtolu": "SURF_ppb_TOLUENE", + "vmrvoc": "SURF_ppbC_VOC", "wetbc": "WDEP_EC", "wetdust": "WDEP_DUST", "wetnh4": "WDEP_NH4_f", @@ -106,21 +125,11 @@ "wetss": "WDEP_SS", "z3d": "Z_MID", "prmm": "WDEP_PREC", - "concecpm25": "SURF_ug_ECFINE", - "concssc": "SURF_ug_SEASALT_C", - "dryoxn": "DDEP_OXN_m2Grid", - "dryoxs": "DDEP_SOX_m2Grid", - "dryrdn": "DDEP_RDN_m2Grid", - "concCocCoarse": "SURF_ugC_PM_OMCOARSE", "concCocFine": "SURF_ugC_PM_OM25", - "concecCoarse": "SURF_ug_ECCOARSE", + "concCocCoarse": "SURF_ugC_PM_OMCOARSE", "concecFine": "SURF_ug_ECFINE", - "concnh4coarse": "SURF_ug_NH4_F", - "concnh4fine": "SURF_ug_NH4_F", + "concecCoarse": "SURF_ug_ECCOARSE", "concoxn": "SURF_ugN_OXN", - "concso4c": "SURF_ug_SO4", - "concso4coarse": "SURF_ug_SO4", - "concso4fine": "SURF_ug_SO4", "vmrno": "SURF_ppb_NO", } diff --git a/tests/test_varcollection.py b/tests/test_varcollection.py index 5d67a65ee..c239d03b7 100644 --- a/tests/test_varcollection.py +++ b/tests/test_varcollection.py @@ -84,7 +84,7 @@ def test_VarCollection_get_var_error(collection: VarCollection): ("*blaaaaaaa*", 0), ("dep*", 0), ("od*", 26), - ("conc*", 82), + ("conc*", 85), ], ) def test_VarCollection_find(collection: VarCollection, search_pattern: str, num: int):