From 42641cde38cfd1d27a2031604cc1397b5bd2849b Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 21 Mar 2014 20:57:24 +0000
Subject: [PATCH] Merge with trout-rnc.

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

diff --git a/src/initial_distribution.h b/src/initial_distribution.h
index 04fdfe1..20bbf18 100644
--- a/src/initial_distribution.h
+++ b/src/initial_distribution.h
@@ -1,6 +1,8 @@
+#include "io.h"
+
+
 /** @brief initial bond length */
 #define A0 1.2 
-
 
 /** @brief Creates initial distribution of vertices
   *
@@ -10,6 +12,7 @@
 */
 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);
 
 /** Sets the initial position of the vertexes to dipyramid
  *
@@ -27,7 +30,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