From 37051dffc0ddad769ae0390acd513a8433e88fee Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 20 May 2016 18:37:30 +0000
Subject: [PATCH] Removed neigh_test.c
---
src/vertexmove.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/vertexmove.c b/src/vertexmove.c
index c552a87..4caa86f 100644
--- a/src/vertexmove.c
+++ b/src/vertexmove.c
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
#include<stdlib.h>
#include<math.h>
#include "general.h"
@@ -71,10 +72,19 @@
// TODO: Maybe faster if checks only nucleus-neighboring cells
// Nucleus penetration check:
+if(vesicle->R_nucleus>0.0){
if (vtx->x*vtx->x + vtx->y*vtx->y + vtx->z*vtx->z < vesicle->R_nucleus){
vtx=memcpy((void *)vtx,(void *)&backupvtx[0],sizeof(ts_vertex));
return TS_FAIL;
}
+} else if(vesicle->R_nucleusX>0.0){
+// fprintf(stderr,"DEBUG, (Rx, Ry,Rz)^2=(%f,%f,%f)\n",vesicle->R_nucleusX, vesicle->R_nucleusY, vesicle->R_nucleusZ);
+ if ((vtx->x*vtx->x)/vesicle->R_nucleusX + vtx->y*vtx->y/vesicle->R_nucleusY + (vtx->z*vtx->z)/vesicle->R_nucleusZ < 1.0){
+ vtx=memcpy((void *)vtx,(void *)&backupvtx[0],sizeof(ts_vertex));
+ return TS_FAIL;
+ }
+
+}
//self avoidance check with distant vertices
cellidx=vertex_self_avoidance(vesicle, vtx);
--
Gitblit v1.9.3