From 17fe35ccc428e18dd226e07d5517c4816ef6be44 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Mon, 19 Apr 2021 12:23:07 +0000 Subject: [PATCH] Work done previously --- src/initial_distribution.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/initial_distribution.c b/src/initial_distribution.c index 59bf808..bed8123 100644 --- a/src/initial_distribution.c +++ b/src/initial_distribution.c @@ -33,6 +33,10 @@ retval = mean_curvature_and_energy(vesicle); ts_fprintf(stdout,"initial_distribution finished!\n"); if(retval); +// ts_fprintf(stdout,"%e %e %e\n", vesicle->vlist->vtx[0]->x,vesicle->vlist->vtx[0]->y, vesicle->vlist->vtx[0]->z); +// for(int i=0;i<vesicle->vlist->vtx[0]->neigh_no; i++){ +// ts_fprintf(stdout,"%e %e %e\n", vesicle->vlist->vtx[0]->neigh[i]->x,vesicle->vlist->vtx[0]->neigh[i]->y, vesicle->vlist->vtx[0]->neigh[i]->z); +// } return vesicle; } @@ -43,6 +47,8 @@ vesicle=initial_distribution_dipyramid(tape->nshell,tape->ncxmax,tape->ncymax,tape->nczmax,tape->stepsize); vesicle->tape=tape; + vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies; + vesicle->poly_list=init_poly_list(tape->npoly,tape->nmono, vesicle->vlist, vesicle); set_vesicle_values_from_tape(vesicle); initial_population_with_c0(vesicle,tape); return vesicle; @@ -59,7 +65,7 @@ vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies; //Initialize grafted polymers (brush): - vesicle->poly_list=init_poly_list(tape->npoly,tape->nmono, vesicle->vlist, vesicle); + //vesicle->poly_list=init_poly_list(tape->npoly,tape->nmono, vesicle->vlist, vesicle); vesicle->spring_constant=tape->kspring; poly_assign_spring_const(vesicle); @@ -112,7 +118,7 @@ vesicle->sphHarmonics=NULL; } - vesicle->tlist->a0=sqrt(3)/2*pow((vesicle->tape->dmax+1.0),2); + vesicle->tlist->a0=sqrt(3)/4*pow((vesicle->tape->dmax+1.0)/2.0,2); return TS_SUCCESS; } -- Gitblit v1.9.3