From ded11ede7e9eb11c216d35d61ab9331e697f47bc Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 07 Dec 2013 09:09:37 +0000
Subject: [PATCH] commiting before checking out onother branch
---
src/vertexmove.c | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/vertexmove.c b/src/vertexmove.c
index f38e3c7..7047450 100644
--- a/src/vertexmove.c
+++ b/src/vertexmove.c
@@ -20,6 +20,7 @@
ts_bool retval;
ts_uint cellidx;
ts_double delta_energy,oenergy;
+ ts_double costheta,sintheta,phi,r;
//This will hold all the information of vtx and its neighbours
ts_vertex backupvtx[20];
memcpy((void *)&backupvtx[0],(void *)vtx,sizeof(ts_vertex));
@@ -35,12 +36,23 @@
*/
//temporarly moving the vertex
- vtx->x=vtx->x+vesicle->stepsize*(2.0*rn[0]-1.0);
- vtx->y=vtx->y+vesicle->stepsize*(2.0*rn[1]-1.0);
- vtx->z=vtx->z+vesicle->stepsize*(2.0*rn[2]-1.0);
+// vtx->x=vtx->x+vesicle->stepsize*(2.0*rn[0]-1.0);
+// 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:
+ r=vesicle->stepsize*rn[0];
+ phi=rn[1]*2*M_PI;
+ costheta=2*rn[2]-1;
+ sintheta=sqrt(1-pow(costheta,2));
+ vtx->x=vtx->x+r*sintheta*cos(phi);
+ vtx->y=vtx->y+r*sintheta*sin(phi);
+ vtx->z=vtx->z+r*costheta;
+
+
//distance with neighbours check
- for(i=0;i<vtx->neigh_no;i++){
- dist=vtx_distance_sq(vtx,vtx->neigh[i]);
+ for(i=0;i<vtx->neigh->n;i++){
+ dist=vtx_distance_sq(vtx,vtx->neigh->vtx[i]);
if(dist<1.0 || dist>vesicle->dmax) {
vtx=memcpy((void *)vtx,(void *)&backupvtx[0],sizeof(ts_vertex));
return TS_FAIL;
@@ -58,8 +70,8 @@
//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));
+ for(i=0;i<vtx->neigh->n;i++){
+ memcpy((void *)&backupvtx[i+1],(void *)vtx->neigh->vtx[i],sizeof(ts_vertex));
}
@@ -71,10 +83,10 @@
energy_vertex(vtx);
delta_energy=vtx->xk*(vtx->energy - oenergy);
//the same is done for neighbouring vertices
- for(i=0;i<vtx->neigh_no;i++){
- oenergy=vtx->neigh[i]->energy;
- energy_vertex(vtx->neigh[i]);
- delta_energy+=vtx->neigh[i]->xk*(vtx->neigh[i]->energy-oenergy);
+ for(i=0;i<vtx->neigh->n;i++){
+ oenergy=vtx->neigh->vtx[i]->energy;
+ energy_vertex(vtx->neigh->vtx[i]);
+ delta_energy+=vtx->neigh->vtx[i]->xk*(vtx->neigh->vtx[i]->energy-oenergy);
}
// fprintf(stderr, "DE=%f\n",delta_energy);
//MONTE CARLOOOOOOOO
@@ -91,8 +103,8 @@
{
//not accepted, reverting changes
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->neigh->n;i++){
+ vtx->neigh->vtx[i]=memcpy((void *)vtx->neigh->vtx[i],(void *)&backupvtx[i+1],sizeof(ts_vertex));
}
//update the normals of triangles that share bead i.
--
Gitblit v1.9.3