From 4019ca8157136a68b6e43b31f166dc93acd81b4d Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 08 Feb 2019 08:14:57 +0000
Subject: [PATCH] Merge branch 'stretching-devel' into plane-new
---
src/tsmeasure.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/tsmeasure.c b/src/tsmeasure.c
index 9190648..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,8 +68,7 @@
ent=list[n];
i=rindex(ent->d_name,'.');
if(i==NULL) {
- free(ent);
- continue;
+ continue;
}
if(strcmp(i+1,"vtu")==0){
j=rindex(ent->d_name,'_');
@@ -81,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