Merge pull request #921 from metno/fix920

Fix plugins for ICOS and mmr vs vmr issue
metno · Oct 10, 2023 · f36b9f0 · f36b9f0
2 parents ff8fd9c + d7fde8f
commit f36b9f0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/pyaerocom/aeroval/glob_defaults.py b/pyaerocom/aeroval/glob_defaults.py
@@ -95,6 +95,10 @@
         "scale": [100.0, 125.0, 150.0, 175.0, 200.0, 225.0, 250.0, 275.0, 300.0],
         "colmap": "coolwarm",
     },
+    "vmrco2": {
+        "scale": [400.0, 405.0, 410.0, 415.0, 420.0, 425.0, 430.0, 435.0, 440.0, 445.0, 450.0],
+        "colmap": "coolwarm",
+    },
     "concco": {
         "scale": [100.0, 125.0, 150.0, 175.0, 200.0, 225.0, 250.0, 275.0, 300.0],
         "colmap": "coolwarm",
@@ -353,6 +357,7 @@
     vmrox=["OX", "3D", "Gas volume mixing ratio"],
     concco=["CO", "3D", "Particle concentration"],
     vmrco=["CO", "3D", "Volume mixing ratios"],
+    vmrco2=["CO2", "3D", "Volume mixing ratios"],
     # PMs
     concpm10=["PM10", "3D", "Particle concentrations"],
     concpm25=["PM2.5", "3D", "Particle concentrations"],

diff --git a/pyaerocom/data/variables.ini b/pyaerocom/data/variables.ini
@@ -3060,9 +3060,9 @@ var_name = vmrco2
 description = CO2 Volume Mixing Ratio
 standard_name = mole_fraction_of_carbon_dioxide_in_air
 var_type = volume mixing ratios
-unit = nmol mol-1
+unit = ppm
 minimum = 0
-maximum = 100000000
+maximum = 1000
 dimensions = time,lat,lon
 
 [vmrhno3]

diff --git a/pyaerocom/molmasses.py b/pyaerocom/molmasses.py
@@ -15,6 +15,7 @@
     "glyoxal": 58.036,
     "glyox": 58.036,
     "hcho": 30.026,
+    "co2": 44.0095,
 }
 
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -77,6 +77,7 @@ ReadMscwCtm = "pyaerocom.plugins.mscw_ctm.reader:ReadMscwCtm"
 ReadGAW = "pyaerocom.plugins.gaw.reader:ReadGAW"
 ReadGhost = "pyaerocom.plugins.ghost.reader:ReadGhost"
 ReadMEP = "pyaerocom.plugins.mep.reader:ReadMEP"
+ReadICOS = "pyaerocom.plugins.icos.reader:ReadICOS"
 
 [tool.flit.sdist]
 include = ["LICENSE", "README.*", "pyaerocom_env.yml", "tests"]

diff --git a/tests/plugins/test_entry_points.py b/tests/plugins/test_entry_points.py
@@ -15,4 +15,4 @@ def test_gridded():
 def test_ungridded():
     names = {ep.name for ep in metadata.entry_points(group="pyaerocom.ungridded")}
     assert names, "no entry points found"
-    assert names == {"ReadGAW", "ReadGhost", "ReadMEP"}
+    assert names == {"ReadGAW", "ReadGhost", "ReadMEP", "ReadICOS"}