From 200815edf1548d444aa3b5db908a1628adeb2a05 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Tue, 05 Nov 2013 17:53:51 +0000 Subject: [PATCH] Vertex tainting done --- src/timestep.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/timestep.c b/src/timestep.c index 9e5e61c..1ac1eb4 100644 --- a/src/timestep.c +++ b/src/timestep.c @@ -7,6 +7,7 @@ #include "vertexmove.h" #include "bondflip.h" #include "frame.h" +#include "vertex.h" #include "io.h" ts_bool run_simulation(ts_vesicle *vesicle, ts_uint mcsweeps, ts_uint inititer, ts_uint iterations){ ts_uint i, j; @@ -35,7 +36,15 @@ rnvec[0]=drand48(); rnvec[1]=drand48(); rnvec[2]=drand48(); + vertex_taint(vesicle->vlist->vtx[i],1); +// ts_fprintf(stdout, "Vertex %d should be tainted, level=%d.\n", i, vesicle->vlist->vtx[i]->locked); + if(vertex_tainted(vesicle->vlist->vtx[i],1,1)){ + ts_fprintf(stdout, "Vertex %d tainted, level=%d. Waiting....\n", i, vesicle->vlist->vtx[i]->locked); + while(vertex_tainted(vesicle->vlist->vtx[i],1,1)); + } retval=single_verticle_timestep(vesicle,vesicle->vlist->vtx[i],rnvec); + vertex_untaint(vesicle->vlist->vtx[i],1); +// ts_fprintf(stdout, "Vertex %d should be untainted, level=%d.\n", i, vesicle->vlist->vtx[i]->locked); } // ts_int cnt=0; -- Gitblit v1.9.3