From 06afc729f9061c1cfa14c78728d61d518324c2f0 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 04 May 2022 05:46:43 +0000
Subject: [PATCH] Moved all global variables to separate file and defined extern keyword where appropriate
---
src/initial_distribution.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/initial_distribution.c b/src/initial_distribution.c
index 59bf808..756fdae 100644
--- a/src/initial_distribution.c
+++ b/src/initial_distribution.c
@@ -43,6 +43,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 +61,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);
@@ -101,7 +103,8 @@
vesicle->clist->ncmax[0]=tape->ncxmax;
vesicle->clist->ncmax[1]=tape->ncymax;
vesicle->clist->ncmax[2]=tape->nczmax;
- vesicle->clist->max_occupancy=16; /* hard coded max occupancy? */
+//THIS IS NOW HARDCODED IN CELL.C
+// vesicle->clist->max_occupancy=16; /* hard coded max occupancy? */
vesicle->pressure= tape->pressure;
vesicle->pswitch=tape->pswitch;
@@ -112,7 +115,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;
}
@@ -134,6 +137,7 @@
continue;
}
vesicle->vlist->vtx[rndvtx]->c=tape->c0;
+ vesicle->vlist->vtx[rndvtx]->direct_interaction_force=tape->F;
}
mean_curvature_and_energy(vesicle);
if(fabs(tape->w)>1e-16){ //if nonzero energy
--
Gitblit v1.9.3