Skip to content

Commit

Permalink
Merge pull request #944 from metno/griesie-943-add-removed-conversion…
Browse files Browse the repository at this point in the history
…-factors-again

some more CAMS2-40 task4041 work
  • Loading branch information
jgriesfeller authored Dec 4, 2023
2 parents 8950147 + 2118b98 commit 163d3f9
Show file tree
Hide file tree
Showing 12 changed files with 314 additions and 73 deletions.
235 changes: 195 additions & 40 deletions pyaerocom/aeroval/glob_defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,14 @@
"scale": [0, 0.75, 1.5, 2.25, 3.0, 3.75, 4.5, 5.25, 6.0, 6.75, 7.5, 8.25],
"colmap": "coolwarm",
},
"vmrno": {
"scale": [0, 0.75, 1.5, 2.25, 3.0, 3.75, 4.5, 5.25, 6.0, 6.75, 7.5, 8.25],
"colmap": "coolwarm",
},
"vmrso2": {
"scale": [0, 0.75, 1.5, 2.25, 3.0, 3.75, 4.5, 5.25, 6.0, 6.75, 7.5, 8.25],
"colmap": "coolwarm",
},
"concpm10": {"scale": [0, 10, 20, 30, 40, 50, 60, 70, 80], "colmap": "coolwarm"},
"concpm25": {"scale": [0, 5, 10, 15, 20, 25, 30, 35, 40, 45], "colmap": "coolwarm"},
"conco3": {"scale": [0, 15, 30, 45, 60, 75, 90, 105, 120], "colmap": "coolwarm"},
Expand All @@ -166,57 +174,97 @@
"vmrno2": {"scale": [0, 5, 10, 15, 20, 25, 30, 35, 40], "colmap": "coolwarm"},
"vmro3max": {"scale": [0, 7.5, 15, 22.5, 30, 37.5, 45, 52.5, 60], "colmap": "coolwarm"},
"concNhno3": {
"scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5],
"scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 1],
"colmap": "coolwarm",
},
"concNno3pm10": {
"scale": [0, 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875, 1],
"scale": [0, 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875, 1, 1.5, 2, 5, 10],
"colmap": "coolwarm",
},
"concNno3pm25": {
"scale": [0, 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875, 1],
"scale": [0, 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875, 1, 1.5, 2, 5, 10],
"colmap": "coolwarm",
},
"concNnh3": {
"scale": [0, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0],
"scale": [0, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 7.5, 10.0, 20],
"colmap": "coolwarm",
},
"concNnh4": {
"scale": [
0,
0.25,
0.5,
0.75,
1.0,
1.25,
1.5,
1.75,
2.0,
2.5,
3.0,
3.5,
4.0,
4.5,
5.0,
7.5,
10.0,
20,
],
"colmap": "coolwarm",
},
"concNnh4": {"scale": [0, 0.25, 0.5, 0.75, 1.0, 1.25, 1.5, 1.75, 2.0], "colmap": "coolwarm"},
"concNtno3": {
"scale": [0, 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875, 1.0],
"scale": [0, 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875, 1.0, 1.5, 2, 5],
"colmap": "coolwarm",
},
"concNtnh": {
"scale": [0, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0],
"scale": [0, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 7.5, 10.0, 20, 50],
"colmap": "coolwarm",
},
"concsspm25": {
"scale": [0, 0.25, 0.5, 0.75, 1.0, 1.25, 1.5, 1.75, 2.0, 5, 10],
"colmap": "coolwarm",
},
"concsspm25": {"scale": [0, 0.25, 0.5, 0.75, 1.0, 1.25, 1.5, 1.75, 2.0], "colmap": "coolwarm"},
"concsspm10": {
"scale": [0, 0.75, 1.5, 2.25, 3.0, 3.75, 4.5, 5.25, 6.0, 6.75, 7.5, 8.25],
"scale": [0, 0.75, 1.5, 2.25, 3.0, 3.75, 4.5, 5.25, 6.0, 6.75, 7.5, 8.25, 10, 15, 20, 50],
"colmap": "coolwarm",
},
"concCecpm25": {"scale": [0, 1.25, 2.5, 3.75, 5, 6.25, 7.5, 8.75, 10], "colmap": "coolwarm"},
"concCec25": {"scale": [0, 1.25, 2.5, 3.75, 5, 6.25, 7.5, 8.75, 10], "colmap": "coolwarm"},
"concCocpm25": {
"scale": [0, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 10],
"colmap": "coolwarm",
},
"concCoc25": {
"scale": [0, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 10],
"colmap": "coolwarm",
},
"concom25": {
"scale": [0, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0],
"colmap": "coolwarm",
},
"wetoxs": {"scale": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 1, 1.5], "colmap": "coolwarm"},
"wetna": {"scale": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 1, 1.5], "colmap": "coolwarm"},
"wetoxn": {"scale": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 1, 1.5], "colmap": "coolwarm"},
"wetoxs": {"scale": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 1, 1.5, 2, 5], "colmap": "coolwarm"},
"wetna": {
"scale": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 1, 1.5, 2, 5, 10, 20, 50, 100],
"colmap": "coolwarm",
},
"wetoxn": {"scale": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 1, 1.5, 2, 5], "colmap": "coolwarm"},
"wetrdn": {
"scale": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 1, 1.5],
"scale": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 1, 1.5, 2, 5, 10],
"colmap": "coolwarm",
},
"wetoxsf": {"scale": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 1, 1.5], "colmap": "coolwarm"},
"wetoxnf": {"scale": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 1, 1.5], "colmap": "coolwarm"},
"wetoxsf": {"scale": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 1, 1.5, 2, 5], "colmap": "coolwarm"},
"wetoxnf": {"scale": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 1, 1.5, 2, 5], "colmap": "coolwarm"},
"wetrdnf": {
"scale": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 1, 1.5],
"scale": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 1, 1.5, 2, 5, 10],
"colmap": "coolwarm",
},
"prmm": {"scale": [0, 1.25, 2.5, 3.75, 5, 6.25, 7.5, 8.75, 10], "colmap": "coolwarm"},
"dryoxs": {"scale": [0, 1.25, 2.5, 3.75, 5, 6.25, 7.5, 8.75, 10], "colmap": "coolwarm"},
"dryoxn": {"scale": [0, 1.25, 2.5, 3.75, 5, 6.25, 7.5, 8.75, 10], "colmap": "coolwarm"},
"dryrdn": {"scale": [0, 1.25, 2.5, 3.75, 5, 6.25, 7.5, 8.75, 10], "colmap": "coolwarm"},
"dryoxs": {
"scale": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 1, 1.5, 2, 5],
"colmap": "coolwarm",
},
"dryoxn": {"scale": [0, 0.1, 0.2, 0.5, 1, 2.0, 5, 10, 20, 50], "colmap": "coolwarm"},
"dryrdn": {"scale": [0, 0.1, 0.2, 0.5, 1, 2.0, 5, 10, 20, 50], "colmap": "coolwarm"},
"depdust": {
"scale": [0.0, 0.2, 0.5, 1.0, 2.0, 5.0, 10.0, 20.0, 50.0, 100.0, 200.0, 500.0, 1000.0],
"colmap": "coolwarm",
Expand Down Expand Up @@ -263,38 +311,103 @@
"colmap": "coolwarm",
},
"ts": {"scale": [265, 270, 275, 280, 285, 290, 300, 305, 310, 315, 320], "colmap": "coolwarm"},
"proxydryo3": {"scale": [0, 0.5, 1, 15, 20, 25, 0.30, 40, 50], "colmap": "coolwarm"},
"proxydryo3": {"scale": [0, 0.5, 1, 5, 10, 15, 20, 25, 30, 40, 50], "colmap": "coolwarm"},
"dryo3": {"scale": [0, 0.5, 1, 5, 10, 15, 20, 25, 30, 40, 50], "colmap": "coolwarm"},
"proxydrypm10": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
"proxydrypm25": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
"drypm10": {
"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 5, 10, 20, 50, 100],
"colmap": "coolwarm",
},
"proxydrypm25": {
"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 5, 10, 20, 50, 100],
"colmap": "coolwarm",
},
"drypm25": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 5, 10], "colmap": "coolwarm"},
"proxydryss": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
"dryss": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
"proxydryna": {
"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 5, 10, 20, 50, 100, 200],
"colmap": "coolwarm",
},
"dryna": {
"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 5, 10, 20, 50, 100, 200],
"colmap": "coolwarm",
},
"proxydryno2": {
"scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4],
"scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.5, 1.0, 2],
"colmap": "coolwarm",
},
"dryno2": {
"scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.5, 1.0, 2],
"colmap": "coolwarm",
},
"proxydryhono": {
"scale": [0.0, 0.001, 0.002, 0.003, 0.004, 0.005, 0.006, 0.008, 0.01, 0.02],
"colmap": "coolwarm",
},
"dryhono": {
"scale": [0.0, 0.001, 0.002, 0.003, 0.004, 0.005, 0.006, 0.008, 0.01, 0.02],
"colmap": "coolwarm",
},
"proxydryn2o5": {
"scale": [0.0, 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.1, 0.2],
"colmap": "coolwarm",
},
"dryn2o5": {
"scale": [0.0, 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.1, 0.2],
"colmap": "coolwarm",
},
"proxydryhono": {"scale": [0.001, 0.002, 0.003, 0.004, 0.005, 0.006], "colmap": "coolwarm"},
"proxydryn2o5": {"scale": [0.01, 0.02, 0.03, 0.04, 0.05], "colmap": "coolwarm"},
"proxydryhno3": {
"scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4],
"scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.5, 1.0, 2.0, 5.0],
"colmap": "coolwarm",
},
"dryhno3": {
"scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.5, 1.0, 2.0, 5.0],
"colmap": "coolwarm",
},
"proxydryno3c": {
"scale": [0.01, 0.02, 0.03, 0.04, 0.05],
"scale": [0.0, 0.01, 0.02, 0.03, 0.04, 0.05, 0.1, 0.2, 0.5],
"colmap": "coolwarm",
},
"proxydryno3f": {"scale": [0.01, 0.02, 0.03, 0.04, 0.05], "colmap": "coolwarm"},
"dryno3c": {
"scale": [0.0, 0.01, 0.02, 0.03, 0.04, 0.05, 0.1, 0.2, 0.5],
"colmap": "coolwarm",
},
"proxydryno3f": {
"scale": [0.0, 0.01, 0.02, 0.03, 0.04, 0.05, 0.1, 0.2, 0.5],
"colmap": "coolwarm",
},
"dryno3f": {"scale": [0.0, 0.01, 0.02, 0.03, 0.04, 0.05, 0.1, 0.2, 0.5], "colmap": "coolwarm"},
"proxydrynh3": {
"scale": [0, 0.10, 0.20, 0.30, 0.40, 0.50, 0.60, 0.70, 0.80],
"scale": [0, 0.10, 0.20, 0.30, 0.40, 0.50, 0.60, 0.70, 0.80, 1, 2, 5],
"colmap": "coolwarm",
},
"drynh3": {
"scale": [0, 0.10, 0.20, 0.30, 0.40, 0.50, 0.60, 0.70, 0.80, 1, 2, 5],
"colmap": "coolwarm",
},
"proxydrynh4": {
"scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4],
"scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.5, 1.0],
"colmap": "coolwarm",
},
"drynh4": {
"scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.5, 1.0],
"colmap": "coolwarm",
},
"proxydryso2": {
"scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4],
"scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.5, 1.0, 2, 5],
"colmap": "coolwarm",
},
"dryso2": {
"scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.5, 1.0, 2, 5],
"colmap": "coolwarm",
},
"proxydryso4": {
"scale": [0.01, 0.02, 0.03, 0.04, 0.05],
"scale": [0.0, 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1, 0.2, 0.5],
"colmap": "coolwarm",
},
"dryso4": {
"scale": [0.0, 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1, 0.2, 0.5],
"colmap": "coolwarm",
},
"proxydryoxs": {
Expand All @@ -309,12 +422,38 @@
"scale": [0, 0.10, 0.20, 0.30, 0.40, 0.50, 0.60, 0.70, 0.80],
"colmap": "coolwarm",
},
"depoxs": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
"depoxn": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
"deprdn": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
"depoxsf": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
"depoxnf": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
"deprdnf": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
"depoxs": {
"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 5, 10, 20],
"colmap": "coolwarm",
},
"depna": {
"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 5, 10, 20, 50, 100, 200],
"colmap": "coolwarm",
},
"depoxn": {
"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 5, 10, 20],
"colmap": "coolwarm",
},
"deprdn": {
"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 5, 10, 20, 50, 100, 200],
"colmap": "coolwarm",
},
"depoxsf": {
"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 5, 10, 20],
"colmap": "coolwarm",
},
"depnaf": {
"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 5, 10, 20],
"colmap": "coolwarm",
},
"depoxnf": {
"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 5, 10, 20],
"colmap": "coolwarm",
},
"deprdnf": {
"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 5, 10, 20, 50, 100, 200],
"colmap": "coolwarm",
},
}

#: Default information for statistical parameters
Expand Down Expand Up @@ -609,18 +748,32 @@
concsspm25=["SS PM25", "3D", "Particle concentration"],
concCecpm25=["EC PM2.5", "3D", "Particle concentration"],
concCocpm25=["OC PM2.5", "3D", "Particle concentration"],
concCec25=["EC PM2.5", "3D", "Particle concentration"],
concCoc25=["OC PM2.5", "3D", "Particle concentration"],
concom25=["OM PM2.5", "3D", "Particle concentration"],
concCecpm10=["EC PM10", "3D", "Particle concentration"],
concCocpm10=["OC PM10", "3D", "Particle concentration"],
concdust=["Dust concentration", "3D", "Particle concentration"],
# Depositions
depoxs=["TotDepOXS", "3D", "Deposition"],
deprdn=["TotDepRDN", "3D", "Deposition"],
depoxn=["TotDepOXN", "3D", "Deposition"],
depoxsf=["TotDepOXSforr", "3D", "Deposition"],
deprdnf=["TotDepRDNforr", "3D", "Deposition"],
depoxnf=["TotDepOXNforr", "3D", "Deposition"],
depss=["TotDepSS", "3D", "Deposition"],
depssf=["TotDepSSforr", "3D", "Deposition"],
depna=["TotDepNa", "3D", "Deposition"],
depnaf=["TotDepNaforr", "3D", "Deposition"],
drysox=["DryOXS", "3D", "Deposition"],
dryoxs=["FakeDryOXS", "3D", "Deposition"],
dryoxn=["FakeDryOXN", "3D", "Deposition"],
dryrdn=["FakeDryRDN", "3D", "Deposition"],
dryoxs=["DryOXS", "3D", "Deposition"],
dryoxn=["DryOXN", "3D", "Deposition"],
dryrdn=["DryRDN", "3D", "Deposition"],
depdust=["TotDustDep", "3D", "Deposition"],
drydust=["DryDustDep", "3D", "Deposition"],
wetdust=["WetDustDep", "3D", "Deposition"],
wetoxs=["WetOXS", "3D", "Deposition"],
wetna=["WetNa", "3D", "Deposition"],
wetoxsc=["WetOXScorr", "3D", "Deposition"],
wetoxst=["WetOXStot", "3D", "Deposition"],
wetoxn=["WetOXN", "3D", "Deposition"],
Expand All @@ -630,6 +783,8 @@
ts=["Surface Temperature", "3D", "Temperature"],
# proxy drydep
proxydryoxs=["proxyDryOXS", "3D", "Deposition"],
proxydryss=["proxyDrySS", "3D", "Deposition"],
proxydryna=["proxyDryNa", "3D", "Deposition"],
proxydryso2=["proxyDrySO2", "3D", "Deposition"],
proxydryso4=["proxyDrySO4", "3D", "Deposition"],
proxydryoxn=["proxyDryOXN", "3D", "Deposition"],
Expand Down
8 changes: 7 additions & 1 deletion pyaerocom/aeroval/modelmaps_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from pyaerocom.exceptions import (
DataCoverageError,
DataDimensionError,
DataQueryError,
TemporalResolutionError,
VariableDefinitionError,
VarNotAvailableError,
Expand Down Expand Up @@ -84,7 +85,12 @@ def _run_model(self, model_name: str, var_list):
_files = self._process_map_var(model_name, var, self.reanalyse_existing)
files.extend(_files)

except (TemporalResolutionError, DataCoverageError, VariableDefinitionError) as e:
except (
TemporalResolutionError,
DataCoverageError,
VariableDefinitionError,
DataQueryError,
) as e:
if self.raise_exceptions:
raise
logger.warning(f"Failed to process maps for {model_name} {var} data. Reason: {e}.")
Expand Down
6 changes: 6 additions & 0 deletions pyaerocom/data/ebas_config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,12 @@ requires=concprcpso4
[proxydryoxs]
requires=concprcpoxs

[proxydryss]
requires=concprcpna

[proxydryna]
requires=concprcpna

[proxydryso2]
requires=concprcpoxs

Expand Down
Loading

0 comments on commit 163d3f9

Please sign in to comment.