From c854bf8109ddce134fc0e6fc5c27e7e648bc7734 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 19 May 2018 17:16:50 +0000
Subject: [PATCH] Merge branch 'stretching-devel' of ssh://git.penic.eu:29418/trisurf-ng into stretching-devel
---
src/initial_distribution.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/initial_distribution.c b/src/initial_distribution.c
index dbdd0c4..93c7338 100644
--- a/src/initial_distribution.c
+++ b/src/initial_distribution.c
@@ -101,7 +101,7 @@
vesicle->clist->ncmax[0]=tape->ncxmax;
vesicle->clist->ncmax[1]=tape->ncymax;
vesicle->clist->ncmax[2]=tape->nczmax;
- vesicle->clist->max_occupancy=8; /* hard coded max occupancy? */
+ vesicle->clist->max_occupancy=16; /* hard coded max occupancy? */
vesicle->pressure= tape->pressure;
vesicle->pswitch=tape->pswitch;
@@ -112,7 +112,7 @@
vesicle->sphHarmonics=NULL;
}
-
+ vesicle->tlist->a0=sqrt(3)/2*pow((vesicle->tape->dmax+1.0)/2.0,2);
return TS_SUCCESS;
}
@@ -121,7 +121,7 @@
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");
+// 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;
@@ -137,7 +137,7 @@
}
mean_curvature_and_energy(vesicle);
if(fabs(tape->w)>1e-16){ //if nonzero energy
- ts_fprintf(stderr,"Setting attraction between vertices with spontaneous curvature\n");
+// ts_fprintf(stderr,"Setting attraction between vertices with spontaneous curvature\n");
sweep_attraction_bond_energy(vesicle);
}
}
--
Gitblit v1.9.3