Adopt ICON names after fix in dea87ce

Author: dnerini

src/plotting/colormap_defaults.py

@@ -12,17 +12,17 @@ def _fallback():
 
 
 _CMAP_DEFAULTS = {
-    "sp": {"cmap": plt.get_cmap("coolwarm", 11), "vmin": 800 * 100, "vmax": 1100 * 100},
-    "2d": load_ncl_colormap("t2m_29lev.ct"),
-    "2t": load_ncl_colormap("t2m_29lev.ct") | {"units": "degC"},
-    "10v": load_ncl_colormap("modified_uv_17lev.ct") | {"units": "m/s"},
-    "10u": load_ncl_colormap("modified_uv_17lev.ct") | {"units": "m/s"},
-    "10si": load_ncl_colormap("modified_uv_17lev.ct") | {"units": "m/s"},
+    "SP": {"cmap": plt.get_cmap("coolwarm", 11), "vmin": 800 * 100, "vmax": 1100 * 100},
+    "TD_2M": load_ncl_colormap("t2m_29lev.ct"),
+    "T_2M": load_ncl_colormap("t2m_29lev.ct") | {"units": "degC"},
+    "V_10M": load_ncl_colormap("modified_uv_17lev.ct") | {"units": "m/s"},
+    "U_10M": load_ncl_colormap("modified_uv_17lev.ct") | {"units": "m/s"},
+    "SP_10M": load_ncl_colormap("modified_uv_17lev.ct") | {"units": "m/s"},
     # "10si": {"cmap": plt.get_cmap("GnBu", 11), "vmin": 0, "vmax": 25},
-    "t_850": {"cmap": plt.get_cmap("inferno", 11), "vmin": 220, "vmax": 310},
-    "z_850": {"cmap": plt.get_cmap("coolwarm", 11), "vmin": 8000, "vmax": 17000},
-    "q_925": load_ncl_colormap("RH_6lev.ct"),
-    "tp": {
+    "T_850": {"cmap": plt.get_cmap("inferno", 11), "vmin": 220, "vmax": 310},
+    "FI_850": {"cmap": plt.get_cmap("coolwarm", 11), "vmin": 8000, "vmax": 17000},
+    "QV_925": load_ncl_colormap("RH_6lev.ct"),
+    "TOT_PREC": {
         "colors": [
             "#ffffff",
             "#04e9e7",

workflow/Snakefile

@@ -52,7 +52,7 @@ rule showcase_all:
             / "showcases/{run_id}/{init_time}/{init_time}_{param}_{region}.gif",
             init_time=[t.strftime("%Y%m%d%H%M") for t in REFTIMES],
             run_id=collect_all_candidates(),
-            param=["tp", "2t", "10si"],
+            param=["TOT_PREC", "T_2M", "SP_10M"],
             region=["globe", "europe", "switzerland"],
         ),
 

workflow/rules/plot.smk

@@ -18,6 +18,8 @@ rule plot_forecast_frame:
             OUT_ROOT
             / "showcases/{run_id}/{init_time}/frames/{init_time}_{leadtime}_{param}_{region}.png"
         ),
+    wildcard_constraints:
+        leadtime="\d+"  # only digits
     resources:
         slurm_partition="postproc",
         cpus_per_task=1,

workflow/scripts/plot_forecast_frame.mo.py

@@ -76,10 +76,10 @@ def _(ArgumentParser, Path):
 def _(grib_dir, init_time, lead_time, load_state_from_grib, param):
     # load grib file
     grib_file = grib_dir / f"{init_time}_{lead_time}.grib"
-    if param == "10si":
-        paramlist = ["10u", "10v"]
-    elif param == "si":
-        paramlist = ["u", "v"]
+    if param == "SP_10M":
+        paramlist = ["U_10M", "V_10M"]
+    elif param == "SP":
+        paramlist = ["U", "V"]
     else:
         paramlist = [param]
     state = load_state_from_grib(grib_file, paramlist=paramlist)
@@ -158,27 +158,27 @@ def _m_to_mm(arr):
 
     def preprocess_field(param: str, state: dict):
         """
-        - Temperatures (2t, 2d, t, d): K -> °C
-        - Wind speed at 10m (10si): m/s -> kn, sqrt(10u^2 + 10v^2)
-        - Wind speed (si): m/s -> kn, sqrt(u^2 + v^2)
+        - Temperatures: K -> °C
+        - Wind speed: sqrt(u^2 + v^2)
+        - Precipitation: m -> mm
         Returns: (field_array, units_override or None)
         """
         fields = state["fields"]
         # temperature variables
-        if param in ("2t", "2d", "t", "d"):
+        if param in ("T_2M", "TD_2M", "T", "TD"):
             return _k_to_c(fields[param]), "°C"
         # 10m wind speed (allow legacy 'uv' alias)
-        if param == "10si":
-            u = fields["10u"]
-            v = fields["10v"]
+        if param == "SP_10M":
+            u = fields["U_10M"]
+            v = fields["V_10M"]
             return np.sqrt(u**2 + v**2), "m/s"
         # wind speed from standard-level components
-        if param == "si":
-            u = fields["u"]
-            v = fields["v"]
+        if param == "SP":
+            u = fields["U"]
+            v = fields["V"]
             return np.sqrt(u**2 + v**2), "m/s"
-        if param == "tp":
-            return _m_to_mm(fields[param]), "mm"  # convert m to mm
+        if param == "TOT_PREC":
+            return _m_to_mm(fields[param]), "mm"
         # default: passthrough
         return fields[param], None