From 6815ffe6b95fed4fcb813936064d819410d33114 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 13 Aug 2019 08:07:17 +0000
Subject: [PATCH] Merge conflicts fixed
---
trisurf/analyses.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/trisurf/analyses.py b/trisurf/analyses.py
index 1569eb9..ae4dce7 100644
--- a/trisurf/analyses.py
+++ b/trisurf/analyses.py
@@ -31,7 +31,7 @@
# can be wrapped to specify scalar_field)
@analysis('plotrunningavginteractive')
-def plotrunningavginteractive(run, scalar_field='vertices_idx', **kwargs):
+def plotrunningavginteractive(run, scalar_field='hbar', ylabel="1/n sum_i=niter^n(hbar_i)", **kwargs):
import matplotlib.pyplot as plt
from trisurf import VTKRendering as vtk
import math
@@ -47,11 +47,11 @@
vtk.Renderer(kwargs.get('args', None),kwargs.get('host',None),run, timestep=n,scalar_field=scalar_field)
fig=plt.figure(1)
- ra=running_avg(table['hbar'])
- l=len(table['hbar'])
+ ra=running_avg(table[scalar_field])
+ l=len(table[scalar_field])
plt.plot(ra)
plt.title('Running average')
- plt.ylabel('1/n sum_i=niter^n(hbar_i)')
+ plt.ylabel(ylabel)
plt.xlabel('n')
def onclick(event):
#print('button=%d, x=%d, y=%d, xdata=%f, ydata=%f' % (event.button, event.x, event.y, event.xdata, event.ydata))
--
Gitblit v1.9.3