From 6fa0c93a432b95a6b888882494fcafb11c41515c Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 30 Nov 2013 10:55:53 +0000
Subject: [PATCH] finished rewritting. start debugging
---
src/vertexmove.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/vertexmove.c b/src/vertexmove.c
index a79b2f0..7047450 100644
--- a/src/vertexmove.c
+++ b/src/vertexmove.c
@@ -51,8 +51,8 @@
//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;
@@ -70,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));
}
@@ -83,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
@@ -103,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