From cc95bd1ca5e69ce13766ca0acea11560531ed620 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 24 May 2016 08:01:55 +0000
Subject: [PATCH] From snapshots, raw tape configuration is extracted and written into tape file and not the rendered one
---
python/trisurf/trisurf.py | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/python/trisurf/trisurf.py b/python/trisurf/trisurf.py
index c70630a..bed6f7d 100644
--- a/python/trisurf/trisurf.py
+++ b/python/trisurf/trisurf.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python3
-
import configobj
import xml.etree.ElementTree as ET
import base64
@@ -84,6 +82,9 @@
'''
try:
self.config=configobj.ConfigObj(tape)
+ with open (tape, "r") as myfile:
+ self.rawText=myfile.read() #read the file
+
except:
print("Error reading or parsing tape file!\n")
exit(1)
@@ -91,6 +92,7 @@
def setTape(self, string):
'''Method setTape(string) parses the string in memory that hold the tape contents.'''
self.config=configobj.ConfigObj(io.StringIO(string))
+ self.rawText=string
return
def getValue(self,key):
@@ -199,13 +201,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.
@@ -287,7 +294,7 @@
version=root.find('trisurfversion')
self.tape=Tape()
self.tape.setTape(tapetxt.text)
-
+
def getPID(self):
self.Dir=Directory(maindir=self.maindir,simdir=self.subdir)
#self.Dir.makeifnotexist()
@@ -324,8 +331,15 @@
return TS_NOLOCK
if(psutil.pid_exists(int(pid))):
proc= psutil.Process(int(pid))
- if proc.name=="trisurf":
- if proc.status=="stopped":
+ #psutil.__version__ == '3.4.2' requires name() and status(), some older versions reguire name, status
+ if(psutil.__version__>='2.0.0'):
+ procname=proc.name()
+ procstat=proc.status()
+ else:
+ procname=proc.name
+ procstat=proc.status
+ if procname=="trisurf":
+ if procstat=="stopped":
return TS_STOPPED
else:
return TS_RUNNING
@@ -352,13 +366,13 @@
else:
try:
with open (os.path.join(self.Dir.fullpath(),"tape"), "w") as myfile:
- myfile.write("#This is automatically generated tape file from snapshot")
- myfile.write(str(self.tape))
+ #myfile.write("#This is automatically generated tape file from snapshot")
+ myfile.write(str(self.tape.rawText))
except:
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))
@@ -371,7 +385,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