From d760b693a69b35626c749107634c498ea77485a6 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo@altea>
Date: Wed, 18 May 2016 16:30:17 +0000
Subject: [PATCH] A fix in free in tsmeasure.
---
python/trisurf/trisurf.py | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/python/trisurf/trisurf.py b/python/trisurf/trisurf.py
index ce23b5f..310b4d3 100644
--- a/python/trisurf/trisurf.py
+++ b/python/trisurf/trisurf.py
@@ -199,13 +199,18 @@
Internal method for determining the number of the lines in the most efficient way. Is it really the most efficient?
'''
f = open(self.fullname, "r+")
- buf = mmap.mmap(f.fileno(), 0)
- lines = 0
- readline = buf.readline
- while readline():
- lines += 1
+ try:
+ buf = mmap.mmap(f.fileno(), 0)
+ lines = 0
+ readline = buf.readline
+ while readline():
+ lines += 1
+ f.close()
+ except:
+ lines=0
+ f.close()
return lines
-
+
def read(self):
'''
Method read() reads the statistics if it exists. It sets local variable dT storing the time differential between two intervals of simulation (outer loops). It also stores last simulation loop and the start of the run.
@@ -365,7 +370,7 @@
print("Error -- cannot make tapefile "+ os.path.join(self.Dir.fullpath(),"tape")+" from the snapshot in the running directory")
exit(1)
try:
- os.symlink(os.path.abspath(self.snapshotFile), os.path.join(self.Dir.fullpath(),self.snapshotFile))
+ os.symlink(os.path.abspath(self.snapshotFile), os.path.join(self.Dir.fullpath(),"initial_snapshot.vtu"))
except:
print("Error while symlinking "+os.path.abspath(self.snapshotFile)+" to "+os.path.join(self.Dir.fullpath(),self.snapshotFile))
@@ -378,7 +383,7 @@
self.Dir.goto()
print("Starting trisurf-ng executable in "+self.Dir.fullpath())
if(self.fromSnapshot==True):
- params=["trisurf", "--restore-from-vtk",self.snapshotFile]+self.runArgs
+ params=["trisurf", "--restore-from-vtk","initial_snapshot.vtu"]+self.runArgs
else:
#veify if dump exists. If not it is a first run and shoud be run with --force-from-tape
if(os.path.isfile("dump.bin")==False):
--
Gitblit v1.9.3