Add presets to name PNG-files produced at AWS and CSCS differently. F… (#67)

* Add presets to name PNG-files produced at AWS and CSCS differently. Fix shapefile-names (*.shp.zip) to match PDF names. Add contributors.

* Add presets for IFS with changed filenames according to the ProductProwser's requirements.

* Apply suggestions from review.

* Reduce number of similar setup files using existing opr and test directories.

Author: pirmink

.gitignore

@@ -117,5 +117,13 @@ poetry.toml
 # Conda environment for local CSCS development
 .conda-env
 
+# Job submission tool batchPP
+script_*
+stdeo_*
+
+# Output directories
+plot_*
+
+# Other stuff
 .idea
 test-data

AUTHORS.md

@@ -11,7 +11,7 @@
 - Pirmin Kaufmann <Pirmin.Kaufmann@meteoswiss.ch>
 - Marco Ketzel
 - Mathis Kretz
-- Néstor Tarin Burriel <Nestor.TarinBurriel@meteoswiss.ch> 
+- Néstor Tarin Burriel <Nestor.TarinBurriel@meteoswiss.ch>
 - Tobias Wicky
 
 ## Maintainer

src/pyflexplot/data/presets/opr/icon-ch1-ctrl/all_pdf.toml

@@ -1,4 +1,4 @@
-# PyFlexPlot setup file to create deterministic ICON-CH1-CTRL plots
+# PyFlexPlot setup file to create deterministic ICON-CH1-CTRL plots in PDF format
 
 [_base]
 # Test data source: /store_new/mch/msopr/pyflexplot_testdata/

src/pyflexplot/data/presets/opr/icon-ch1-ctrl/all_png.toml

@@ -1,4 +1,4 @@
-# PyFlexPlot setup file to create deterministic ICON-CH1-CTRL plots
+# PyFlexPlot setup file to create deterministic ICON-CH1-CTRL plots in PNG format
 
 [_base]
 # Test data source: /store_new/mch/msopr/pyflexplot_testdata/
@@ -7,7 +7,7 @@ model = "ICON-CH1-CTRL"
 lang = "de"
 outfile_time_format = "%Y%m%dT%H%M"
 combine_species = false
-outfile = "forecast-iconch1eps-dispersion~{base_time}~{plot_variable}~{domain}~{release_site}~1~{time_step}.png"
+outfile = "forecast-iconch1eps-dispersion~{base_time}~{plot_variable}~{domain}~{release_site}~{species_id}~{time_step}.png"
 
 [_base._concentration]
 plot_variable = "concentration"
@@ -36,12 +36,6 @@ combine_species = true
 
 [_base._affected_area."_png+"]
 
-# [_base._concentration."_multipanel_time+"]
-# outfile = "forecast-iconch1eps-dispersion~{base_time}~concentration~{domain}~{release_site}~1~{time_step}.png"
-# plot_type = "multipanel"
-# multipanel_param = "time"
-# time = [2, 4, 8, -1]
-
 ["**".full]
 domain = "full"
 

src/pyflexplot/data/presets/opr/icon-ch1-ctrl/all_shp.toml

@@ -28,22 +28,16 @@ time = -1
 combine_species = true
 
 [_base._concentration."_shp+"]
-outfile = "concentration_site-{release_site}_species-{species_id}_domain-{domain}_lang-{lang}_ts-{time_step}.shp"
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Dispersion_Konzentration_{species_id}_{time_step}.shp"
+
 [_base._concentration._integr."_shp+"]
-outfile = "integrated_concentration_site-{release_site}_species-{species_id}_domain-{domain}_lang-{lang}_ts-{time_step}.shp"
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Dispersion_integrierte_Luftaktivitaet_{species_id}.shp"
+
 [_base._tot_deposition."_shp+"]
-outfile = "deposition_tot_site-{release_site}_species-{species_id}_domain-{domain}_lang-{lang}_ts-{time_step}.shp"
-[_base._affected_area."_shp+"]
-outfile = "affected_area_site-{release_site}_species-{species_id}_domain-{domain}_lang-{lang}_ts-{time_step}.shp"
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Dispersion_Deposition_{species_id}_{time_step}.shp"
 
-[_base._concentration."_multipanel_time+"]
-outfile = "concentration_site-{release_site}_species-{species_id}_domain-{domain}_lang-{lang}_ts-{time_step}.shp"
-plot_type = "multipanel"
-multipanel_param = "time"
-time = [2, 4, 8, -1]
+[_base._affected_area."_shp+"]
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Dispersion_beaufschl_Gebiet.shp"
 
 ["**".full]
 domain = "full"
-
-["**".zoom]
-domain = "ch"

src/pyflexplot/data/presets/opr/icon-ch2-eps/all_pdf.toml

@@ -1,4 +1,4 @@
-# PyFlexPlot setup file to create ensemble ICON-CH2-EPS plots
+# PyFlexPlot setup file to create ensemble ICON-CH2-EPS plots in PDF format
 
 [_base]
 # Test data source: /store_new/mch/msopr/pyflexplot_testdata/
@@ -34,14 +34,17 @@ time = -1
 outfile = "{release_start}_{release_site}_FLEXPART-{model}_probability_{domain}.pdf"
 ens_variable = "probability"
 ens_param_thr = 0
+
 [_base._concentration._integr."_probability+"]
 outfile = "{release_start}_{release_site}_FLEXPART-{model}_probability_{domain}.pdf"
 ens_variable = "probability"
 ens_param_thr = 0
+
 [_base._tot_deposition."_probability+"]
 outfile = "{release_start}_{release_site}_FLEXPART-{model}_probability_{domain}.pdf"
 ens_variable = "probability"
 ens_param_thr = 0
+
 [_base._affected_area."_probability+"]
 outfile = "{release_start}_{release_site}_FLEXPART-{model}_probability_{domain}.pdf"
 ens_variable = "probability"
@@ -57,10 +60,12 @@ time = [2, 4, 8, -1]
 outfile = "{release_start}_{release_site}_FLEXPART-{model}_percentile_{domain}.pdf"
 ens_variable = "percentile"
 ens_param_pctl = 95
+
 [_base._tot_deposition."_pctl95+"]
 outfile = "{release_start}_{release_site}_FLEXPART-{model}_percentile_{domain}.pdf"
 ens_variable = "percentile"
 ens_param_pctl = 95
+
 [_base._affected_area."_pctl95+"]
 outfile = "{release_start}_{release_site}_FLEXPART-{model}_percentile_{domain}.pdf"
 ens_variable = "percentile"
@@ -85,38 +90,49 @@ outfile = "{release_start}_{release_site}_FLEXPART-{model}_cloud_timing_{domain}
 ens_param_mem_min = 2
 ens_param_thr = 0.0
 time = 0
+
 [_base._concentration._cloud."_arrival+"]
 ens_variable = "cloud_arrival_time"
+
 [_base._concentration._cloud."_departure+"]
 ens_variable = "cloud_departure_time"
 
 [_base._concentration._integr."_min+"]
 outfile = "{release_start}_{release_site}_FLEXPART-{model}_cloud_statistics_{domain}.pdf"
 ens_variable = "minimum"
+
 [_base._tot_deposition."_min+"]
 outfile = "{release_start}_{release_site}_FLEXPART-{model}_cloud_statistics_{domain}.pdf"
 ens_variable = "minimum"
+
 [_base._affected_area."_min+"]
 outfile = "{release_start}_{release_site}_FLEXPART-{model}_cloud_statistics_{domain}.pdf"
 ens_variable = "minimum"
+
 [_base._concentration._integr."_max+"]
 outfile = "{release_start}_{release_site}_FLEXPART-{model}_cloud_statistics_{domain}.pdf"
 ens_variable = "maximum"
+
 [_base._tot_deposition."_max+"]
 outfile = "{release_start}_{release_site}_FLEXPART-{model}_cloud_statistics_{domain}.pdf"
 ens_variable = "maximum"
+
 [_base._affected_area."_max+"]
 outfile = "{release_start}_{release_site}_FLEXPART-{model}_cloud_statistics_{domain}.pdf"
 ens_variable = "maximum"
+
 [_base._concentration._integr."_mean+"]
 outfile = "{release_start}_{release_site}_FLEXPART-{model}_cloud_statistics_{domain}.pdf"
 ens_variable = "mean"
+
 [_base._tot_deposition."_mean+"]
 outfile = "{release_start}_{release_site}_FLEXPART-{model}_cloud_statistics_{domain}.pdf"
 ens_variable = "mean"
-# [_base._affected_area."_mean+"]
+
+# [_base._affected_area."_mean+"] # for affected area, mean is same area as max -> skip mean
 # outfile = "{release_start}_{release_site}_FLEXPART-{model}_cloud_statistics_{domain}.pdf"
 # ens_variable = "mean"
+
 [_base._concentration._integr."_median+"]
 outfile = "{release_start}_{release_site}_FLEXPART-{model}_cloud_statistics_{domain}.pdf"
 ens_variable = "median"

src/pyflexplot/data/presets/opr/icon-ch2-eps/all_png.toml

@@ -1,4 +1,4 @@
-# PyFlexPlot setup file to create ensemble ICON-CH2-EPS plots
+# PyFlexPlot setup file to create ensemble ICON-CH2-EPS plots in PNG format
 
 [_base]
 # Test data source: /store_new/mch/msopr/pyflexplot_testdata/
@@ -34,78 +34,80 @@ time = -1
 [_base._concentration."_probability+"]
 ens_variable = "probability"
 ens_param_thr = 0
+
 [_base._concentration._integr."_probability+"]
 ens_variable = "probability"
 ens_param_thr = 0
+
 [_base._tot_deposition."_probability+"]
 ens_variable = "probability"
 ens_param_thr = 0
+
 [_base._affected_area."_probability+"]
 ens_variable = "probability"
 ens_param_thr = 0
 
-# [_base._concentration."_probability+"."_multipanel_time+"]
-# plot_type = "multipanel"
-# multipanel_param = "time"
-# time = [2, 4, 8, -1]
-
 [_base._concentration._integr."_pctl95+"]
 ens_variable = "percentile"
 ens_param_pctl = 95
+
 [_base._tot_deposition."_pctl95+"]
 ens_variable = "percentile"
 ens_param_pctl = 95
+
 [_base._affected_area."_pctl95+"]
 ens_variable = "percentile"
 ens_param_pctl = 95
 
-# [_base._tot_deposition."_multipanel_pctl+"]
-# plot_type = "multipanel"
-# multipanel_param = "ens_param_pctl"
-# ens_variable = "percentile"
-# ens_param_pctl = [5, 50, 75, 95]
-
-# [_base._concentration._integr."_multipanel_pctl+"]
-# plot_type = "multipanel"
-# multipanel_param = "ens_param_pctl"
-# ens_variable = "percentile"
-# ens_param_pctl = [5, 50, 75, 95]
-
 [_base._concentration._cloud]
 ens_param_mem_min = 2
 ens_param_thr = 0.0
 time = 0
+
 [_base._concentration._cloud."_arrival+"]
 ens_variable = "cloud_arrival_time"
+
 [_base._concentration._cloud."_departure+"]
 ens_variable = "cloud_departure_time"
 
 [_base._concentration._integr."_min+"]
 ens_variable = "minimum"
+
 [_base._tot_deposition."_min+"]
 ens_variable = "minimum"
+
 [_base._affected_area."_min+"]
 ens_variable = "minimum"
+
 [_base._concentration._integr."_max+"]
 ens_variable = "maximum"
+
 [_base._tot_deposition."_max+"]
 ens_variable = "maximum"
+
 [_base._affected_area."_max+"]
 ens_variable = "maximum"
+
 [_base._concentration._integr."_mean+"]
 ens_variable = "mean"
+
 [_base._tot_deposition."_mean+"]
 ens_variable = "mean"
-# [_base._affected_area."_mean+"]
+
+# [_base._affected_area."_mean+"] # for affected area, mean is same area as max -> skip mean
 # ens_variable = "mean"
+
 [_base._concentration._integr."_median+"]
 ens_variable = "median"
+
 [_base._tot_deposition."_median+"]
 ens_variable = "median"
+
 [_base._affected_area."_median+"]
 ens_variable = "median"
 
 ["**".full]
 domain = "full"
+
 ["**".ch]
 domain = "ch"

src/pyflexplot/data/presets/opr/icon-ch2-eps/all_shp.toml

@@ -31,21 +31,100 @@ level = 0
 time = -1
 
 [_base._concentration."_probability+"]
-outfile = "{release_start}_{release_site}_FLEXPART-{model}_probability_{domain}.shp"
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Wahrscheinlichkeit-Konzentration_{species_id}_{time_step}.shp"
 ens_variable = "probability"
 ens_param_thr = 0
+
 [_base._concentration._integr."_probability+"]
-outfile = "{release_start}_{release_site}_FLEXPART-{model}_probability_{domain}.shp"
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Wahrscheinlichkeit-integrierte-Luftaktivitaet_{species_id}.shp"
 ens_variable = "probability"
 ens_param_thr = 0
+
 [_base._tot_deposition."_probability+"]
-outfile = "{release_start}_{release_site}_FLEXPART-{model}_probability_{domain}.shp"
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Wahrscheinlichkeit-Deposition_{species_id}.shp"
 ens_variable = "probability"
 ens_param_thr = 0
+
 [_base._affected_area."_probability+"]
-outfile = "{release_start}_{release_site}_FLEXPART-{model}_probability_{domain}.shp"
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Wahrscheinlichkeit-beaufschl_Gebiet.shp"
 ens_variable = "probability"
 ens_param_thr = 0
 
-["**".ch]
-domain = "ch"
+[_base._concentration._integr."_pctl95+"]
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_95-Perzentil.shp"
+ens_variable = "percentile"
+ens_param_pctl = 95
+
+[_base._tot_deposition."_pctl95+"]
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_95-Perzentil.shp"
+ens_variable = "percentile"
+ens_param_pctl = 95
+
+[_base._affected_area."_pctl95+"]
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_95-Perzentil.shp"
+ens_variable = "percentile"
+ens_param_pctl = 95
+
+[_base._concentration._cloud]
+ens_param_mem_min = 2
+ens_param_thr = 0.0
+time = 0
+
+[_base._concentration._cloud."_arrival+"]
+ens_variable = "cloud_arrival_time"
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Wolkenankunftszeit.shp"
+
+[_base._concentration._cloud."_departure+"]
+ens_variable = "cloud_departure_time"
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Wolkenabzugszeit.shp"
+
+[_base._concentration._integr."_min+"]
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Minimum_integrierte-Luftaktivitaet.shp"
+ens_variable = "minimum"
+
+[_base._tot_deposition."_min+"]
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Minimum_Deposition.shp"
+ens_variable = "minimum"
+
+[_base._affected_area."_min+"]
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Minimum_beaufschl_Gebiet.shp"
+ens_variable = "minimum"
+
+[_base._concentration._integr."_max+"]
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Maximum_integrierte-Luftaktivitaet.shp"
+ens_variable = "maximum"
+
+[_base._tot_deposition."_max+"]
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Maximum_Deposition.shp"
+ens_variable = "maximum"
+
+[_base._affected_area."_max+"]
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Maximum_beaufschl_Gebiet.shp"
+ens_variable = "maximum"
+
+[_base._concentration._integr."_mean+"]
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Mittel_integrierte-Luftaktivitaet.shp"
+ens_variable = "mean"
+
+[_base._tot_deposition."_mean+"]
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Mittel_Deposition.shp"
+ens_variable = "mean"
+
+# [_base._affected_area."_mean+"] # for affected area, mean is same area as max -> skip mean
+# outfile = "{release_start}_{release_site}_FLEXPART-{model}_Mittel_beaufschl_Gebiet.shp"
+# ens_variable = "mean"
+
+[_base._concentration._integr."_median+"]
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Median_integrierte-Luftaktivitaet.shp"
+ens_variable = "median"
+
+[_base._tot_deposition."_median+"]
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Median_Deposition.shp"
+ens_variable = "median"
+
+[_base._affected_area."_median+"]
+outfile = "{release_start}_{release_site}_FLEXPART-{model}_Median_beaufschl_Gebiet.shp"
+ens_variable = "median"
+
+["**".full]
+domain = "full"

src/pyflexplot/data/presets/opr/ifs-hres-eu/all_pdf.toml

@@ -1,4 +1,4 @@
-# PyFlexPlot setup file to create deterministic IFS-HRES-EU plots
+# PyFlexPlot setup file to create deterministic IFS-HRES-EU plots in PDF format
 
 [_base]
 # Test data source: /store_new/mch/msopr/pyflexplot_testdata/