From 1d1f5861495fc6e07d8a683ca8dbbaa43936b212 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:43:15 +0000
Subject: [PATCH] Fixes conflicts after merge
---
python/tsmgr | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/python/tsmgr b/python/tsmgr
index 52e3fdc..775d667 100755
--- a/python/tsmgr
+++ b/python/tsmgr
@@ -1,6 +1,7 @@
#!/usr/bin/python3
import sys, getopt
from trisurf import trisurf
+import tabulate
# -- configuration of the multiple/single run --
@@ -8,36 +9,68 @@
run1.setMaindir(("N","k","V","Np","Nm"),("nshell","xk0","constvolswitch","npoly","nmono"))
run1.setSubdir("run0")
-run2=trisurf.Runner(snapshot='snapshot.vtu')
+run2=trisurf.Runner(tape='tape', runArgs=['--force-from-tape'])
run2.setMaindir(("N","k","V","Np","Nm"),("nshell","xk0","constvolswitch","npoly","nmono"))
run2.setSubdir("run1")
#obligatory: combine all runs
-Runs=[run1,run2];
+Runs=[run1,run2]
+
+
+
+#------------------ NO NEED TO TOUCH THE CODE BELOW ------------------------------
# -- reading command line switches and acting accordingly --
-argv=sys.argv[1:];
+argv=sys.argv[1:]
+processno=0
try:
- opts, args = getopt.getopt(argv,"hrs")
+ opts, args = getopt.getopt(argv,"a:n:hrsc:")
except getopt.GetoptError:
- print('tsmgr [-h] [-r] [-s]')
+ print('tsmgr [-n process number] [-h] [-r] [-s] [-c comment text] [-a comment text]')
sys.exit(2)
for opt, arg in opts:
if opt == '-h':
- print ('tsmgr [-h] [-r] [-s]')
+ print ('tsmgr [-n process number] [-h] [-r] [-s] [-c comment text] [-a comment text]')
sys.exit()
elif opt == '-r':
- for run in Runs:
+ if processno:
+ localRuns=[Runs[processno-1]]
+ else:
+ localRuns=Runs
+ for run in localRuns:
run.start()
elif opt == '-s':
- for run in Runs:
- reportstr=run.getStatistics()
- print(reportstr)
- #print(run)
- #print(run.statistics)
+ report=[]
+ i=1
+ if processno:
+ localRuns=[Runs[processno-1]]
+ else:
+ localRuns=Runs
+ for run in localRuns:
+ line=run.getStatistics()
+ line.insert(0,i)
+ report.append(line)
+ i=i+1
+ #print(reportstr)
+ print ("\n\nTrisurf running processes report\n")
+ print (tabulate.tabulate(report,headers=["Run no.", "Run start time", "ETA", "Status", "PID", "Path", "Comment"], tablefmt='fancy_grid'))
+ elif opt == '-n':
+ processno=int(arg)
+ if processno<1 or processno>len(Runs) :
+ processno=0
+ elif opt == '-c':
+ comment = arg
+ if processno:
+ Runs[processno-1].writeComment(arg)
+ elif opt == '-a':
+ comment = arg
+ if processno:
+ Runs[processno-1].writeComment("\n"+arg, 'a')
+
+
else:
- print('tsmgr [-h] [-r] [-s]')
+ print('tsmgr [-n process number] [-h] [-r] [-s] [-c comment text] [-a comment text]')
sys.exit(2)
--
Gitblit v1.9.3