From eb95833ea5316a0dcfff4e5144e6fd7bbbd261f2 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 21 Jun 2016 12:49:09 +0000
Subject: [PATCH] Fix in number of spontaneous curvature vertices calculation
---
src/tape | 2 +-
src/initial_distribution.c | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/initial_distribution.c b/src/initial_distribution.c
index 0f04e5f..d8e917f 100644
--- a/src/initial_distribution.c
+++ b/src/initial_distribution.c
@@ -114,8 +114,17 @@
int rndvtx;
if(tape->number_of_vertices_with_c0>0){
ts_fprintf(stderr,"Setting values for spontaneous curvature as defined in tape\n");
+ j=0;
for(i=0;i<tape->number_of_vertices_with_c0;i++){
rndvtx=rand() % vesicle->vlist->n;
+ if(fabs(vesicle->vlist->vtx[rndvtx]->c-tape->c0)<1e-15){
+ j++;
+ i--;
+ if(j>10*vesicle->vlist->n){
+ fatal("cannot populate vesicle with vertices with spontaneous curvature. Too many spontaneous curvature vertices?",100);
+ }
+ continue;
+ }
vesicle->vlist->vtx[rndvtx]->c=tape->c0;
}
mean_curvature_and_energy(vesicle);
diff --git a/src/tape b/src/tape
index 206d649..cb5662e 100644
--- a/src/tape
+++ b/src/tape
@@ -86,7 +86,7 @@
#NirGov branch only!
#number of vertices with spontaneous curvature (integer)
-number_of_vertices_with_c0=200
+number_of_vertices_with_c0=1447
#spontaneous curvature (float)
c0=2.0
#energy of attraction of vertices with spontaneous curvature
--
Gitblit v1.9.3