From dd4e182bc818974b3ad529422e631aa6a0764f2f Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@fe.uni-lj.si> Date: Tue, 05 Jul 2016 10:18:24 +0000 Subject: [PATCH] Merge branch 'nirgov' of bitbucket.org:samop/trisurf-ng into nirgov --- src/tsmeasure.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/tsmeasure.c b/src/tsmeasure.c index a0769ee..beabc61 100644 --- a/src/tsmeasure.c +++ b/src/tsmeasure.c @@ -34,9 +34,9 @@ } void vesicle_calculate_ulm2(ts_vesicle *vesicle){ - complex_sph_free(vesicle->sphHarmonics); + //complex_sph_free(vesicle->sphHarmonics); - vesicle->sphHarmonics=complex_sph_init(vesicle->vlist,21); + //vesicle->sphHarmonics=complex_sph_init(vesicle->vlist,21); vesicle_volume(vesicle); preparationSh(vesicle,getR0(vesicle)); calculateUlmComplex(vesicle); @@ -68,7 +68,7 @@ ent=list[n]; i=rindex(ent->d_name,'.'); if(i==NULL) { - continue; + continue; } if(strcmp(i+1,"vtu")==0){ j=rindex(ent->d_name,'_'); @@ -80,12 +80,16 @@ vesicle=restoreVesicle(ent->d_name); vesicle_calculate_ulm2(vesicle); tstep++; - //vesicle_free(vesicle); free(number); + tape_free(vesicle->tape); vesicle_free(vesicle); } - free(ent); } + for (n = 0; n < count; n++) + { + free(list[n]); + } + free(list); return 0; } -- Gitblit v1.9.3