From 4e6285b2342038e3740ff9cea7c31364b4caa5e5 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 11 Feb 2014 12:03:29 +0000
Subject: [PATCH] Merge branch 'master' of bitbucket.org:samop/trisurf-ng
---
src/energy.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/energy.c b/src/energy.c
index 4d93753..abbb8e7 100644
--- a/src/energy.c
+++ b/src/energy.c
@@ -28,7 +28,7 @@
ts_uint jjp,jjm;
ts_vertex *j,*jp, *jm;
ts_triangle *jt;
- ts_double s=0,xh=0,yh=0,zh=0,txn=0,tyn=0,tzn=0;
+ ts_double s=0.0,xh=0.0,yh=0.0,zh=0.0,txn=0.0,tyn=0.0,tzn=0.0;
ts_double x1,x2,x3,ctp,ctm,tot,xlen;
ts_double h,ht;
for(jj=1; jj<=vtx->neigh_no;jj++){
@@ -72,7 +72,9 @@
#endif
tot=ctp+ctm;
tot=0.5*tot;
+
xlen=vtx_distance_sq(j,vtx);
+/*
#ifdef TS_DOUBLE_DOUBLE
vtx->bond[jj-1]->bond_length=sqrt(xlen);
#endif
@@ -84,7 +86,7 @@
#endif
vtx->bond[jj-1]->bond_length_dual=tot*vtx->bond[jj-1]->bond_length;
-
+*/
s+=tot*xlen;
xh+=tot*(j->x - vtx->x);
yh+=tot*(j->y - vtx->y);
--
Gitblit v1.9.3