From bfa6c4d2d234dac214ae05855669844255a32979 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sun, 03 Jul 2016 20:46:31 +0000
Subject: [PATCH] Merge branch 'paraview'. This enables view of triangles in paraview.

---
 python/trisurf/trisurf.py |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/python/trisurf/trisurf.py b/python/trisurf/trisurf.py
index 3a1689e..57d300d 100644
--- a/python/trisurf/trisurf.py
+++ b/python/trisurf/trisurf.py
@@ -236,10 +236,10 @@
 		try:
 			self.dT=int(epoch2)-int(epoch1)
 			self.last=n2
-			print(epoch1)
-			print(epoch2)
-			print(self.dT)
-			print(self.last)
+			#print(epoch1)
+			#print(epoch2)
+			#print(self.dT)
+			#print(self.last)
 			self.startDate=os.path.getmtime(os.path.join(self.path,'.lock'))
 		except:
 			return(False)
@@ -350,7 +350,7 @@
 		return int(status)
 
 	def isCompleted(self):
-		if (int(self.tape.getValue("iterations"))==self.getLastIteration()+1):
+		if int(self.tape.getValue("iterations"))+int(self.tape.getValue("inititer"))==self.getLastIteration()+1:
 			return True
 		else:
 			return False
@@ -493,7 +493,7 @@
 
 
 	def getLastVTU(self):
-		vtuidx=self.getLastIteration()
+		vtuidx=self.getLastIteration()-int(self.tape.getValue("inititer"))+1
 		if vtuidx<0:
 			return None
 		else:

--
Gitblit v1.9.3