Merge pull request #957 from metno/colormaps953

restore default colormaps
metno · Dec 12, 2023 · 4e4c64f · 4e4c64f
2 parents 46b2e67 + 3528cad
commit 4e4c64f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 162 deletions.
diff --git a/pyaerocom/aeroval/glob_defaults.py b/pyaerocom/aeroval/glob_defaults.py
@@ -2,135 +2,23 @@
 var_ranges_defaults = {
     "default": {"scale": [0, 1.25, 2.5, 3.75, 5, 6.25, 7.5, 8.75, 10], "colmap": "coolwarm"},
     "ang4487aer": {
-        "scale": [
-            -0.2,
-            -0.1,
-            0.0,
-            0.1,
-            0.2,
-            0.3,
-            0.4,
-            0.5,
-            0.6,
-            0.7,
-            0.8,
-            0.9,
-            1.0,
-            1.1,
-            1.2,
-            1.3,
-            1.4,
-            1.5,
-            1.6,
-            1.7,
-            1.8,
-            1.9,
-            2.0,
-        ],
+        "scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2],
         "colmap": "coolwarm",
     },
     "od550aer": {
-        "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.3,
-            0.4,
-            0.5,
-            0.6,
-            0.7,
-            0.8,
-            0.90,
-            1.0,
-            2.0,
-        ],
+        "scale": [0, 0.05, 0.1, 0.15, 0.20, 0.25, 0.30, 0.35, 0.40],
         "colmap": "coolwarm",
     },
     "od550lt1aer": {
-        "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.3,
-            0.4,
-            0.5,
-            0.6,
-            0.7,
-            0.8,
-            0.90,
-            1.0,
-            2.0,
-        ],
+        "scale": [0, 0.05, 0.1, 0.15, 0.20, 0.25, 0.30, 0.35, 0.40],
         "colmap": "coolwarm",
     },
     "od550gt1aer": {
-        "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.3,
-            0.4,
-            0.5,
-            0.6,
-            0.7,
-            0.8,
-            0.90,
-            1.0,
-            2.0,
-        ],
+        "scale": [0, 0.05, 0.1, 0.15, 0.20, 0.25, 0.30, 0.35, 0.40],
         "colmap": "coolwarm",
     },
     "od550dust": {
-        "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.3,
-            0.4,
-            0.5,
-            0.6,
-            0.7,
-            0.8,
-            0.90,
-            1.0,
-            2.0,
-        ],
+        "scale": [0, 0.0125, 0.025, 0.0375, 0.05, 0.0625, 0.075, 0.0875, 0.1],
         "colmap": "coolwarm",
     },
     "abs550aer": {
@@ -190,26 +78,7 @@
         "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,
-        ],
+        "scale": [0, 0.25, 0.5, 0.75, 1.0, 1.25, 1.5, 1.75, 2.0],
         "colmap": "coolwarm",
     },
     "concNtno3": {

diff --git a/tests/aeroval/test_experiment_output.py b/tests/aeroval/test_experiment_output.py
@@ -233,31 +233,7 @@ def test_ExperimentOutput_delete_experiment_data(tmp_path: Path, also_coldata: b
         (
             "ang4487aer",
             {
-                "scale": [
-                    -0.2,
-                    -0.1,
-                    0.0,
-                    0.1,
-                    0.2,
-                    0.3,
-                    0.4,
-                    0.5,
-                    0.6,
-                    0.7,
-                    0.8,
-                    0.9,
-                    1.0,
-                    1.1,
-                    1.2,
-                    1.3,
-                    1.4,
-                    1.5,
-                    1.6,
-                    1.7,
-                    1.8,
-                    1.9,
-                    2.0,
-                ],
+                "scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2],
                 "colmap": "coolwarm",
             },
         ),