Merge pull request #68 from Adnan-Ali-Ahmad/vaytet_osyris

Custom user normalization & verbose flag for LICs

src/osyris/plot/parser.py

@@ -1,14 +1,25 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright (c) 2022 Osyris contributors (https://github.com/nvaytet/osyris)
 
-from matplotlib.colors import LogNorm, Normalize
+from matplotlib.colors import LogNorm, Normalize, SymLogNorm
 
 
 def get_norm(norm=None, vmin=None, vmax=None):
-    if norm == "log":
-        return LogNorm(vmin=vmin, vmax=vmax)
-    else:
+    if norm is None:
         return Normalize(vmin=vmin, vmax=vmax)
+    if isinstance(norm, str):
+        norm_lowercase = norm.lower()
+        if norm_lowercase == "log":
+            return LogNorm(vmin=vmin, vmax=vmax)
+        elif norm_lowercase == "symlog":
+            return SymLogNorm(linthresh=1e-2, vmin=vmin, vmax=vmax, base=10)
+        elif norm_lowercase == "linear":
+            return Normalize(vmin=vmin, vmax=vmax)
+        else:
+            raise RuntimeError("Unknown norm keyword '{}'.\nAvailable keywords"
+                               " are 'log', 'symlog' and 'linear'.".format(norm))
+    else:
+        return norm
 
 
 def parse_layer(layer,

src/osyris/plot/wrappers.py

@@ -3,7 +3,7 @@
 
 from .. import config
 from ..core import Array
-from contextlib import redirect_stderr
+from contextlib import redirect_stderr, nullcontext
 import io
 import matplotlib.pyplot as plt
 from matplotlib.cm import ScalarMappable
@@ -189,6 +189,7 @@ def line_integral_convolution(ax,
                               cblabel=None,
                               length=None,
                               color=None,
+                              verbose=False,
                               **kwargs):
     """
     Wrapper that plots a line integral convolution of a vector field.
@@ -199,7 +200,8 @@ def line_integral_convolution(ax,
     # Compute line integral convolution
     if length is None:
         length = int(max(z.shape[:-1]) * 15 / 128)
-    with redirect_stderr(io.StringIO()) as _:
+    cm = nullcontext() if verbose else redirect_stderr(io.StringIO())
+    with cm:
         lic_res = lic(z[..., 1], z[..., 0], length=length)
 
     if color is not None: