From 80f2a33e4b55c7259bdb4bff66a0ce12b96edd80 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Mon, 11 Jul 2016 19:29:28 +0000
Subject: [PATCH] Merge branch 'master' of bitbucket.org:samop/trisurf-ng

---
 src/timestep.h |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/timestep.h b/src/timestep.h
index 53c5ed1..21cb7bb 100644
--- a/src/timestep.h
+++ b/src/timestep.h
@@ -1,10 +1,6 @@
-ts_bool single_timestep(ts_vesicle *vesicle);
-
-ts_bool single_verticle_timestep(ts_vesicle *vesicle,ts_vertex *vtx,ts_double
-*rn);
-
-ts_bool single_bondflip_timestep(ts_vesicle *vesicle, ts_bond *bond, ts_double
-*rn);
-
-ts_bool ts_flip_bond(ts_vertex *k,ts_vertex *it,ts_vertex *km, ts_vertex *kp,
-ts_bond *bond);
+/* vim: set ts=4 sts=4 sw=4 noet : */
+#ifndef _TIMESTEP_H
+#define _TIMESTEP_H
+ts_bool single_timestep(ts_vesicle *vesicle, ts_double *vmsr, ts_double *bfsr);
+ts_bool run_simulation(ts_vesicle *vesicle, ts_uint mcsweeps, ts_uint inititer, ts_uint iterations, ts_uint start_simulation);
+#endif

--
Gitblit v1.9.3