From e818ba5bcc461af545665c78157be4e52252aa1c Mon Sep 17 00:00:00 2001
From: Miha <miha.fosnaric@fe.uni-lj.si>
Date: Mon, 11 Jul 2016 11:52:30 +0000
Subject: [PATCH] Merge branch 'master' of https://bitbucket.org/samop/trisurf-ng

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

diff --git a/src/initial_distribution.h b/src/initial_distribution.h
index 20bbf18..b1a20e1 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,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);
-
+ts_bool set_vesicle_values_from_tape(ts_vesicle *vesicle);
 /** Sets the initial position of the vertexes to dipyramid
  *
  *      @param *vlist is a pointer to list of vertices

--
Gitblit v1.9.3