From eb95833ea5316a0dcfff4e5144e6fd7bbbd261f2 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 21 Jun 2016 12:49:09 +0000
Subject: [PATCH] Fix in number of spontaneous curvature vertices calculation
---
src/vertexmove.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/vertexmove.c b/src/vertexmove.c
index 5a51c10..0b6f50a 100644
--- a/src/vertexmove.c
+++ b/src/vertexmove.c
@@ -72,21 +72,23 @@
// TODO: Maybe faster if checks only nucleus-neighboring cells
// Nucleus penetration check:
-#define SQ(x) x*x
+//#define SQ(x) x*x
if(vesicle->R_nucleus>0.0){
- if (SQ(vtx->x-vesicle->nucleus_center[0])+ SQ(vtx->y-vesicle->nucleus_center[1]) + SQ(vtx->z-vesicle->nucleus_center[2]) < vesicle->R_nucleus){
+ if ((vtx->x-vesicle->nucleus_center[0])*(vtx->x-vesicle->nucleus_center[0])+ (vtx->y-vesicle->nucleus_center[1])*(vtx->y-vesicle->nucleus_center[1]) + (vtx->z-vesicle->nucleus_center[2])*(vtx->z-vesicle->nucleus_center[2]) < 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 (SQ(vtx->x-vesicle->nucleus_center[0])/vesicle->R_nucleusX + SQ(vtx->y-vesicle->nucleus_center[1])/vesicle->R_nucleusY + SQ(vtx->z-vesicle->nucleus_center[2])/vesicle->R_nucleusZ < 1.0){
+// if (SQ(vtx->x-vesicle->nucleus_center[0])/vesicle->R_nucleusX + SQ(vtx->y-vesicle->nucleus_center[1])/vesicle->R_nucleusY + SQ(vtx->z-vesicle->nucleus_center[2])/vesicle->R_nucleusZ < 1.0){
+ if ((vtx->x-vesicle->nucleus_center[0])*(vtx->x-vesicle->nucleus_center[0])/vesicle->R_nucleusX + (vtx->y-vesicle->nucleus_center[1])*(vtx->y-vesicle->nucleus_center[1])/vesicle->R_nucleusY + (vtx->z-vesicle->nucleus_center[2])*(vtx->z-vesicle->nucleus_center[2])/vesicle->R_nucleusZ < 1.0){
+// if (SQ(vtx->x)/vesicle->R_nucleusX + SQ(vtx->y)/vesicle->R_nucleusY + SQ(vtx->z)/vesicle->R_nucleusZ < 1.0){
vtx=memcpy((void *)vtx,(void *)&backupvtx[0],sizeof(ts_vertex));
return TS_FAIL;
}
}
-#undef SQ
+//#undef SQ
//self avoidance check with distant vertices
cellidx=vertex_self_avoidance(vesicle, vtx);
//check occupation number
@@ -196,6 +198,7 @@
*/
// fprintf(stderr, "DE=%f\n",delta_energy);
//MONTE CARLOOOOOOOO
+// if(vtx->c!=0.0) printf("DE=%f\n",delta_energy);
if(delta_energy>=0){
#ifdef TS_DOUBLE_DOUBLE
if(exp(-delta_energy)< drand48())
--
Gitblit v1.9.3