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
---
networkedExample.py | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/networkedExample.py b/networkedExample.py
index 1464aff..3e958bb 100755
--- a/networkedExample.py
+++ b/networkedExample.py
@@ -2,7 +2,7 @@
from trisurf import trisurf
from trisurf import tsmgr
-from trisurf import analyses
+from trisurf.analyses import analysis
#Ok... Configure your keys:
@@ -22,6 +22,7 @@
Runs=[run2, run3]
#this is how analyses are defined
+@analysis('analyze')
def analyze(run, **kwargs):
host=kwargs.get('host', None)
print("Demo analysis")
@@ -40,8 +41,11 @@
print("\n\nStatistics file:")
print(run.Statistics.readText())
-hosts=({'name':'natalie','address':'kabinet.penic.eu', 'runs':Runs, 'username':'samo', 'remotebasepath':'simulations-test/subdir/subdir'},
- {'name':'Hestia','address':'127.0.0.1', 'runs':Runs, 'username':'samo'})
-analyses={'analysis1':analyze,'webReport':testWebAnalysis,'runningavg':analyses.plotrunningavginteractive}
+hosts=({'name':'altea','address':'localhost', 'runs':Runs, 'username':'samo', 'remotebasepath':'simulations-test/subdir/subdir'},)
+#hosts=({'name':'natalie','address':'kabinet.penic.eu', 'runs':Runs, 'username':'samo', 'remotebasepath':'simulations-test/subdir/subdir'},
+# {'name':'Hestia','address':'127.0.0.1', 'runs':Runs, 'username':'samo'})
+#analyses={'analysis1':analyze,'webReport':testWebAnalysis,'runningavg':analyses.plotrunningavginteractive}
-tsmgr.start(hosts, analyses=analyses)
+
+print(trisurf._analysis_list)
+tsmgr.start(hosts)
--
Gitblit v1.9.3