Merge branch 'olaflow'

swash/processing/animate.py

@@ -23,11 +23,9 @@ root = pathlib.Path(config.get("swash", "out"))
 out = pathlib.Path(config.get("plot", "out"))
 out.mkdir(exist_ok=True)
 
-
 def data(var):
     return np.load(inp.joinpath(f"{var}.npy"))
 
-
 x = data("xp")
 t = data("tsec")
 

swash/processing/layers.py

@@ -6,6 +6,10 @@ import pathlib
 import matplotlib.animation as animation
 import matplotlib.pyplot as plt
 import numpy as np
+<<<<<<< HEAD
+=======
+import pandas as pd
+>>>>>>> olaflow
 
 parser = argparse.ArgumentParser(description="Animate swash output")
 parser.add_argument("-v", "--verbose", action="count", default=0)
@@ -23,7 +27,6 @@ root = pathlib.Path(config.get("swash", "out"))
 out = pathlib.Path(config.get("plot", "out"))
 out.mkdir(exist_ok=True)
 
-
 def data(var):
     return np.load(inp.joinpath(f"{var}.npy"))