From 002b70ce9bba4475376eb4933f1e7c58cac89c57 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Wed, 18 May 2016 14:26:22 +0000
Subject: [PATCH] Started valgrinding. Memory leaks are still present
---
src/initial_distribution.c | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/initial_distribution.c b/src/initial_distribution.c
index 35d533d..4c82b35 100644
--- a/src/initial_distribution.c
+++ b/src/initial_distribution.c
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
#include<stdlib.h>
#include<math.h>
#include<stdio.h>
@@ -39,11 +40,17 @@
ts_vesicle *create_vesicle_from_tape(ts_tape *tape){
ts_vesicle *vesicle;
- ts_vertex *vtx;
vesicle=initial_distribution_dipyramid(tape->nshell,tape->ncxmax,tape->ncymax,tape->nczmax,tape->stepsize);
- vesicle->tape=tape;
+ vesicle->tape=tape;
+ set_vesicle_values_from_tape(vesicle);
+ return vesicle;
+}
+
+ts_bool set_vesicle_values_from_tape(ts_vesicle *vesicle){
// Nucleus:
+ ts_vertex *vtx;
+ ts_tape *tape=vesicle->tape;
vesicle->R_nucleus=tape->R_nucleus*tape->R_nucleus;
vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies;
@@ -86,7 +93,7 @@
vesicle->dmax=tape->dmax*tape->dmax; /* dmax^2 in the vesicle dmax variable */
vesicle->bending_rigidity=tape->xk0;
vtx_set_global_values(vesicle); /* make xk0 default value for every vertex */
- ts_fprintf(stdout, "Tape setting: xk0=%e\n",tape->xk0);
+// ts_fprintf(stdout, "Tape setting: xk0=%e\n",tape->xk0);
vesicle->stepsize=tape->stepsize;
vesicle->clist->ncmax[0]=tape->ncxmax;
vesicle->clist->ncmax[1]=tape->ncymax;
@@ -101,7 +108,7 @@
else {
vesicle->sphHarmonics=NULL;
}
- return vesicle;
+ return TS_SUCCESS;
}
--
Gitblit v1.9.3