From d6583ebf40c9e99bfbec3652f8ef8639160f5fb6 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Thu, 07 Jul 2016 14:40:36 +0000
Subject: [PATCH] Another fix. still not working if we have inititer.
---
python/trisurf/trisurf.py | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/python/trisurf/trisurf.py b/python/trisurf/trisurf.py
index 3a1689e..8e60d69 100644
--- a/python/trisurf/trisurf.py
+++ b/python/trisurf/trisurf.py
@@ -2,7 +2,7 @@
import xml.etree.ElementTree as ET
import base64
import zlib
-import io
+import sys,io
import os
from itertools import islice
import mmap
@@ -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
@@ -443,6 +443,8 @@
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]
maindir=maindir+p+tv
@@ -493,7 +495,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