From 43c0420ae7c32fbcd3d784803bdbcf56b25b69e4 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Mon, 28 Apr 2014 13:30:32 +0000
Subject: [PATCH] Almost over.
---
src/vertexmove.c | 97 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 71 insertions(+), 26 deletions(-)
diff --git a/src/vertexmove.c b/src/vertexmove.c
index 04325ef..44ef63e 100644
--- a/src/vertexmove.c
+++ b/src/vertexmove.c
@@ -9,9 +9,11 @@
#include "timestep.h"
#include "cell.h"
//#include "io.h"
+#include "io.h"
#include<stdio.h>
#include "vertexmove.h"
#include <string.h>
+#include "constvol.h"
ts_bool single_verticle_timestep(ts_vesicle *vesicle,ts_vertex *vtx,ts_double *rn){
ts_uint i;
@@ -21,7 +23,7 @@
ts_double delta_energy,oenergy,dvol=0.0;
ts_double costheta,sintheta,phi,r;
//This will hold all the information of vtx and its neighbours
- ts_vertex backupvtx[20];
+ ts_vertex backupvtx[20], *constvol_vtx_moved, *constvol_vtx_backup;
memcpy((void *)&backupvtx[0],(void *)vtx,sizeof(ts_vertex));
//Some stupid tests for debugging cell occupation!
@@ -67,11 +69,18 @@
}
}
- //self avoidance check with distant vertices
- cellidx=vertex_self_avoidance(vesicle, vtx);
- //check occupation number
- retval=cell_occupation_number_and_internal_proximity(vesicle->clist,cellidx,vtx);
-
+// 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){
+ vtx=memcpy((void *)vtx,(void *)&backupvtx[0],sizeof(ts_vertex));
+ return TS_FAIL;
+ }
+
+//self avoidance check with distant vertices
+ cellidx=vertex_self_avoidance(vesicle, vtx);
+ //check occupation number
+ retval=cell_occupation_number_and_internal_proximity(vesicle->clist,cellidx,vtx);
+
if(retval==TS_FAIL){
vtx=memcpy((void *)vtx,(void *)&backupvtx[0],sizeof(ts_vertex));
return TS_FAIL;
@@ -88,6 +97,18 @@
};
delta_energy=0;
+
+ if(vesicle->tape->constvolswitch == 1){
+ retval=constvolume(vesicle, vtx, dvol, &delta_energy, constvol_vtx_moved,constvol_vtx_backup);
+ if(retval==TS_FAIL){ // if we couldn't move the vertex to assure constant volume
+ 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));
+ }
+ return TS_FAIL;
+ }
+ }
+
//update the normals of triangles that share bead i.
for(i=0;i<vtx->tristar_no;i++) triangle_normal_vector(vtx->tristar[i]);
oenergy=vtx->energy;
@@ -102,8 +123,9 @@
if(vesicle->pswitch == 1){
for(i=0;i<vtx->tristar_no;i++) dvol+=vtx->tristar[i]->volume;
- delta_energy-=vesicle->pressure*dvol;
+ delta_energy-=vesicle->pressure*dvol;
};
+
/* No poly-bond energy for now!
if(vtx->grafted_poly!=NULL){
@@ -134,10 +156,14 @@
//update the normals of triangles that share bead i.
for(i=0;i<vtx->tristar_no;i++) triangle_normal_vector(vtx->tristar[i]);
+ if(vesicle->tape->constvolswitch == 1){
+ ts_bool constvolumerestore(constvol_vtx_backup);
+ }
+
return TS_FAIL;
}
}
-
+ //accepted
// oldcellidx=vertex_self_avoidance(vesicle, &backupvtx[0]);
if(vtx->cell!=vesicle->clist->cell[cellidx]){
retval=cell_add_vertex(vesicle->clist->cell[cellidx],vtx);
@@ -145,6 +171,10 @@
if(retval==TS_SUCCESS) cell_remove_vertex(backupvtx[0].cell,vtx);
}
+
+ if(vesicle->tape->constvolswitch == 1){
+ ts_bool constvolumeaccept(constvol_vtx_backup);
+ }
// if(oldcellidx);
//END MONTE CARLOOOOOOO
return TS_SUCCESS;
@@ -262,12 +292,14 @@
ts_uint i;
ts_bool retval;
ts_uint cellidx;
-// ts_double delta_energy;
+ ts_double delta_energy;
ts_double costheta,sintheta,phi,r;
ts_double dist[2];
//This will hold all the information of vtx and its neighbours
- ts_vertex backupvtx;
+ ts_vertex backupvtx,backupneigh[2];
ts_bond backupbond[2];
+
+ //backup vertex:
memcpy((void *)&backupvtx,(void *)vtx,sizeof(ts_vertex));
//random move in a sphere with radius stepsize:
@@ -289,12 +321,18 @@
}
}
+// 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){
+ vtx=memcpy((void *)vtx,(void *)&backupvtx,sizeof(ts_vertex));
+ return TS_FAIL;
+ }
+
//self avoidance check with distant vertices
cellidx=vertex_self_avoidance(vesicle, vtx);
//check occupation number
retval=cell_occupation_number_and_internal_proximity(vesicle->clist,cellidx,vtx);
-
if(retval==TS_FAIL){
vtx=memcpy((void *)vtx,(void *)&backupvtx,sizeof(ts_vertex));
return TS_FAIL;
@@ -305,26 +343,30 @@
memcpy(&backupbond[i],vtx->bond[i], sizeof(ts_bond));
vtx->bond[i]->bond_length=sqrt(dist[i]);
bond_vector(vtx->bond[i]);
-
+ }
+
+ //backup neighboring vertices:
+ for(i=0;i<vtx->neigh_no;i++){
+ memcpy(&backupneigh[i],vtx->neigh[i], sizeof(ts_vertex));
}
//if all the tests are successful, then energy for vtx and neighbours is calculated
-// delta_energy=0;
-/* for(i=0;i<vtx->neigh_no;i++){
-// memcpy((void *)&backupbond[i],(void *)vtx->bond[i],sizeof(ts_bond));
- xp = vtx->neigh[i]
- vtx->bond[i]->bond_length=sqrt(vtx_distance_sq(vtx->bond[i]->vtx1,vtx->bond[i]->vtx2));
- bond_energy(vtx->bond[i],poly);
- delta_energy+= vtx->bond[i]->energy - backupbond[i].energy;
+ delta_energy=0;
+
+ if(vtx->bond_no == 2){
+ vtx->energy = -(vtx->bond[0]->x*vtx->bond[1]->x + vtx->bond[0]->y*vtx->bond[1]->y + vtx->bond[0]->z*vtx->bond[1]->z)/vtx->bond[0]->bond_length/vtx->bond[1]->bond_length;
+ delta_energy += vtx->energy - backupvtx.energy;
}
- if(vtx==poly->vlist->vtx[0]){
- delta_energy+=
- (pow(sqrt(vtx_distance_sq(vtx, poly->grafted_vtx)-1),2)-
- pow(sqrt(vtx_distance_sq(&backupvtx, poly->grafted_vtx)-1),2)) *poly->k;
-
+ for(i=0;i<vtx->neigh_no;i++){
+ if(vtx->neigh[i]->bond_no == 2){
+ vtx->neigh[i]->energy = -(vtx->neigh[i]->bond[0]->x*vtx->neigh[i]->bond[1]->x + vtx->neigh[i]->bond[0]->y*vtx->neigh[i]->bond[1]->y + vtx->neigh[i]->bond[0]->z*vtx->neigh[i]->bond[1]->z)/vtx->neigh[i]->bond[0]->bond_length/vtx->neigh[i]->bond[1]->bond_length;
+ delta_energy += vtx->neigh[i]->energy - backupneigh[i].energy;
+ }
}
+ // poly->k is filament persistence length (in units l_min)
+ delta_energy *= poly->k;
if(delta_energy>=0){
#ifdef TS_DOUBLE_DOUBLE
@@ -339,15 +381,18 @@
{
//not accepted, reverting changes
vtx=memcpy((void *)vtx,(void *)&backupvtx,sizeof(ts_vertex));
+ for(i=0;i<vtx->neigh_no;i++){
+ memcpy(vtx->neigh[i],&backupneigh[i],sizeof(ts_vertex));
+ }
for(i=0;i<vtx->bond_no;i++){
- vtx->bond[i]=memcpy((void *)vtx->bond[i],(void *)&backupbond[i],sizeof(ts_bond));
+ vtx->bond[i]=memcpy((void *)vtx->bond[i],(void *)&backupbond[i],sizeof(ts_bond));
}
return TS_FAIL;
}
}
-*/
+
// oldcellidx=vertex_self_avoidance(vesicle, &backupvtx[0]);
if(vtx->cell!=vesicle->clist->cell[cellidx]){
retval=cell_add_vertex(vesicle->clist->cell[cellidx],vtx);
--
Gitblit v1.9.3