From d5ddc0a56d9f52f27fb6edcc2fa1caf66fdb9eb0 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 15 Aug 2019 06:05:39 +0000
Subject: [PATCH] Fixed argtypes in wrapper
---
trisurf/trisurf.py | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/trisurf/trisurf.py b/trisurf/trisurf.py
index 6eae40a..b80ba9d 100644
--- a/trisurf/trisurf.py
+++ b/trisurf/trisurf.py
@@ -20,6 +20,9 @@
TS_RUNNING=2 # process is running
TS_COMPLETED=3 #simulation is completed
+#namespace variable. Seems the best place to put the variable in :)
+_analysis_list={}
+
class FileContent:
'''
Class is helpful for reading and writting the specific files.
@@ -280,7 +283,7 @@
table[key]=[]
for line in lines:
fields=line.split()
- for i in range(0,len(keys)-1):
+ for i in range(0,len(keys)):
try:
value=num(fields[i])
table[keys[i]].append(value)
@@ -462,12 +465,7 @@
def setMaindir(self,prefix,variables):
maindir=""
for p,v in zip(prefix,variables):
- if(v=="xk0"):
- tv=str(round(float(self.Tape.config[v])))
- if sys.version_info<(3,0):
- tv=str(int(float(self.Tape.config[v])))
- else:
- tv=self.Tape.config[v]
+ tv=str(self.Tape.config[v])
maindir=maindir+p+tv
self.maindir=maindir
return
@@ -516,13 +514,24 @@
self.Comment.writefile(data,mode=mode)
- def getLastVTU(self):
+ def getLastVTUold(self):
vtuidx=self.getLastIteration()-int(self.Tape.getValue("inititer"))
if vtuidx<0:
return None
else:
return 'timestep_{:06d}.vtu'.format(vtuidx)
+ def getLastVTU(self):
+ flist=[]
+ for file in os.listdir(self.Dir.fullpath()):
+ if file.endswith(".vtu"):
+ flist.append(file)
+ flist.sort()
+ if(len(flist)==0):
+ return(-1)
+ else:
+ return(flist[-1])
+
def __str__(self):
if(self.getStatus()==0):
str=" not running."
--
Gitblit v1.9.3