PySDM-examples 2.128__tar.gz → 2.130__tar.gz

{pysdm_examples-2.128 → pysdm_examples-2.130}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdm-examples
-Version: 2.128
+Version: 2.130
 Summary: PySDM usage examples reproducing results from literature and depicting how to use PySDM from Python Jupyter notebooks
 Home-page: https://github.com/open-atmos/PySDM
 Author: https://github.com/open-atmos/PySDM/graphs/contributors
@@ -128,6 +128,8 @@ Example notebooks include:
 - condensation and aqueous-chemistry
   - <a href="https://open-atmos.github.io/PySDM/PySDM_examples/Kreidenweis_et_al_2003.html">Kreidenweis_et_al_2003</a>: <mark>Hoppel gap</mark> simulation setup (i.e. depiction of evolution of aerosol mass spectrum from a monomodal to bimodal due to aqueous‐phase SO2 oxidation)
   - <a href="https://open-atmos.github.io/PySDM/PySDM_examples/Jaruga_and_Pawlowska_2018.html">Jaruga_and_Pawlowska_2018</a>: exploration of numerical convergence using the above Hoppel-gap simulation setup
+- freezing
+  - <a href="https://open-atmos.github.io/PySDM/PySDM_examples/Spichtinger_et_al_2023.html">Spichtinger_et_al_2023</a>: <mark>homogeneous freezing</mark> and ice growth (<mark>Wegener-Bergeron-Findeisen process</mark>)
 
 The parcel environment is also featured in the <a href="https://open-atmos.github.io/PySDM/PySDM.html#tutorials">PySDM tutorials</a>.
 

{pysdm_examples-2.128 → pysdm_examples-2.130}/PySDM_examples/Abdul_Razzak_Ghan_2000/run_ARG_parcel.py

@@ -28,7 +28,7 @@ def run_parcel(
 ):
     products = (
         PySDM_products.WaterMixingRatio(unit="g/kg", name="liquid water mixing ratio"),
-        PySDM_products.PeakSupersaturation(name="S max"),
+        PySDM_products.PeakSaturation(name="S max"),
         PySDM_products.AmbientRelativeHumidity(name="RH"),
         PySDM_products.ParcelDisplacement(name="z"),
     )
@@ -54,7 +54,7 @@ def run_parcel(
     builder = Builder(backend=CPU(formulae), n_sd=n_sd, environment=env)
     builder.add_dynamic(AmbientThermodynamics())
     builder.add_dynamic(Condensation())
-    builder.request_attribute("critical supersaturation")
+    builder.request_attribute("critical saturation")
 
     attributes = {
         k: np.empty(0) for k in ("dry volume", "kappa times dry volume", "multiplicity")
@@ -87,7 +87,7 @@ def run_parcel(
         "multiplicity": tuple([] for _ in range(particulator.n_sd)),
         "volume": tuple([] for _ in range(particulator.n_sd)),
         "critical volume": tuple([] for _ in range(particulator.n_sd)),
-        "critical supersaturation": tuple([] for _ in range(particulator.n_sd)),
+        "critical saturation": tuple([] for _ in range(particulator.n_sd)),
     }
 
     for _ in range(n_steps):
@@ -109,7 +109,7 @@ def run_parcel(
         RHmax = np.nanmax(np.asarray(output["RH"]))
         for i, volume in enumerate(output_attributes["volume"]):
             if j * n_sd_per_mode <= i < (j + 1) * n_sd_per_mode:
-                if output_attributes["critical supersaturation"][i][-1] < RHmax:
+                if output_attributes["critical saturation"][i][-1] < RHmax:
                     activated_drops_j_S += output_attributes["multiplicity"][i][-1]
                 if output_attributes["critical volume"][i][-1] < volume[-1]:
                     activated_drops_j_V += output_attributes["multiplicity"][i][-1]

{pysdm_examples-2.128 → pysdm_examples-2.130}/PySDM_examples/Arabas_and_Shima_2017/simulation.py

@@ -62,14 +62,14 @@ class Simulation:
             PySDM_products.MeanRadius(name="radius_m1", unit="um"),
             PySDM_products.CondensationTimestepMin(name="dt_cond_min"),
             PySDM_products.ParcelDisplacement(name="z"),
-            PySDM_products.AmbientRelativeHumidity(name="RH", unit="%"),
+            PySDM_products.AmbientRelativeHumidity(name="RH"),
+            PySDM_products.PeakSaturation(name="S_max"),
             PySDM_products.Time(name="t"),
             PySDM_products.ActivatingRate(unit="s^-1 mg^-1", name="activating_rate"),
             PySDM_products.DeactivatingRate(
                 unit="s^-1 mg^-1", name="deactivating_rate"
             ),
             PySDM_products.RipeningRate(unit="s^-1 mg^-1", name="ripening_rate"),
-            PySDM_products.PeakSupersaturation(unit="%", name="S_max"),
         ]
 
         self.particulator = builder.build(attributes, products)
@@ -85,7 +85,7 @@ class Simulation:
             self.particulator.products["dt_cond_min"].get()[cell_id]
         )
         output["z"].append(self.particulator.products["z"].get()[cell_id])
-        output["S"].append(self.particulator.products["RH"].get()[cell_id] / 100 - 1)
+        output["RH"].append(self.particulator.products["RH"].get()[cell_id])
         output["t"].append(self.particulator.products["t"].get())
 
         for event in ("activating", "deactivating", "ripening"):
@@ -96,7 +96,7 @@ class Simulation:
     def run(self):
         output = {
             "r": [],
-            "S": [],
+            "RH": [],
             "z": [],
             "t": [],
             "dt_cond_min": [],

{pysdm_examples-2.128 → pysdm_examples-2.130}/PySDM_examples/Bartman_2020_MasterThesis/fig_5_SCIPY_VS_ADAPTIVE.py

@@ -75,12 +75,12 @@ def plot(plot_data, rtols, schemes, setups_num, show_plot, path=None):
             ax = axs[settings_idx, rtol_idx]
             for scheme in schemes:
                 datum = plot_data[scheme][_rtol][settings_idx]
-                S = datum["S"]
+                S = datum["RH"]
                 z = datum["z"]
                 dt = datum["dt_cond_min"]
                 if scheme == "SciPy":
-                    ax.plot(S, z, label=scheme, color="grey")
                     SCIPY_S = np.array(S)
+                    ax.plot(SCIPY_S - 1, z, label=scheme, color="grey")
                 else:
                     add_color_line(fig, ax, S, z, dt)
                     PySDM_S = np.array(S)

{pysdm_examples-2.128 → pysdm_examples-2.130}/PySDM_examples/Grabowski_and_Pawlowska_2023/simulation.py

@@ -38,8 +38,8 @@ class Simulation(BasicSimulation):
             Condensation(rtol_thd=settings.rtol_thd, rtol_x=settings.rtol_x)
         )
         for attribute in (
-            "critical supersaturation",
-            "equilibrium supersaturation",
+            "critical saturation",
+            "equilibrium saturation",
             "critical volume",
         ):
             builder.request_attribute(attribute)
@@ -80,12 +80,8 @@ class Simulation(BasicSimulation):
         self.output_attributes = {
             "volume": tuple([] for _ in range(self.particulator.n_sd)),
             "dry volume": tuple([] for _ in range(self.particulator.n_sd)),
-            "critical supersaturation": tuple(
-                [] for _ in range(self.particulator.n_sd)
-            ),
-            "equilibrium supersaturation": tuple(
-                [] for _ in range(self.particulator.n_sd)
-            ),
+            "critical saturation": tuple([] for _ in range(self.particulator.n_sd)),
+            "equilibrium saturation": tuple([] for _ in range(self.particulator.n_sd)),
             "critical volume": tuple([] for _ in range(self.particulator.n_sd)),
             "multiplicity": tuple([] for _ in range(self.particulator.n_sd)),
         }

{pysdm_examples-2.128 → pysdm_examples-2.130}/PySDM_examples/Jensen_and_Nugent_2017/simulation.py

@@ -6,7 +6,7 @@ from PySDM import Builder
 from PySDM.physics import si
 from PySDM.backends import CPU
 from PySDM.products import (
-    PeakSupersaturation,
+    PeakSaturation,
     ParcelDisplacement,
     Time,
     ActivatedMeanRadius,
@@ -52,7 +52,7 @@ class Simulation(BasicSimulation):
             ),
         )
 
-        additional_derived_attributes = ("radius", "equilibrium supersaturation")
+        additional_derived_attributes = ("radius", "equilibrium saturation")
         for additional_derived_attribute in additional_derived_attributes:
             builder.request_attribute(additional_derived_attribute)
 
@@ -93,7 +93,7 @@ class Simulation(BasicSimulation):
             builder.build(
                 attributes=attributes,
                 products=(
-                    PeakSupersaturation(name="S_max"),
+                    PeakSaturation(name="S_max"),
                     ParcelDisplacement(name="z"),
                     Time(name="t"),
                     ActivatedMeanRadius(

{pysdm_examples-2.128 → pysdm_examples-2.130}/PySDM_examples/Kreidenweis_et_al_2003/simulation.py

@@ -106,7 +106,7 @@ class Simulation(BasicSimulation):
             PySDM_products.TotalDryMassMixingRatio(
                 settings.DRY_RHO, name="q_dry", unit="ug/kg"
             ),
-            PySDM_products.PeakSupersaturation(unit="%", name="S_max"),
+            PySDM_products.PeakSaturation(unit="%", name="S_max_percent"),
             PySDM_products.ParticleSpecificConcentration(
                 radius_range=settings.cloud_radius_range, name="n_c_mg", unit="mg^-1"
             ),

{pysdm_examples-2.128 → pysdm_examples-2.130}/PySDM_examples/Lowe_et_al_2019/simulation.py

@@ -81,8 +81,8 @@ class Simulation(BasicSimulation):
         products = products or (
             PySDM_products.ParcelDisplacement(name="z"),
             PySDM_products.Time(name="t"),
-            PySDM_products.PeakSupersaturation(unit="%", name="S_max"),
-            PySDM_products.AmbientRelativeHumidity(unit="%", name="RH"),
+            PySDM_products.PeakSaturation(name="S_max"),
+            PySDM_products.AmbientRelativeHumidity(name="RH"),
             PySDM_products.ActivatedParticleConcentration(
                 name="CDNC_cm3",
                 unit="cm^-3",

{pysdm_examples-2.128 → pysdm_examples-2.130}/PySDM_examples/Pyrcel/profile_plotter.py

@@ -28,8 +28,12 @@ class ProfilePlotter:
     def plot_data(self, settings, output):
         _, axs = pyplot.subplots(1, 2, sharey=True, figsize=(10, 5))
         axS = axs[0]
+        if output["products"].get("S_max"):
+            SS_percent = (np.asarray(output["products"]["S_max"]) - 1) * 100
+        else:
+            SS_percent = np.asarray(output["products"]["S_max_percent"]) - 100
         axS.plot(
-            np.asarray(output["products"]["S_max"]) - 100,
+            SS_percent,
             output["products"]["z"],
             color="black",
         )
@@ -37,7 +41,7 @@ class ProfilePlotter:
         axS.set_xlabel("Supersaturation [%]")
         axS.set_xlim(0, 0.7)
         axS.set_ylim(0, 250)
-        axS.text(0.3, 52, f"max S = {np.nanmax(output['products']['S_max'])-100:.2f}%")
+        axS.text(0.3, 52, f"max SS = {np.nanmax(SS_percent):.2f}%")
         axS.grid()
 
         axT = axS.twiny()

{pysdm_examples-2.128 → pysdm_examples-2.130}/PySDM_examples/Shipway_and_Hill_2012/simulation.py

@@ -148,7 +148,7 @@ class Simulation:
                     PySDM_products.RipeningRate(name="ripening"),
                     PySDM_products.ActivatingRate(name="activating"),
                     PySDM_products.DeactivatingRate(name="deactivating"),
-                    PySDM_products.PeakSupersaturation(unit="%"),
+                    PySDM_products.PeakSaturation(),
                     PySDM_products.ParticleSizeSpectrumPerVolume(
                         name="dry spectrum",
                         radius_bins_edges=settings.r_bins_edges_dry,

pysdm_examples-2.130/PySDM_examples/Spichtinger_et_al_2023/__init__.py

@@ -0,0 +1,7 @@
+# pylint: disable=invalid-name
+"""
+homogeneous nucleation event example based on Fig. B1. in
+[Spichtinger et al. 2023](https://doi.org/10.5194/acp-23-2035-2023)
+"""
+from .simulation import Simulation
+from .settings import Settings

pysdm_examples-2.130/PySDM_examples/Spichtinger_et_al_2023/data/reference_bulk.py

@@ -0,0 +1,47 @@
+"""
+reference results for bulk scheme in Fig B1. in
+[Spichtinger et al. 2023](https://doi.org/10.5194/acp-23-2035-2023)
+"""
+
+import numpy as np
+
+
+def bulk_model_reference_array():
+
+    initial_temperatures = np.array([196.0, 216.0, 236.0])
+    updrafts = np.array([0.05, 0.1, 0.3, 0.5, 1.0, 3.0, 5.0, 10.0])
+
+    dim_size = (np.shape(initial_temperatures)[0], np.shape(updrafts)[0])
+    ni_bulk_ref = np.zeros(dim_size)
+
+    # T = 196
+    ni_bulk_ref[0, 0] = 643686.1316903427
+    ni_bulk_ref[0, 1] = 2368481.0609527444
+    ni_bulk_ref[0, 2] = 20160966.984670535
+    ni_bulk_ref[0, 3] = 49475281.81718969
+    ni_bulk_ref[0, 4] = 131080662.23620115
+    ni_bulk_ref[0, 5] = 401046528.70428866
+    ni_bulk_ref[0, 6] = 627442148.3402529
+    ni_bulk_ref[0, 7] = 1151707310.2210448
+
+    # T = 216
+    ni_bulk_ref[1, 0] = 60955.84292640147
+    ni_bulk_ref[1, 1] = 189002.0792186534
+    ni_bulk_ref[1, 2] = 1200751.6897658105
+    ni_bulk_ref[1, 3] = 2942110.815055958
+    ni_bulk_ref[1, 4] = 10475282.894692907
+    ni_bulk_ref[1, 5] = 90871045.40856971
+    ni_bulk_ref[1, 6] = 252175505.460412
+    ni_bulk_ref[1, 7] = 860335156.4717773
+
+    # T = 236
+    ni_bulk_ref[2, 0] = 13049.108886452004
+    ni_bulk_ref[2, 1] = 40422.244759544985
+    ni_bulk_ref[2, 2] = 237862.49854786208
+    ni_bulk_ref[2, 3] = 545315.7805748513
+    ni_bulk_ref[2, 4] = 1707801.469906006
+    ni_bulk_ref[2, 5] = 11128055.66932415
+    ni_bulk_ref[2, 6] = 27739585.111447476
+    ni_bulk_ref[2, 7] = 101799566.47225031
+
+    return initial_temperatures, updrafts, ni_bulk_ref

pysdm_examples-2.130/PySDM_examples/Spichtinger_et_al_2023/data/simulation_data.py

@@ -0,0 +1,22 @@
+import numpy as np
+
+
+def saved_simulation_ensemble_mean():
+
+    ni_ens_mean = np.array(
+        [
+            [0.00000000e00, 0.00000000e00, 0.00000000e00],
+            [0.00000000e00, 0.00000000e00, 0.00000000e00],
+            [1.62069821e03, 0.00000000e00, 0.00000000e00],
+            [5.25377025e06, 9.75512904e05, 4.51431097e05],
+            [3.67137290e07, 5.45240337e06, 1.53884530e06],
+            [7.96514420e07, 1.13878118e07, 3.26386880e06],
+            [2.19385480e08, 3.62240242e07, 9.00657591e06],
+            [1.00631095e09, 2.34443408e08, 4.90577208e07],
+            [1.73457062e09, 5.20774276e08, 1.16040316e08],
+        ]
+    )
+    T = np.array([196.0, 216.0, 236.0])
+    w = np.array([0.01, 0.03, 0.05, 0.1, 0.3, 0.5, 1.0, 3.0, 5.0])
+
+    return T, w, ni_ens_mean

pysdm_examples-2.130/PySDM_examples/Spichtinger_et_al_2023/settings.py

@@ -0,0 +1,66 @@
+from pystrict import strict
+
+from PySDM import Formulae
+from PySDM.physics.constants import si
+from PySDM.initialisation.spectra import Lognormal
+from PySDM.initialisation.sampling import spectral_sampling
+
+
+@strict
+class Settings:
+    def __init__(
+        self,
+        *,
+        n_sd: int,
+        w_updraft: float,
+        T0: float,
+        seed: int,
+        dt: float,
+    ):
+
+        self.n_sd = n_sd
+        self.w_updraft = w_updraft
+
+        self.N_dv_solution_droplet = 2500 / si.centimetre**3
+        self.r_mean_solution_droplet = 0.055 * si.micrometre
+        self.sigma_solution_droplet = 1.6
+
+        self.mass_of_dry_air = 1000 * si.kilogram
+        self.initial_pressure = 200 * si.hectopascals
+        self.initial_ice_supersaturation = 1.0
+        self.kappa = 0.64
+        self.initial_temperature = T0
+
+        self.formulae = Formulae(
+            particle_shape_and_density="MixedPhaseSpheres",
+            homogeneous_ice_nucleation_rate="Koop_Correction",
+            seed=seed,
+        )
+        const = self.formulae.constants
+        pvs_i = self.formulae.saturation_vapour_pressure.pvs_ice(
+            self.initial_temperature
+        )
+        self.initial_water_vapour_mixing_ratio = const.eps / (
+            self.initial_pressure / self.initial_ice_supersaturation / pvs_i - 1
+        )
+        dry_air_density = (
+            self.formulae.trivia.p_d(
+                self.initial_pressure, self.initial_water_vapour_mixing_ratio
+            )
+            / self.initial_temperature
+            / const.Rd
+        )
+
+        spectrum = Lognormal(
+            norm_factor=self.N_dv_solution_droplet / dry_air_density,
+            m_mode=self.r_mean_solution_droplet,
+            s_geom=self.sigma_solution_droplet,
+        )
+
+        self.r_dry, self.specific_concentration = spectral_sampling.Linear(
+            spectrum
+        ).sample(n_sd)
+
+        self.t_duration = 7200
+        self.dt = dt
+        self.n_output = int(self.t_duration / 100)

pysdm_examples-2.130/PySDM_examples/Spichtinger_et_al_2023/simulation.py

@@ -0,0 +1,121 @@
+import numpy as np
+
+from PySDM_examples.utils import BasicSimulation
+
+import PySDM.products as PySDM_products
+from PySDM.backends import CPU
+from PySDM.builder import Builder
+from PySDM.dynamics import (
+    AmbientThermodynamics,
+    Condensation,
+    Freezing,
+    VapourDepositionOnIce,
+)
+from PySDM.environments import Parcel
+from PySDM.initialisation import discretise_multiplicities, equilibrate_wet_radii
+
+
+class Simulation(BasicSimulation):
+    def __init__(self, settings, backend=CPU):
+
+        dt = settings.dt
+
+        formulae = settings.formulae
+
+        env = Parcel(
+            mixed_phase=True,
+            dt=dt,
+            mass_of_dry_air=settings.mass_of_dry_air,
+            p0=settings.initial_pressure,
+            initial_water_vapour_mixing_ratio=settings.initial_water_vapour_mixing_ratio,
+            T0=settings.initial_temperature,
+            w=settings.w_updraft,
+        )
+
+        builder = Builder(
+            backend=backend(
+                formulae=settings.formulae,
+                **(
+                    {"override_jit_flags": {"parallel": False}}
+                    if backend == CPU
+                    else {}
+                ),
+            ),
+            n_sd=settings.n_sd,
+            environment=env,
+        )
+
+        builder.add_dynamic(AmbientThermodynamics())
+        builder.add_dynamic(Condensation())
+        builder.add_dynamic(VapourDepositionOnIce())
+        builder.add_dynamic(
+            Freezing(
+                singular=False, homogeneous_freezing=True, immersion_freezing=False
+            )
+        )
+
+        self.n_sd = settings.n_sd
+        self.multiplicities = discretise_multiplicities(
+            settings.specific_concentration * env.mass_of_dry_air
+        )
+        self.r_dry = settings.r_dry
+        v_dry = settings.formulae.trivia.volume(radius=self.r_dry)
+        kappa = settings.kappa
+
+        self.r_wet = equilibrate_wet_radii(
+            r_dry=self.r_dry,
+            environment=builder.particulator.environment,
+            kappa_times_dry_volume=kappa * v_dry,
+        )
+
+        attributes = {
+            "multiplicity": self.multiplicities,
+            "dry volume": v_dry,
+            "kappa times dry volume": kappa * v_dry,
+            "signed water mass": formulae.particle_shape_and_density.radius_to_mass(
+                self.r_wet
+            ),
+        }
+
+        products = [
+            PySDM_products.Time(name="t"),
+            PySDM_products.AmbientRelativeHumidity(name="RH_ice", unit="%"),
+            PySDM_products.ParticleConcentration(
+                name="n_i", unit="1/m**3", radius_range=(-np.inf, 0)
+            ),
+        ]
+
+        self.n_output = settings.n_output
+        self.n_substeps = int(settings.t_duration / dt / self.n_output)
+        super().__init__(builder.build(attributes, products))
+
+    def save(self, output):
+        cell_id = 0
+        output["t"].append(self.particulator.products["t"].get())
+        output["ni"].append(self.particulator.products["n_i"].get()[cell_id])
+        output["RHi"].append(self.particulator.products["RH_ice"].get()[cell_id])
+
+    def run(self):
+        output = {
+            "t": [],
+            "ni": [],
+            "RHi": [],
+        }
+
+        self.save(output)
+
+        RHi_old = self.particulator.products["RH_ice"].get()[0].copy()
+        for _ in range(self.n_output):
+
+            self.particulator.run(self.n_substeps)
+
+            self.save(output)
+
+            RHi = self.particulator.products["RH_ice"].get()[0].copy()
+            dRHi = (RHi_old - RHi) / RHi_old
+            if dRHi > 0.0 and RHi < 130.0:
+                print("break")
+                break
+            RHi_old = RHi
+
+        return output["ni"][-1]

{pysdm_examples-2.128 → pysdm_examples-2.130}/PySDM_examples/utils/kinematic_2d/make_default_product_collection.py

@@ -67,7 +67,7 @@ def make_default_product_collection(settings):
     if settings.processes["condensation"]:
         products.append(PySDM_products.CondensationTimestepMin(name="dt_cond_min"))
         products.append(PySDM_products.CondensationTimestepMax(name="dt_cond_max"))
-        products.append(PySDM_products.PeakSupersaturation(unit="%", name="S_max"))
+        products.append(PySDM_products.PeakSaturation(unit="%", name="S_max_percent"))
         products.append(PySDM_products.ActivatingRate())
         products.append(PySDM_products.DeactivatingRate())
         products.append(PySDM_products.RipeningRate())

{pysdm_examples-2.128 → pysdm_examples-2.130}/PySDM_examples/utils/pvanim.py

@@ -12,6 +12,12 @@ def cli_using_argparse(argp):
     argp.add_argument("product_path", help="path to pvd products file")
     argp.add_argument("attributes_path", help=" path to pvd attributes file")
     argp.add_argument("output_path", help="path where to write output files")
+    argp.add_argument(
+        "--mode",
+        choices=["light", "dark"],
+        default="dark",
+        help="Choose 'light' or 'dark' mode.",
+    )
     argp.add_argument(
         "--multiplicity_preset",
         default="Inferno (matplotlib)",
@@ -54,6 +60,13 @@ def cli_using_argparse(argp):
         default=0.77,
         help="Opacity for sd_attributes",
     )
+    argp.add_argument(
+        "--animation_size",
+        nargs=2,
+        type=int,
+        default=[800, 800],
+        help="Animation size [x,y]",
+    )
     argp.add_argument(
         "--animationframename",
         type=str,
@@ -86,12 +99,14 @@ setup = {
     "sd_productspvdDisplay": pvs.GetDisplayProperties(
         sd_productspvd, view=pvs.GetActiveViewOrCreate("RenderView")
     ),
+    "color": [1, 1, 1] if args.mode == "dark" else [0, 0, 0],
+    "inverted_color": [0.129, 0.145, 0.161] if args.mode == "dark" else [1, 1, 1],
 }
 
 setup = namedtuple("Setup", setup.keys())(**setup)
 
 setup.effectiveradiusLUT.RescaleTransferFunction(0.1380997175392798, 207.7063518856934)
-
+materialLibrary1 = pvs.GetMaterialLibrary()
 setup.renderView1.Update()
 
 
@@ -127,6 +142,10 @@ def scalar_bar(name, *, y, erLUT):
     scalarBar = pvs.GetScalarBar(erLUT.effectiveradiusLUT, y.renderView1)
     scalarBar.ComponentTitle = ""
     scalarBar.Title = name
+    scalarBar.TitleFontSize = 25
+    scalarBar.LabelFontSize = 25
+    scalarBar.LabelColor = setup.color
+    scalarBar.TitleColor = setup.color
     y.renderView1.Update()
 
 
@@ -139,6 +158,12 @@ def create_glyph(
     glyph.ScaleArray = [scale_array1, scale_array2]
     glyph.ScaleFactor = 100
     glyphDisplay.SetScalarBarVisibility(y.renderView1, True)
+    multiplicityLUT = pvs.GetColorTransferFunction("multiplicity")
+    multiplicityLUTColorBar = pvs.GetScalarBar(multiplicityLUT, y.renderView1)
+    multiplicityLUTColorBar.TitleFontSize = 25
+    multiplicityLUTColorBar.LabelFontSize = 25
+    multiplicityLUTColorBar.LabelColor = setup.color
+    multiplicityLUTColorBar.TitleColor = setup.color
     if color_by is True:
         glyphDisplay.ColorArrayName = ["POINTS", ""]
         pvs.ColorBy(glyphDisplay, None)
@@ -178,27 +203,31 @@ def apply_presets_logscale_opacity_and_update(*, y, attdisplay, erLUT, proddispl
 
 
 def get_layout(*, y):
+    pvs.SetViewProperties(
+        Background=setup.inverted_color, UseColorPaletteForBackground=0
+    )
+    pvs.Render(setup.renderView1)
     layout1 = pvs.GetLayout()
-    layout1.SetSize(1205, 739)
+    layout1.SetSize(args.animation_size)
+    layout1.PreviewMode = args.animation_size
     y.renderView1.Update()
 
 
 def set_current_camera_placement(*, y):
     y.renderView1.InteractionMode = "2D"
     y.renderView1.CameraPosition = [
-        836.5045867211775,
-        677.8909274570431,
-        -4098.0762113533165,
+        836,
+        677,
+        -4098,
     ]
-    y.renderView1.CameraFocalPoint = [836.5045867211775, 677.8909274570431, 0.0]
+    y.renderView1.CameraFocalPoint = [636, 1030, 0.0]
     y.renderView1.CameraViewUp = [1.0, 0.0, 0.0]
-    y.renderView1.CameraParallelScale = 1060.6601717798205
+    y.renderView1.CameraParallelScale = 1560
     y.renderView1.Update()
 
 
 def axes_settings(*, view):
-    view.ViewSize = [2000, 800]
-    view.Background = [1, 1, 1]
+    # setup.renderView1.Background = [1,0.5,0.2]
     view.CenterAxesVisibility = True
     view.OrientationAxesVisibility = False
     axesGrid = view.AxesGrid
@@ -216,10 +245,10 @@ def axes_settings(*, view):
     axesGrid.YTitleFontSize = 30
     axesGrid.YLabelFontSize = 30
 
-    axesGrid.XTitleColor = [1.0, 1.0, 1.0]
-    axesGrid.XLabelColor = [1.0, 1.0, 1.0]
-    axesGrid.YTitleColor = [1.0, 1.0, 1.0]
-    axesGrid.YLabelColor = [1.0, 1.0, 1.0]
+    axesGrid.XTitleColor = setup.color
+    axesGrid.XLabelColor = setup.color
+    axesGrid.YTitleColor = setup.color
+    axesGrid.YLabelColor = setup.color
     axesGrid.GridColor = [0.1, 0.1, 0.1]
     view.CenterAxesVisibility = False
     view.Update()
@@ -227,9 +256,14 @@ def axes_settings(*, view):
 
 def time_annotation(*, y):
     time = pvs.AnnotateTimeFilter(
-        guiName="AnnotateTimeFilter1", Format="Time:{time:f}s"
+        guiName="AnnotateTimeFilter1", Scale=1 / 60, Format="Time:{time:g}min"
     )
-    pvs.Show(time, y.renderView1)
+    timedisplay = pvs.Show(time, y.renderView1)
+    timedisplay.FontSize = 25
+    timedisplay.WindowLocation = "Any Location"
+    timedisplay.FontSize = 30
+    timedisplay.Position = [0.31, 0.9]
+    timedisplay.Color = setup.color
     y.renderView1.Update()
 
 
@@ -237,10 +271,10 @@ def text(text_in, position_y, *, view):
     sentence = pvs.Text()
     sentence.Text = text_in
     textDisplay = pvs.Show(sentence, view)
-    textDisplay.Color = [1.0, 1.0, 1.0]
+    textDisplay.Color = setup.color
     textDisplay.WindowLocation = "Any Location"
-    textDisplay.FontSize = 16
-    textDisplay.Position = [0.01, position_y]
+    textDisplay.FontSize = 28
+    textDisplay.Position = [0.17, position_y]
 
 
 def last_anim_frame(animation_frame_name):
@@ -290,9 +324,11 @@ get_layout(y=setup)
 set_current_camera_placement(y=setup)
 axes_settings(view=setup.renderView1)
 time_annotation(y=setup)
-text("Arrows scale with Courant number C=u*Δt/Δx,", 0.7, view=setup.renderView1)
-text("reflecting the grid spacing Δx and Δy.", 0.65, view=setup.renderView1)
-last_anim_frame(animation_frame_name=args.animationframename)
+text("Arrows scale with Courant", 0.15, view=setup.renderView1)
+text("number C=u·Δt/Δx, reflecting", 0.1, view=setup.renderView1)
+text("the grid spacing Δx and Δy.", 0.05, view=setup.renderView1)
+if args.animationframename is not None:
+    last_anim_frame(animation_frame_name=args.animationframename)
 scene = pvs.GetAnimationScene()
 scene.UpdateAnimationUsingDataTimeSteps()
 pvs.Render(setup.renderView1)