From 5eefcc281fda031d322599fd7094da4fc8450948 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 25 Sep 2018 13:55:53 +0000
Subject: [PATCH] Debugged
---
src/vertexmove.c | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/vertexmove.c b/src/vertexmove.c
index 2517f69..d2bac09 100644
--- a/src/vertexmove.c
+++ b/src/vertexmove.c
@@ -99,7 +99,13 @@
return TS_FAIL;
}
-
+// plane confinement test
+ if(vesicle->tape->plane_confinement_switch){
+ if(vtx->z > vesicle->confinement_plane.z_max || vtx->z < vesicle->confinement_plane.z_min){
+ vtx=memcpy((void *)vtx,(void *)&backupvtx[0],sizeof(ts_vertex));
+ return TS_FAIL;
+ }
+ }
//if all the tests are successful, then energy for vtx and neighbours is calculated
for(i=0;i<vtx->neigh_no;i++){
memcpy((void *)&backupvtx[i+1],(void *)vtx->neigh[i],sizeof(ts_vertex));
@@ -201,6 +207,17 @@
// fprintf(stderr, "DE=%f\n",delta_energy);
//MONTE CARLOOOOOOOO
// if(vtx->c!=0.0) printf("DE=%f\n",delta_energy);
+// plane confinement
+ if(vesicle->tape->plane_confinement_switch){
+ //if planes are not close enough, then repusion force is on
+ if(vesicle->confinement_plane.z_max-vesicle->confinement_plane.z_min > vesicle->tape->plane_d){
+ //ts_fprintf(stderr,"force!!!\n");
+ delta_energy-=vesicle->tape->plane_F * ( 1.0/pow(backupvtx->z-vesicle->confinement_plane.z_min,2) + 1.0/pow(-backupvtx->z+vesicle->confinement_plane.z_max,2) );
+ delta_energy+=vesicle->tape->plane_F * ( 1.0/pow(vtx->z-vesicle->confinement_plane.z_min,2) + +1.0/pow(-vtx->z+vesicle->confinement_plane.z_max,2) );
+
+ }
+ }
+// end plane confinement
if(delta_energy>=0){
#ifdef TS_DOUBLE_DOUBLE
if(exp(-delta_energy)< drand48())
--
Gitblit v1.9.3