From 85898e259e6e2075a7f755583690024a63e9bb2b Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 08 Mar 2019 20:37:07 +0000
Subject: [PATCH] Plane confinement plugin almost done :)
---
src/vertexmove.c | 19 ++-----------------
1 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/src/vertexmove.c b/src/vertexmove.c
index 5a32955..2b08dc8 100644
--- a/src/vertexmove.c
+++ b/src/vertexmove.c
@@ -20,7 +20,7 @@
ts_uint i;
ts_bool retval;
ts_uint cellidx;
- ts_double delta_energy, oenergy, darea=0.0, dstretchenergy=0.0;
+ ts_double delta_energy, oenergy,dstretchenergy=0.0;
ts_double costheta,sintheta,phi,r;
//This will hold all the information of vtx and its neighbours
ts_vertex backupvtx[20]; // *constvol_vtx_moved=NULL, *constvol_vtx_backup=NULL;
@@ -85,7 +85,7 @@
vesicle->plist->pointer=vesicle->plist->chain->vm_energy_after_execute;
while(vesicle->plist->pointer!=NULL){
- delta_energy+=vesicle->plist->pointer->plugin->function->vm_energy_after_execute(vesicle, vtx);
+ delta_energy+=vesicle->plist->pointer->plugin->function->vm_energy_after_execute(vesicle, vtx, backupvtx);
vesicle->plist->pointer=vesicle->plist->pointer->next;
}
@@ -110,21 +110,6 @@
pow(sqrt(vtx_distance_sq(&backupvtx[0], vtx->grafted_poly->vlist->vtx[0])-1),2)) *vtx->grafted_poly->k;
}
*/
-
-// plane confinement energy due to compressing force
- if(vesicle->tape->plane_confinement_switch){
- if(vesicle->confinement_plane.force_switch){
- //substract old energy
- if(abs(vesicle->tape->plane_d/2.0-vesicle->confinement_plane.z_max)>1e-10) {
- delta_energy-=vesicle->tape->plane_F / pow(vesicle->confinement_plane.z_max-backupvtx[0].z,2);
- delta_energy+=vesicle->tape->plane_F / pow(vesicle->confinement_plane.z_max-vtx->z,2);
- }
- if(abs(-vesicle->tape->plane_d/2.0-vesicle->confinement_plane.z_min)>1e-10) {
- delta_energy-=vesicle->tape->plane_F / pow(vesicle->confinement_plane.z_min-backupvtx[0].z,2);
- delta_energy+=vesicle->tape->plane_F / pow(vesicle->confinement_plane.z_min-vtx->z,2);
- }
- }
- }
/* Entry point for plugin vm_before_montecarlo_constraint() function */
--
Gitblit v1.9.3