From 6705af6d3d02e47a797c53146666a1d168e1aefc Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 06 Mar 2014 08:56:37 +0000
Subject: [PATCH] Merge branch 'trisurf-polyel'. It is the most debugged version. True, without polymeres dump may not work yet, still, from scratch with polymeres set to 0, there should be minimal time penalty.

---
 src/timestep.h |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/timestep.h b/src/timestep.h
index 53c5ed1..e25234d 100644
--- a/src/timestep.h
+++ b/src/timestep.h
@@ -1,10 +1,5 @@
+#ifndef _TIMESTEP_H
+#define _TIMESTEP_H
 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);
+ts_bool run_simulation(ts_vesicle *vesicle, ts_uint mcsweeps, ts_uint inititer, ts_uint iterations);
+#endif

--
Gitblit v1.9.3