From aafd67f2d592799167864698ea07eb8aadcc86a7 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 25 May 2016 18:37:21 +0000
Subject: [PATCH] Merge branch 'master' of bitbucket.org:samop/trisurf-ng with work done on removing the memory leaks.
---
src/shdiscover.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/shdiscover.c b/src/shdiscover.c
index f16239f..cf155ac 100644
--- a/src/shdiscover.c
+++ b/src/shdiscover.c
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
#include "general.h"
#include "vertex.h"
#include "initial_distribution.h"
@@ -42,17 +43,17 @@
/*we calculate new position of each vertex of vesicle */
for(i=0;i<n;i++){
- fi=atan2(vlist->vtx[i]->data->y, vlist->vtx[i]->data->x);
+ fi=atan2(vlist->vtx[i]->y, vlist->vtx[i]->x);
/* theta=atan2(
sqrt(vlist->vtx[i]->data->x*vlist->vtx[i]->data->x +
vlist->vtx[i]->data->y*vlist->vtx[i]->data->y),
vlist->vtx[i]->data->z
); */
theta=acos(
- vlist->vtx[i]->data->z /
- sqrt(vlist->vtx[i]->data->x*vlist->vtx[i]->data->x +
- vlist->vtx[i]->data->y*vlist->vtx[i]->data->y+
- vlist->vtx[i]->data->z*vlist->vtx[i]->data->z)
+ vlist->vtx[i]->z /
+ sqrt(vlist->vtx[i]->x*vlist->vtx[i]->x +
+ vlist->vtx[i]->y*vlist->vtx[i]->y+
+ vlist->vtx[i]->z*vlist->vtx[i]->z)
);
@@ -67,9 +68,9 @@
/*ts_fprintf(stdout,"l=%d, m=%d, u=%s\n",l,m,argv[j]);*/
}
- vlist->vtx[i]->data->z=fabs(r)*cos(theta);
- vlist->vtx[i]->data->x=fabs(r)*sin(theta)*cos(fi);
- vlist->vtx[i]->data->y=fabs(r)*sin(theta)*sin(fi);
+ vlist->vtx[i]->z=fabs(r)*cos(theta);
+ vlist->vtx[i]->x=fabs(r)*sin(theta)*cos(fi);
+ vlist->vtx[i]->y=fabs(r)*sin(theta)*sin(fi);
}
write_vertex_xml_file(vesicle,0);
--
Gitblit v1.9.3