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 | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/networkedExample.py b/networkedExample.py
index 00bb8d9..3e958bb 100755
--- a/networkedExample.py
+++ b/networkedExample.py
@@ -2,7 +2,7 @@
from trisurf import trisurf
from trisurf import tsmgr
-
+from trisurf.analyses import analysis
#Ok... Configure your keys:
@@ -22,15 +22,30 @@
Runs=[run2, run3]
#this is how analyses are defined
+@analysis('analyze')
def analyze(run, **kwargs):
host=kwargs.get('host', None)
+ print("Demo analysis")
print("Analysis on host "+host['name']+" for run "+run.Dir.fullpath()+" completed")
+ print("here comes info on the run variable:")
+ print(run)
+ print("here comes info on the host variable:")
+ print(host)
+ print("here comes info on the hosts variable:")
+ print(kwargs.get('hosts',None))
+ print("here comes info on the args variable:")
+ print(kwargs.get('args',None))
+
+def testWebAnalysis(run, **kwargs):
+ print("Simulations are located in "+run.Dir.fullpath())
+ print("\n\nStatistics file:")
+ print(run.Statistics.readText())
+
+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}
-
-
-hosts=({'name':'natalie','address':'kabinet.penic.eu', 'runs':Runs, 'username':'samo'},
- {'name':'Hestia','address':'127.0.0.1', 'runs':Runs, 'username':'samo'})
-
-analyses={'analysis1':analyze,}
-tsmgr.start(hosts, analyses=analyses)
+print(trisurf._analysis_list)
+tsmgr.start(hosts)
--
Gitblit v1.9.3