From 7958e9880911c822dcb78d3e1ac743a0ccdc1e03 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo@andromeda>
Date: Sat, 04 Dec 2010 20:56:15 +0000
Subject: [PATCH] The initial distribution file has been rewritten. The structure of dipyramid should be accurately recreated using new datastructure. While rewritting the new datastructure proved to be very easy to understand and no memory leaks occured. Still, some questions remains unanswered -- whether the vertex neighbours and links to bonds should be linked tightly together.

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

diff --git a/src/initial_timestep.h b/src/initial_distribution.h
similarity index 84%
rename from src/initial_timestep.h
rename to src/initial_distribution.h
index 57d079c..04fdfe1 100644
--- a/src/initial_timestep.h
+++ b/src/initial_distribution.h
@@ -8,8 +8,7 @@
   * @param N is the number of vertices to be initialized
   * @returns TS_SUCCESS on success, TS_FAIL otherwise. If allocation fails, the execution is terminated, reporting error code to the underlying operating system.
 */
-ts_bool initial_distribution(ts_vesicle *vesicle);
-
+ts_vesicle *initial_distribution_dipyramid(ts_uint nshell, ts_uint ncmax1, ts_uint ncmax2, ts_uint ncmax3, ts_double stepsize);
 
 
 /** Sets the initial position of the vertexes to dipyramid
@@ -19,17 +18,17 @@
  */
 ts_bool pentagonal_dipyramid_vertex_distribution(ts_vertex_list *vlist);
 
-
 /** Finds the neighbouring vertices and add them to a list of each vertex
  *
  *      @param *vlist is a pointer to a ts_vertex_list
  *      @returns TS_SUCCESS if successful, TS_FAIL otherwise
  */
 ts_bool init_vertex_neighbours(ts_vertex_list *vlist);
+//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_bool init_bonds(ts_vesicle *vesicle);
+ts_bool init_vesicle_bonds(ts_vesicle *vesicle);
 ts_bool init_triangles(ts_vesicle *vesicle);
 ts_bool init_triangle_neighbours(ts_vesicle *vesicle);
 ts_bool init_common_vertex_triangle_neighbours(ts_vesicle *vesicle);

--
Gitblit v1.9.3