From c2c6364dc7d23f21dabd2179e775e93ba4eeb252 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:45:07 +0000
Subject: [PATCH] Merging again because I was merging in detached state

---
 src/initial_distribution.h |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/initial_distribution.h b/src/initial_distribution.h
index 04fdfe1..e54ee08 100644
--- a/src/initial_distribution.h
+++ b/src/initial_distribution.h
@@ -1,6 +1,9 @@
-/** @brief initial bond length */
-#define A0 1.2 
+/* vim: set ts=4 sts=4 sw=4 noet : */
+#include "io.h"
 
+
+/** @brief initial bond length */
+#define DEF_A0 1.2 
 
 /** @brief Creates initial distribution of vertices
   *
@@ -10,7 +13,10 @@
 */
 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
@@ -27,7 +33,7 @@
 //ts_bool init_vertex_neighbours(ts_vertex_list *vlist);
 
 /** interior sites and their neighbours in circ. order + the triangles they are holding together */
-ts_bool init_sort_neighbours(ts_vertex_list *vlist);
+ts_vertex_list *init_sort_neighbours(ts_bond_list *blist,ts_vertex_list *vlist);
 ts_bool init_vesicle_bonds(ts_vesicle *vesicle);
 ts_bool init_triangles(ts_vesicle *vesicle);
 ts_bool init_triangle_neighbours(ts_vesicle *vesicle);

--
Gitblit v1.9.3