From 4a35612678295c86677923de3fa5d43e90371667 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 16 Oct 2019 09:14:54 +0000
Subject: [PATCH] Removed obsolete dumpstate.c and dumpstate.h files.
---
src/vertexmove.c | 133 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 121 insertions(+), 12 deletions(-)
diff --git a/src/vertexmove.c b/src/vertexmove.c
index 36cf993..e74fa74 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"
@@ -20,7 +21,7 @@
ts_double dist;
ts_bool retval;
ts_uint cellidx;
- ts_double delta_energy, delta_energy_cv,oenergy,dvol=0.0;
+ ts_double delta_energy, delta_energy_cv,oenergy,dvol=0.0, darea=0.0, 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;
@@ -41,7 +42,7 @@
// vtx->y=vtx->y+vesicle->stepsize*(2.0*rn[1]-1.0);
// vtx->z=vtx->z+vesicle->stepsize*(2.0*rn[2]-1.0);
- //random move in a sphere with radius stepsize:
+//random move in a sphere with radius stepsize:
r=vesicle->stepsize*rn[0];
phi=rn[1]*2*M_PI;
costheta=2*rn[2]-1;
@@ -51,12 +52,12 @@
vtx->z=vtx->z+r*costheta;
- //distance with neighbours check
+//distance with neighbours check
for(i=0;i<vtx->neigh_no;i++){
dist=vtx_distance_sq(vtx,vtx->neigh[i]);
if(dist<1.0 || dist>vesicle->dmax) {
- vtx=memcpy((void *)vtx,(void *)&backupvtx[0],sizeof(ts_vertex));
- return TS_FAIL;
+ vtx=memcpy((void *)vtx,(void *)&backupvtx[0],sizeof(ts_vertex));
+ return TS_FAIL;
}
}
@@ -71,11 +72,31 @@
// TODO: Maybe faster if checks only nucleus-neighboring cells
// Nucleus penetration check:
- if (vtx->x*vtx->x + vtx->y*vtx->y + vtx->z*vtx->z < vesicle->R_nucleus){
+//#define SQ(x) x*x
+if(vesicle->R_nucleus>0.0){
+ 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 ((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;
}
+}
+
+ // 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;
+ }
+ }
+//#undef SQ
//self avoidance check with distant vertices
cellidx=vertex_self_avoidance(vesicle, vtx);
//check occupation number
@@ -87,17 +108,26 @@
}
- //if all the tests are successful, then energy for vtx and neighbours is calculated
+//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));
}
- if(vesicle->pswitch == 1 || vesicle->tape->constvolswitch==1){
+ if(vesicle->pswitch == 1 || vesicle->tape->constvolswitch>0){
for(i=0;i<vtx->tristar_no;i++) dvol-=vtx->tristar[i]->volume;
- };
+ }
- delta_energy=0;
+ if(vesicle->tape->constareaswitch==2){
+ for(i=0;i<vtx->tristar_no;i++) darea-=vtx->tristar[i]->area;
+ }
+ //stretching energy 1 of 3
+ if(vesicle->tape->stretchswitch==1){
+ for(i=0;i<vtx->tristar_no;i++) dstretchenergy-=vtx->tristar[i]->energy;
+ }
+ delta_energy=0;
+
+
// vesicle_volume(vesicle);
// fprintf(stderr,"Volume in the beginning=%1.16e\n", vesicle->volume);
@@ -113,11 +143,43 @@
delta_energy+=vtx->neigh[i]->xk*(vtx->neigh[i]->energy-oenergy);
}
- if(vesicle->pswitch == 1 || vesicle->tape->constvolswitch == 1){
+ if(vesicle->pswitch == 1 || vesicle->tape->constvolswitch >0){
for(i=0;i<vtx->tristar_no;i++) dvol+=vtx->tristar[i]->volume;
if(vesicle->pswitch==1) delta_energy-=vesicle->pressure*dvol;
};
+ if(vesicle->tape->constareaswitch==2){
+ /* check whether the darea is gt epsarea */
+ for(i=0;i<vtx->tristar_no;i++) darea+=vtx->tristar[i]->area;
+ if(fabs(vesicle->area+darea-A0)>epsarea){
+ //restore old state.
+ vtx=memcpy((void *)vtx,(void *)&backupvtx[0],sizeof(ts_vertex));
+ for(i=0;i<vtx->neigh_no;i++){
+ vtx->neigh[i]=memcpy((void *)vtx->neigh[i],(void *)&backupvtx[i+1],sizeof(ts_vertex));
+ }
+ for(i=0;i<vtx->tristar_no;i++) triangle_normal_vector(vtx->tristar[i]);
+ //fprintf(stderr,"fajlam!\n");
+ return TS_FAIL;
+ }
+
+
+ }
+
+ if(vesicle->tape->constvolswitch==2){
+ /*check whether the dvol is gt than epsvol */
+ //fprintf(stderr,"DVOL=%1.16e\n",dvol);
+ if(fabs(vesicle->volume+dvol-V0)>epsvol){
+ //restore old state.
+ vtx=memcpy((void *)vtx,(void *)&backupvtx[0],sizeof(ts_vertex));
+ for(i=0;i<vtx->neigh_no;i++){
+ vtx->neigh[i]=memcpy((void *)vtx->neigh[i],(void *)&backupvtx[i+1],sizeof(ts_vertex));
+ }
+ for(i=0;i<vtx->tristar_no;i++) triangle_normal_vector(vtx->tristar[i]);
+ //fprintf(stderr,"fajlam!\n");
+ return TS_FAIL;
+ }
+
+ } else
// vesicle_volume(vesicle);
// fprintf(stderr,"Volume before=%1.16e\n", vesicle->volume);
if(vesicle->tape->constvolswitch == 1){
@@ -139,6 +201,19 @@
delta_energy+=delta_energy_cv;
// fprintf(stderr,"Denergy after=%e\n",delta_energy);
}
+/* Vertices with spontaneous curvature may have spontaneous force perpendicular to the surface of the vesicle. additional delta energy is calculated in this function */
+ delta_energy+=direct_force_energy(vesicle,vtx,backupvtx);
+
+ //stretching energy 2 of 3
+ if(vesicle->tape->stretchswitch==1){
+ for(i=0;i<vtx->tristar_no;i++){
+ stretchenergy(vesicle, vtx->tristar[i]);
+ dstretchenergy+=vtx->tristar[i]->energy;
+ }
+ }
+
+ delta_energy+=dstretchenergy;
+
/* No poly-bond energy for now!
if(vtx->grafted_poly!=NULL){
delta_energy+=
@@ -146,11 +221,28 @@
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);
+ }
+ }
+ }
+
// 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() )
+ if(exp(-delta_energy)< drand48())
#endif
#ifdef TS_DOUBLE_FLOAT
if(expf(-delta_energy)< (ts_float)drand48())
@@ -168,12 +260,20 @@
//update the normals of triangles that share bead i.
for(i=0;i<vtx->tristar_no;i++) triangle_normal_vector(vtx->tristar[i]);
+ //stretching energy 3 of 3
+ if(vesicle->tape->stretchswitch==1){
+ for(i=0;i<vtx->tristar_no;i++){
+ stretchenergy(vesicle,vtx->tristar[i]);
+ }
+ }
// fprintf(stderr, "before vtx(x,y,z)=%e,%e,%e\n",constvol_vtx_moved->x, constvol_vtx_moved->y, constvol_vtx_moved->z);
if(vesicle->tape->constvolswitch == 1){
constvolumerestore(constvol_vtx_moved,constvol_vtx_backup);
}
// fprintf(stderr, "after vtx(x,y,z)=%e,%e,%e\n",constvol_vtx_moved->x, constvol_vtx_moved->y, constvol_vtx_moved->z);
+// vesicle_volume(vesicle);
+// fprintf(stderr,"Volume after fail=%1.16e\n", vesicle->volume);
return TS_FAIL;
}
}
@@ -187,11 +287,20 @@
}
+ if(vesicle->tape->constvolswitch == 2){
+ vesicle->volume+=dvol;
+ } else
if(vesicle->tape->constvolswitch == 1){
constvolumeaccept(vesicle,constvol_vtx_moved,constvol_vtx_backup);
}
+
+ if(vesicle->tape->constareaswitch==2){
+ vesicle->area+=darea;
+ }
// if(oldcellidx);
//END MONTE CARLOOOOOOO
+// vesicle_volume(vesicle);
+// fprintf(stderr,"Volume after success=%1.16e\n", vesicle->volume);
return TS_SUCCESS;
}
--
Gitblit v1.9.3