From 36dba86649e71d2a56657320ddf98a1af2055023 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 28 Feb 2019 20:04:16 +0000
Subject: [PATCH] Some changes to plugins to allow storage of data. Pressure is a plugin now
---
src/vertexmove.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/vertexmove.c b/src/vertexmove.c
index c512ccd..0c08aff 100644
--- a/src/vertexmove.c
+++ b/src/vertexmove.c
@@ -35,13 +35,6 @@
vtx->y=vtx->y+r*sintheta*sin(phi);
vtx->z=vtx->z+r*costheta;
-// plane confinement check whether the new position of vertex will be out of bounds
- 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;
- }
- }
/* Entry point for plugin vm_hard_constraint() function */
ts_plugin_chain *ptr=vesicle->plist->chain->vm_hard_constraint;
@@ -53,14 +46,21 @@
}
ptr=ptr->next;
}
+/* End of vm_hard_constraint() */
-
-
-//if all the tests are successful, then energy for vtx and neighbours is calculated
+/* Backuping the neighbours */
for(i=0;i<vtx->neigh_no;i++){
memcpy((void *)&backupvtx[i+1],(void *)vtx->neigh[i],sizeof(ts_vertex));
}
+/* Entry point for plugin vm_energy_before_prepare() */
+
+ vesicle->plist->pointer=vesicle->plist->chain->vm_energy_before_prepare;
+ while(vesicle->plist->pointer!=NULL){
+ vesicle->plist->pointer->plugin->function->vm_energy_before_prepare(vesicle, vtx);
+ vesicle->plist->pointer=vesicle->plist->pointer->next;
+ }
+/* Calculate energy for vtx and neighbours */
if(vesicle->pswitch == 1 || vesicle->tape->constvolswitch>0){
for(i=0;i<vtx->tristar_no;i++) dvol-=vtx->tristar[i]->volume;
}
--
Gitblit v1.9.3