Write now sink infor to time series. Also a bug cerrection for sink switch.

analysis/python/astar/visual/lineplot.py

@@ -32,7 +32,7 @@ def plot_min_man_rms(ts, xaxis, yaxis1, yaxis2, yaxis3):
     plt.xlabel(xaxis)
     plt.legend()
 
-def plot_ts(ts, show_all=False, lnrho=False, uutot=False, uux=False, uuy=False, uuz=False, ss=False, acc=False):
+def plot_ts(ts, show_all=False, lnrho=False, uutot=False, uux=False, uuy=False, uuz=False, ss=False, acc=False, sink=False):
 
     if show_all:
         lnrho=True
@@ -42,6 +42,7 @@ def plot_ts(ts, show_all=False, lnrho=False, uutot=False, uux=False, uuy=False,
         uuz=True
         ss=True
         acc=True
+        sink=True
 
     if lnrho:
         plt.figure()
@@ -98,5 +99,19 @@ def plot_ts(ts, show_all=False, lnrho=False, uutot=False, uux=False, uuy=False,
         yaxis2 = 'acc_min'
         yaxis3 = 'acc_max'
         plot_min_man_rms(ts, xaxis, yaxis1, yaxis2, yaxis3)
+
+        plt.figure()
+        xaxis = 't_step'
+        yaxis1 = 'sink_mass'
+        yaxis2 = 'sink_mass'
+        yaxis3 = 'sink_mass'
+        plot_min_man_rms(ts, xaxis, yaxis1, yaxis2, yaxis3)
+  
+        plt.figure()
+        xaxis = 't_step'
+        yaxis1 = 'accreted_mass'
+        yaxis2 = 'accreted_mass'
+        yaxis3 = 'accreted_mass'
+        plot_min_man_rms(ts, xaxis, yaxis1, yaxis2, yaxis3)
   
     plt.show()

analysis/python/samples/readtest.py

@@ -45,7 +45,7 @@ print("sys.argv", sys.argv)
 #meshdir = "/tiara/home/mvaisala/astaroth-code/astaroth_2.0/build/"
 #meshdir  = "/tiara/ara/data/mvaisala/tmp/astaroth-code/astaroth_2.0/build/"
 #meshdir = "/tiara/ara/data/mvaisala/asth_testbed_double/"
-meshdir  = "/scratch/data/mvaisala/forcingtest/"
+meshdir  = "/home/mvaisala/astaroth/build/"
 
 if "xtopbound" in sys.argv: 
     for i in range(0, 171):
@@ -199,6 +199,6 @@ if 'sl' in sys.argv:
 
 if 'ts' in sys.argv:
    ts = ad.read.TimeSeries(fdir=meshdir)
-   vis.lineplot.plot_ts(ts, lnrho=1, uutot=1, uux=1, ss=1)
+   vis.lineplot.plot_ts(ts, show_all=True)