From bfa6c4d2d234dac214ae05855669844255a32979 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Sun, 03 Jul 2016 20:46:31 +0000 Subject: [PATCH] Merge branch 'paraview'. This enables view of triangles in paraview. --- src/initial_distribution.h | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/initial_distribution.h b/src/initial_distribution.h index 04fdfe1..b1a20e1 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,8 @@ */ 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 @@ -27,7 +31,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