From 80887d68d0c59d5704815e31ff07ac81bb947a7d Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 08 Mar 2014 18:44:41 +0000
Subject: [PATCH] small fix in reset-iteration-count
---
src/timestep.c | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/timestep.c b/src/timestep.c
index 9e5e61c..92a4a25 100644
--- a/src/timestep.c
+++ b/src/timestep.c
@@ -8,18 +8,21 @@
#include "bondflip.h"
#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,i);
if(i>inititer){
write_vertex_xml_file(vesicle,i-inititer);
}
@@ -30,7 +33,7 @@
ts_bool single_timestep(ts_vesicle *vesicle){
ts_bool retval;
ts_double rnvec[3];
- ts_uint i, b;
+ ts_uint i,j,b;
for(i=0;i<vesicle->vlist->n;i++){
rnvec[0]=drand48();
rnvec[1]=drand48();
@@ -39,7 +42,7 @@
}
// ts_int cnt=0;
- for(i=0;i<vesicle->vlist->n;i++){
+ for(i=0;i<3*vesicle->vlist->n;i++){
//why is rnvec needed in bondflip?
/* rnvec[0]=drand48();
rnvec[1]=drand48();
@@ -50,8 +53,19 @@
//call single_bondflip_timestep...
retval=single_bondflip_timestep(vesicle,vesicle->blist->bond[b],rnvec);
// if(retval==TS_SUCCESS) cnt++;
- }
-// printf("Bondflip success rate in one sweep: %d/%d=%e\n", cnt,vesicle->blist->n,(double)cnt/(double)vesicle->blist->n);
+ }
+
+ for(i=0;i<vesicle->poly_list->n;i++){
+ for(j=0;j<vesicle->poly_list->poly[i]->vlist->n;j++){
+ rnvec[0]=drand48();
+ rnvec[1]=drand48();
+ rnvec[2]=drand48();
+ retval=single_poly_vertex_move(vesicle,vesicle->poly_list->poly[i],vesicle->poly_list->poly[i]->vlist->vtx[j],rnvec);
+ }
+
+ }
+
+// printf("Bondflip success rate in one sweep: %d/%d=%e\n", cnt,3*vesicle->blist->n,(double)cnt/(double)vesicle->blist->n/3.0);
if(retval);
return TS_SUCCESS;
}
--
Gitblit v1.9.3