From 8a66144c9118f8df80eba28c5b363fac574194da Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 08 Mar 2014 18:25:18 +0000
Subject: [PATCH] Parsing command line arguments is still kind-of messy, but it workds for force-from-tape and reset-iteration-count
---
src/timestep.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/timestep.c b/src/timestep.c
index 8ae5a30..92a4a25 100644
--- a/src/timestep.c
+++ b/src/timestep.c
@@ -9,20 +9,20 @@
#include "frame.h"
#include "io.h"
-ts_bool run_simulation(ts_vesicle *vesicle, ts_uint mcsweeps, ts_uint inititer, ts_uint iterations){
+ts_bool run_simulation(ts_vesicle *vesicle, ts_uint mcsweeps, ts_uint inititer, ts_uint iterations, ts_uint start_iteration){
ts_uint i, j;
centermass(vesicle);
cell_occupation(vesicle);
- ts_fprintf(stdout, "Starting simulation (first %d x %d MC sweeps will not be recorded on disk)\n", inititer, mcsweeps);
- for(i=0;i<inititer+iterations;i++){
+ if(start_iteration<inititer) ts_fprintf(stdout, "Starting simulation (first %d x %d MC sweeps will not be recorded on disk)\n", inititer, mcsweeps);
+ for(i=start_iteration;i<inititer+iterations;i++){
for(j=0;j<mcsweeps;j++){
single_timestep(vesicle);
}
centermass(vesicle);
cell_occupation(vesicle);
ts_fprintf(stdout,"Done %d out of %d iterations (x %d MC sweeps).\n",i+1,inititer+iterations,mcsweeps);
- dump_state(vesicle);
+ dump_state(vesicle,i);
if(i>inititer){
write_vertex_xml_file(vesicle,i-inititer);
}
--
Gitblit v1.9.3