From 3131dcbf73ff8a0699a688119d57eaf386f49590 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo@andromeda>
Date: Mon, 27 Dec 2010 17:14:57 +0000
Subject: [PATCH] Bug in calculating members solved!
---
src/energy.c | 83 +++++++++++++++++++++--------------------
1 files changed, 43 insertions(+), 40 deletions(-)
diff --git a/src/energy.c b/src/energy.c
index 61720ee..e30295b 100644
--- a/src/energy.c
+++ b/src/energy.c
@@ -6,14 +6,14 @@
#include<stdio.h>
ts_bool mean_curvature_and_energy(ts_vesicle *vesicle){
- ts_uint i, jj, jjp;
+ ts_uint i;
- ts_vertex_list *vlist=&vesicle->vlist;
- ts_vertex *vtx=vlist->vertex;
+ ts_vertex_list *vlist=vesicle->vlist;
+ ts_vertex **vtx=vlist->vtx;
for(i=0;i<vlist->n;i++){
- //should call with zero index!!!
- energy_vertex(&vtx[i]);
+ energy_vertex(vtx[i]);
+
}
return TS_SUCCESS;
@@ -23,6 +23,7 @@
inline ts_bool energy_vertex(ts_vertex *vtx){
// ts_vertex *vtx=&vlist->vertex[n]-1; // Caution! 0 Indexed value!
// ts_triangle *tristar=vtx->tristar-1;
+ ts_vertex_data *data=vtx->data;
ts_uint jj;
ts_uint jjp,jjm;
ts_vertex *j,*jp, *jm;
@@ -30,20 +31,21 @@
ts_double s=0,xh=0,yh=0,zh=0,txn=0,tyn=0,tzn=0;
ts_double x1,x2,x3,ctp,ctm,tot,xlen;
ts_double h,ht;
- for(jj=1; jj<=vtx->neigh_no;jj++){
+ for(jj=1; jj<=data->neigh_no;jj++){
jjp=jj+1;
- if(jjp>vtx->neigh_no) jjp=1;
+ if(jjp>data->neigh_no) jjp=1;
jjm=jj-1;
- if(jjm<1) jjm=vtx->neigh_no;
- j=vtx->neigh[jj-1];
- jp=vtx->neigh[jjp-1];
- jm=vtx->neigh[jjm-1];
- jt=vtx->tristar[jj-1];
- x1=vertex_distance_sq(vtx,jp); //shouldn't be zero!
- x2=vertex_distance_sq(j,jp); // shouldn't be zero!
- x3=(j->x-jp->x)*(vtx->x-jp->x)+
- (j->y-jp->y)*(vtx->y-jp->y)+
- (j->z-jp->z)*(vtx->z-jp->z);
+ if(jjm<1) jjm=data->neigh_no;
+ j=data->neigh[jj-1];
+ jp=data->neigh[jjp-1];
+ jm=data->neigh[jjm-1];
+// printf("tristar_no=%u, neigh_no=%u, jj=%u\n",data->tristar_no,data->neigh_no,jj);
+ jt=data->tristar[jj-1];
+ x1=vtx_distance_sq(vtx,jp); //shouldn't be zero!
+ x2=vtx_distance_sq(j,jp); // shouldn't be zero!
+ x3=(j->data->x-jp->data->x)*(data->x-jp->data->x)+
+ (j->data->y-jp->data->y)*(data->y-jp->data->y)+
+ (j->data->z-jp->data->z)*(data->z-jp->data->z);
#ifdef TS_DOUBLE_DOUBLE
ctp=x3/sqrt(x1*x2-x3*x3);
@@ -54,11 +56,11 @@
#ifdef TS_DOUBLE_LONGDOUBLE
ctp=x3/sqrtl(x1*x2-x3*x3);
#endif
- x1=vertex_distance_sq(vtx,jm);
- x2=vertex_distance_sq(j,jm);
- x3=(j->x-jm->x)*(vtx->x-jm->x)+
- (j->y-jm->y)*(vtx->y-jm->y)+
- (j->z-jm->z)*(vtx->z-jm->z);
+ x1=vtx_distance_sq(vtx,jm);
+ x2=vtx_distance_sq(j,jm);
+ x3=(j->data->x-jm->data->x)*(data->x-jm->data->x)+
+ (j->data->y-jm->data->y)*(data->y-jm->data->y)+
+ (j->data->z-jm->data->z)*(data->z-jm->data->z);
#ifdef TS_DOUBLE_DOUBLE
ctm=x3/sqrt(x1*x2-x3*x3);
#endif
@@ -70,26 +72,26 @@
#endif
tot=ctp+ctm;
tot=0.5*tot;
- xlen=vertex_distance_sq(j,vtx);
+ xlen=vtx_distance_sq(j,vtx);
#ifdef TS_DOUBLE_DOUBLE
- vtx->bond_length[jj-1]=sqrt(xlen);
+ data->bond[jj-1]->data->bond_length=sqrt(xlen);
#endif
#ifdef TS_DOUBLE_FLOAT
- vtx->bond_length[jj-1]=sqrtf(xlen);
+ data->bond[jj-1]->data->bond_length=sqrtf(xlen);
#endif
#ifdef TS_DOUBLE_LONGDOUBLE
- vtx->bond_length[jj-1]=sqrtl(xlen);
+ data->bond[jj-1]->data->bond_length=sqrtl(xlen);
#endif
- vtx->bond_length_dual[jj-1]=tot*vtx->bond_length[jj-1];
+ data->bond[jj-1]->data->bond_length_dual=tot*data->bond[jj-1]->data->bond_length;
s+=tot*xlen;
- xh+=tot*(j->x - vtx->x);
- yh+=tot*(j->y - vtx->y);
- zh+=tot*(j->z - vtx->z);
- txn+=jt->xnorm;
- tyn+=jt->ynorm;
- tzn+=jt->znorm;
+ xh+=tot*(j->data->x - data->x);
+ yh+=tot*(j->data->y - data->y);
+ zh+=tot*(j->data->z - data->z);
+ txn+=jt->data->xnorm;
+ tyn+=jt->data->ynorm;
+ tzn+=jt->data->znorm;
}
h=xh*xh+yh*yh+zh*zh;
@@ -97,26 +99,27 @@
s=s/4.0;
#ifdef TS_DOUBLE_DOUBLE
if(ht>=0.0) {
- vtx->curvature=sqrt(h);
+ data->curvature=sqrt(h);
} else {
- vtx->curvature=-sqrt(h);
+ data->curvature=-sqrt(h);
}
#endif
#ifdef TS_DOUBLE_FLOAT
if(ht>=0.0) {
- vtx->curvature=sqrtf(h);
+ data->curvature=sqrtf(h);
} else {
- vtx->curvature=-sqrtf(h);
+ data->curvature=-sqrtf(h);
}
#endif
#ifdef TS_DOUBLE_LONGDOUBLE
if(ht>=0.0) {
- vtx->curvature=sqrtl(h);
+ data->curvature=sqrtl(h);
} else {
- vtx->curvature=-sqrtl(h);
+ data->curvature=-sqrtl(h);
}
#endif
- vtx->energy=0.5*s*(vtx->curvature/s-vtx->c)*(vtx->curvature/s-vtx->c);
+//TODO: MAJOR!!!! What is vtx->data->c?????????????? Here it is 0!
+ data->energy=0.5*s*(data->curvature/s-data->c)*(data->curvature/s-data->c);
return TS_SUCCESS;
}
--
Gitblit v1.9.3