From 301c87b8a0ae31d97adf840d90dd241ffb3328b6 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Tue, 24 May 2016 17:02:48 +0000 Subject: [PATCH] A fix in restoring from snapshot when filaments are used --- src/vesicle.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/src/vesicle.c b/src/vesicle.c index d2caf4b..4d9e5cd 100644 --- a/src/vesicle.c +++ b/src/vesicle.c @@ -1,3 +1,4 @@ +/* vim: set ts=4 sts=4 sw=4 noet : */ #include<general.h> #include "vesicle.h" #include "vertex.h" @@ -5,10 +6,13 @@ #include "bond.h" #include "cell.h" #include "stdlib.h" +#include "poly.h" +#include "sh.h" +#include "shcomplex.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(); @@ -33,6 +37,8 @@ bond_list_free(vesicle->blist); triangle_list_free(vesicle->tlist); cell_list_free(vesicle->clist); + poly_list_free(vesicle->poly_list); + complex_sph_free(vesicle->sphHarmonics); free(vesicle); return TS_SUCCESS; } @@ -55,3 +61,20 @@ vesicle->volume=volume; return TS_SUCCESS; } + +/* @brief Function makes a sum of partial areas of each triangle. + * + * + * + */ +ts_bool vesicle_area(ts_vesicle *vesicle){ + ts_double area; + ts_uint i; + ts_triangle **tria=vesicle->tlist->tria; + area=0; + for(i=0;i<vesicle->tlist->n;i++){ + area=area+tria[i]->area; + } + vesicle->area=area; + return TS_SUCCESS; +} -- Gitblit v1.9.3