From a7a6d6d521ea3006963ae3f1a3fd8975cf3ba9b2 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 12 Jul 2012 16:26:28 +0000
Subject: [PATCH] code cleanup
---
src/vertexmove.c | 22 ----------------------
1 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/src/vertexmove.c b/src/vertexmove.c
index 7f3c661..b98835c 100644
--- a/src/vertexmove.c
+++ b/src/vertexmove.c
@@ -21,9 +21,7 @@
ts_uint cellidx;
ts_double delta_energy,oenergy;
//This will hold all the information of vtx and its neighbours
-// ts_vertex **backupvtx=(ts_vertex **)calloc(vtx->neigh_no+1,sizeof(ts_vertex *));
ts_vertex backupvtx[20];
-// backupvtx[0]=(ts_vertex *)malloc(sizeof(ts_vertex));
memcpy((void *)&backupvtx[0],(void *)vtx,sizeof(ts_vertex));
//temporarly moving the vertex
vtx->x=vtx->x+vesicle->stepsize*(2.0*rn[0]-1.0);
@@ -34,9 +32,6 @@
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));
-// free(backupvtx[0]);
-// free(backupvtx);
-// fprintf(stderr,"Fail 1, dist=%f, vesicle->dmax=%f\n", dist, vesicle->dmax);
return TS_FAIL;
}
}
@@ -46,23 +41,18 @@
retval=cell_occupation_number_and_internal_proximity(vesicle->clist,cellidx,&backupvtx[0],vtx);
if(retval==TS_FAIL){
vtx=memcpy((void *)vtx,(void *)&backupvtx[0],sizeof(ts_vertex));
-// free(backupvtx[0]);
-// free(backupvtx);
-// fprintf(stderr,"Fail 2\n");
return TS_FAIL;
}
//if all the tests are successful, then energy for vtx and neighbours is calculated
for(i=0;i<vtx->neigh_no;i++){
-// backupvtx[i+1]=(ts_vertex *)malloc(sizeof(ts_vertex));
memcpy((void *)&backupvtx[i+1],(void *)vtx->neigh[i],sizeof(ts_vertex));
}
delta_energy=0;
//update the normals of triangles that share bead i.
for(i=0;i<vtx->tristar_no;i++) triangle_normal_vector(vtx->tristar[i]);
- //energy and curvature
energy_vertex(vtx);
delta_energy=vtx->xk*(vtx->energy - (&backupvtx[0])->energy);
//the same is done for neighbouring vertices
@@ -86,12 +76,9 @@
{
//not accepted, reverting changes
vtx=memcpy((void *)vtx,(void *)&backupvtx[0],sizeof(ts_vertex));
-// free(backupvtx[0]);
for(i=0;i<vtx->neigh_no;i++){
vtx->neigh[i]=memcpy((void *)vtx->neigh[i],(void *)&backupvtx[i+1],sizeof(ts_vertex));
-// free(backupvtx[i+1]);
}
-// free(backupvtx);
// fprintf(stderr,"Reverted\n");
//update the normals of triangles that share bead i.
@@ -101,15 +88,6 @@
}
}
//END MONTE CARLOOOOOOO
-
- //TODO: change cell occupation if necessary!
-// fprintf(stderr,"Success!!\n");
-// free(backupvtx[0]);
-// for(i=0;i<vtx->neigh_no;i++){
-// free(backupvtx[i+1]);
-// }
-// free(backupvtx);
-// fprintf(stderr,"Accepted\n");
return TS_SUCCESS;
}
--
Gitblit v1.9.3