From 555fd8b3ff5c121d9faff1000d664fc653c912bf Mon Sep 17 00:00:00 2001
From: mihaf <miha.fosnaric@gmail.com>
Date: Wed, 02 Apr 2014 09:43:19 +0000
Subject: [PATCH] In cell.c changed comparison between vertices in a cell from idx to pointer (to avoid bug that two distinct vertices with same idx are not checked for proximity).

---
 src/initial_distribution.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/initial_distribution.c b/src/initial_distribution.c
index a93e2ee..0587d18 100644
--- a/src/initial_distribution.c
+++ b/src/initial_distribution.c
@@ -41,7 +41,9 @@
 
 	vesicle=initial_distribution_dipyramid(tape->nshell,tape->ncxmax,tape->ncymax,tape->nczmax,tape->stepsize);
 	// Nucleus:
-	vesicle->R_nucleus=tape->R_nucleus;
+	vesicle->R_nucleus=tape->R_nucleus*tape->R_nucleus;
+
+	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);
@@ -79,7 +81,6 @@
 	
 	vesicle->nshell=tape->nshell;
 	vesicle->dmax=tape->dmax*tape->dmax; /* dmax^2 in the vesicle dmax variable */
-	vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies;
 	vesicle->bending_rigidity=tape->xk0;
 	vtx_set_global_values(vesicle); /* make xk0 default value for every vertex */ 
 	ts_fprintf(stdout, "Tape setting: xk0=%e\n",tape->xk0);

--
Gitblit v1.9.3