From a3f6b73f3f829a7abf3faa0e5e96d95200179529 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sun, 15 May 2016 19:20:59 +0000
Subject: [PATCH] Added function that finds trisurf version from its executable output string. It can be used for outputting info
---
python/trisurf/trisurf.py | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/python/trisurf/trisurf.py b/python/trisurf/trisurf.py
index 6a9f0ee..c70630a 100644
--- a/python/trisurf/trisurf.py
+++ b/python/trisurf/trisurf.py
@@ -352,7 +352,7 @@
else:
try:
with open (os.path.join(self.Dir.fullpath(),"tape"), "w") as myfile:
- myfile.write("#This is automatically generated tape file from snapshot\n")
+ myfile.write("#This is automatically generated tape file from snapshot")
myfile.write(str(self.tape))
except:
print("Error -- cannot make tapefile "+ os.path.join(self.Dir.fullpath(),"tape")+" from the snapshot in the running directory")
@@ -364,12 +364,12 @@
#check if the simulation has been completed. in this case notify user and stop executing.
if(self.isCompleted() and ("--force-from-tape" not in self.runArgs) and ("--reset-iteration-count" not in self.runArgs)):
- print("The simulation was completed. Not starting executable at localhost in "+self.Dir.fullpath()+"\n")
+ print("The simulation was completed. Not starting executable in "+self.Dir.fullpath())
return
cwd=Directory(maindir=os.getcwd())
self.Dir.goto()
- print("Starting trisurf-ng executable at localhost in "+self.Dir.fullpath()+"\n")
+ print("Starting trisurf-ng executable in "+self.Dir.fullpath())
if(self.fromSnapshot==True):
params=["trisurf", "--restore-from-vtk",self.snapshotFile]+self.runArgs
else:
@@ -380,7 +380,7 @@
subprocess.Popen (params, stdout=subprocess.DEVNULL)
cwd.goto()
else:
- print("Process already running. Not starting\n")
+ print("Process in "+self.Dir.fullpath()+" already running. Not starting.")
return
def stop(self):
@@ -407,7 +407,8 @@
self.Comment=FileContent(os.path.join(self.Dir.fullpath(),".comment"))
pid=self.getPID()
status=self.getStatus()
- ETA=str(datetime.timedelta(microseconds=(int(self.tape.config['iterations'])-int(self.statistics.last))*self.statistics.dT)*1000000)
+ if(self.statistics.fileOK):
+ ETA=str(datetime.timedelta(microseconds=(int(self.tape.config['iterations'])-int(self.statistics.last))*self.statistics.dT)*1000000)
if(status==TS_NONEXISTANT or status==TS_NOLOCK):
statustxt="Not running"
pid=""
@@ -425,7 +426,7 @@
if(self.statistics.fileOK):
report=[time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(int(self.statistics.startDate))),ETA, statustxt, pid, str(self.Dir.fullpath()), self.Comment.getText()]
else:
- report=["N/A","N/A\t",statustxt, pid, str(self.Dir.fullpath()), self.Comment.getText()]
+ report=["N/A","N/A",statustxt, pid, str(self.Dir.fullpath()), self.Comment.getText()]
return report
def writeComment(self, data, mode='w'):
--
Gitblit v1.9.3