From a2db521649cdcdfef3bdf6b306e05228a01498c0 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 07 Dec 2013 09:45:07 +0000
Subject: [PATCH] Added poly information to tape& parsing function. Also, poly_list is freed in vesicle_free
---
src/vesicle.c | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/vesicle.c b/src/vesicle.c
index de7f9a1..43b16b5 100644
--- a/src/vesicle.c
+++ b/src/vesicle.c
@@ -5,10 +5,11 @@
#include "bond.h"
#include "cell.h"
#include "stdlib.h"
+#include "poly.h"
ts_vesicle *init_vesicle(ts_uint N, ts_uint ncmax1, ts_uint ncmax2, ts_uint
ncmax3, ts_double stepsize){
- ts_vesicle *vesicle=(ts_vesicle *)malloc(sizeof(ts_vesicle));
+ ts_vesicle *vesicle=(ts_vesicle *)calloc(1,sizeof(ts_vesicle));
vesicle->vlist=init_vertex_list(N);
vesicle->blist=init_bond_list();
vesicle->tlist=init_triangle_list();
@@ -21,9 +22,9 @@
ts_vertex **vtx=vesicle->vlist->vtx;
ts_uint nn=vesicle->vlist->n;
for(i=0;i<nn;i++){
- vtx[i]->data->x+=x;
- vtx[i]->data->y+=y;
- vtx[i]->data->z+=z;
+ vtx[i]->x+=x;
+ vtx[i]->y+=y;
+ vtx[i]->z+=z;
}
return TS_SUCCESS;
}
@@ -33,6 +34,26 @@
bond_list_free(vesicle->blist);
triangle_list_free(vesicle->tlist);
cell_list_free(vesicle->clist);
+ poly_list_free(vesicle->poly_list);
free(vesicle);
return TS_SUCCESS;
}
+
+/* @brief Function makes a sum of partial volumes of each triangle. Volumes of
+ *
+ * Partial volumes are calculated when we calculate normals of triangles. It is
+ * relatively easy to calculate the volume of vesicle if we take into account
+ * that the volume of the whole vertex is simply sum of all partial volumes of
+ * all the triangles.
+ */
+ts_bool vesicle_volume(ts_vesicle *vesicle){
+ ts_double volume;
+ ts_uint i;
+ ts_triangle **tria=vesicle->tlist->tria;
+ volume=0;
+ for(i=0; i<vesicle->tlist->n;i++){
+ volume=volume+tria[i]->volume;
+ }
+ vesicle->volume=volume;
+ return TS_SUCCESS;
+}
--
Gitblit v1.9.3