From a18ed8730a0bf9cf49db1869bb82b274969adebe Mon Sep 17 00:00:00 2001
From: Miha <mihaf@hapi.(none)>
Date: Wed, 12 Feb 2014 15:11:31 +0000
Subject: [PATCH] Bug if(cell_occupation>1) in cell.c found and removed! Hura!!!!
---
src/timestep.c | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/timestep.c b/src/timestep.c
index 4c9fa67..0ce9372 100644
--- a/src/timestep.c
+++ b/src/timestep.c
@@ -8,6 +8,7 @@
#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_uint i, j;
@@ -30,7 +31,7 @@
ts_bool single_timestep(ts_vesicle *vesicle){
ts_bool retval;
ts_double rnvec[3];
- ts_uint i;
+ ts_uint i,j,b;
for(i=0;i<vesicle->vlist->n;i++){
rnvec[0]=drand48();
rnvec[1]=drand48();
@@ -39,16 +40,30 @@
}
// ts_int cnt=0;
- for(i=0;i<vesicle->blist->n;i++){
- rnvec[0]=drand48();
+ for(i=0;i<3*vesicle->vlist->n;i++){
+//why is rnvec needed in bondflip?
+/* rnvec[0]=drand48();
rnvec[1]=drand48();
rnvec[2]=drand48();
+*/
+ b=rand() % vesicle->blist->n;
//find a bond and return a pointer to a bond...
//call single_bondflip_timestep...
- retval=single_bondflip_timestep(vesicle,vesicle->blist->bond[i],rnvec);
+ 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