From 2f74e41cf5706334fcde64ae0e86a33c4fef884f Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 28 May 2016 21:13:20 +0000
Subject: [PATCH] A small fix. If a continuation of simulation with a starting snapshot is requested, the last known vtk from the directory is used as a snapshot.
---
python/myTestConfig.py | 2 ++
python/trisurf/trisurf.py | 18 +++++++++++++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/python/myTestConfig.py b/python/myTestConfig.py
index e259078..b8e5c08 100755
--- a/python/myTestConfig.py
+++ b/python/myTestConfig.py
@@ -11,6 +11,8 @@
run1.setMaindir(("N","k","V","Np","Nm"),("nshell","xk0","constvolswitch","npoly","nmono"))
run1.setSubdir("run0")
+print(run1.getLastVTU())
+
#Example how to start simulation from tape. Extra argument in runArgs will be passed to trisurf executable (meaning that simulation will always start from the beginning (bipyramid) ignoring the fact that some states may have been calculated already)
run2=trisurf.Runner(tape='tape', runArgs=['--force-from-tape'])
run2.setMaindir(("N","k","V","Np","Nm"),("nshell","xk0","constvolswitch","npoly","nmono"))
diff --git a/python/trisurf/trisurf.py b/python/trisurf/trisurf.py
index 8b36d27..46a3624 100644
--- a/python/trisurf/trisurf.py
+++ b/python/trisurf/trisurf.py
@@ -382,10 +382,18 @@
return
cwd=Directory(maindir=os.getcwd())
+ lastVTU=self.getLastVTU() #we get last VTU file in case we need to continue the simulation from last snapshot. Need to be done before the Dir.goto() call.
self.Dir.goto()
print("Starting trisurf-ng executable in "+self.Dir.fullpath())
if(self.fromSnapshot==True):
- params=["trisurf", "--restore-from-vtk","initial_snapshot.vtu"]+self.runArgs
+ #here we try to determine whether we should continue the simulation or start from last known VTU snapshot.
+ if(lastVTU==None):
+ initSnap="initial_snapshot.vtu"
+ else:
+ initSnap=lastVTU
+ print("WARNING: Not using initial snapshot as starting point, but selecting "+initSnap+" as a starting vesicle")
+ params=["trisurf", "--restore-from-vtk",initSnap]+self.runArgs
+ print("InitSnap is: "+initSnap)
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):
@@ -451,6 +459,14 @@
self.Comment=FileContent(os.path.join(self.Dir.fullpath(),".comment"))
self.Comment.writefile(data,mode=mode)
+
+ def getLastVTU(self):
+ vtuidx=self.getLastIteration()
+ if vtuidx<0:
+ return None
+ else:
+ return 'timestep_{:06d}.vtu'.format(vtuidx)
+
def __str__(self):
if(self.getStatus()==0):
str=" not running."
--
Gitblit v1.9.3