From dd4e182bc818974b3ad529422e631aa6a0764f2f Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 05 Jul 2016 10:18:24 +0000
Subject: [PATCH] Merge branch 'nirgov' of bitbucket.org:samop/trisurf-ng into nirgov
---
src/initial_distribution.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/initial_distribution.c b/src/initial_distribution.c
index d8e917f..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,7 +112,14 @@
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;
@@ -133,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