From 02d65c3c9baa0e76744ce001c55ec699ab3b956f Mon Sep 17 00:00:00 2001
From: Miha Fošnarič <miha.fosnaric@fe.uni-lj.si>
Date: Mon, 11 Jul 2016 13:09:15 +0000
Subject: [PATCH] A fix in energy.c. Normals are summed now.
---
src/initial_distribution.c | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/initial_distribution.c b/src/initial_distribution.c
index 0f04e5f..dbdd0c4 100644
--- a/src/initial_distribution.c
+++ b/src/initial_distribution.c
@@ -44,6 +44,7 @@
vesicle=initial_distribution_dipyramid(tape->nshell,tape->ncxmax,tape->ncymax,tape->nczmax,tape->stepsize);
vesicle->tape=tape;
set_vesicle_values_from_tape(vesicle);
+ initial_population_with_c0(vesicle,tape);
return vesicle;
}
@@ -111,11 +112,27 @@
vesicle->sphHarmonics=NULL;
}
- int rndvtx;
+
+ return TS_SUCCESS;
+
+}
+
+
+ts_bool initial_population_with_c0(ts_vesicle *vesicle, ts_tape *tape){
+ int rndvtx,i,j;
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);
@@ -124,13 +141,8 @@
sweep_attraction_bond_energy(vesicle);
}
}
-
- return TS_SUCCESS;
-
+ return TS_SUCCESS;
}
-
-
-
ts_bool pentagonal_dipyramid_vertex_distribution(ts_vertex_list *vlist){
--
Gitblit v1.9.3