From 0634b97e436e480b203a22e1113c473d3ae4d281 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:35:11 +0000
Subject: [PATCH] Merge branch 'nirgov' into HEAD

---
 src/initial_distribution.h |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/initial_distribution.h b/src/initial_distribution.h
index 20bbf18..e54ee08 100644
--- a/src/initial_distribution.h
+++ b/src/initial_distribution.h
@@ -1,8 +1,9 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
 #include "io.h"
 
 
 /** @brief initial bond length */
-#define A0 1.2 
+#define DEF_A0 1.2 
 
 /** @brief Creates initial distribution of vertices
   *
@@ -13,7 +14,9 @@
 ts_vesicle *initial_distribution_dipyramid(ts_uint nshell, ts_uint ncmax1, ts_uint ncmax2, ts_uint ncmax3, ts_double stepsize);
 
 ts_vesicle *create_vesicle_from_tape(ts_tape *tape);
+ts_bool set_vesicle_values_from_tape(ts_vesicle *vesicle);
 
+ts_bool initial_population_with_c0(ts_vesicle *vesicle, ts_tape *tape);
 /** Sets the initial position of the vertexes to dipyramid
  *
  *      @param *vlist is a pointer to list of vertices

--
Gitblit v1.9.3