Fix bug for FLEXPART-ICON output plotting, increase patch level

MeteoSwiss-APN · Jan 22, 2024 · d14758b · d14758b
1 parent 9f12cff
commit d14758b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.0
+1.1.1
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,8 +7,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyflexplot"
-version = "1.1.0"
-description = "Stefan Ruedisuehli's PyFlexPlot"
+version = "1.1.1"
+description = "PyFlexPlot - Visualize and post-process FLEXPART dispersion simulation results stored in NetCDF format"
 readme = "README.md"
 keywords = [
     "Dispersion",
@@ -22,7 +22,7 @@ classifiers = [
     "Intended Audience :: Developers",
     "Natural Language :: English",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
 ]
 requires-python = ">=3.10"
 authors = [

diff --git a/src/pyflexplot/data/presets/opr/icon-ch2-eps/all_png.toml b/src/pyflexplot/data/presets/opr/icon-ch2-eps/all_png.toml
@@ -1,6 +1,7 @@
 # PyFlexPlot setup file to create ensemble ICON-CH2-EPS plots
 
 [_base]
+# Test data source: /store_new/mch/msopr/pyflexplot_testdata/
 infile = "data/icon-ch2-eps/2021030503/{ens_member:03}/grid_conc_20210305030000.nc_BUG"
 ens_member_id = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
 model = "ICON-CH2-EPS"

diff --git a/src/pyflexplot/input/fix_nc_input.py b/src/pyflexplot/input/fix_nc_input.py
@@ -16,7 +16,7 @@
 class FlexPartDataFixer:
     """Fix issues with FlexPart NetCDF output."""
 
-    cosmo_models = ["COSMO-2", "COSMO-1", "COSMO-E", "COSMO-1E", "COSMO-2E"]
+    cosmo_models = ["COSMO-2", "COSMO-1", "COSMO-E", "COSMO-1E", "COSMO-2E", "ICON-CH1-CTRL", "ICON-CH2-CTRL", "ICON-CH1-EPS", "ICON-CH2-EPS"]
     ifs_models = ["IFS-HRES", "IFS-HRES-EU"]
 
     def __init__(self, file_reader):

diff --git a/src/pyflexplot/input/meta_data.py b/src/pyflexplot/input/meta_data.py
@@ -871,7 +871,7 @@ def time_step_idx(self) -> int:
 
 def derive_variable_name(model: str, variable: str, species_id: int) -> str:
     """Derive the NetCDF variable name given some attributes."""
-    cosmo_models = ["COSMO-2", "COSMO-1", "COSMO-E", "COSMO-2E", "COSMO-1E"]
+    cosmo_models = ["COSMO-2", "COSMO-1", "COSMO-E", "COSMO-2E", "COSMO-1E", "ICON-CH1-CTRL", "ICON-CH2-CTRL", "ICON-CH1-EPS", "ICON-CH2-EPS"]
     ifs_models = ["IFS-HRES", "IFS-HRES-EU"]
     if variable == "concentration":
         if model in cosmo_models: