From 1d32b65243c0ad55ae9516acaa349f4f7c823b72 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Mon, 18 Sep 2017 18:55:21 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/trilib'

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

diff --git a/src/timestep.h b/src/timestep.h
index e25234d..21cb7bb 100644
--- a/src/timestep.h
+++ b/src/timestep.h
@@ -1,5 +1,6 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
 #ifndef _TIMESTEP_H
 #define _TIMESTEP_H
-ts_bool single_timestep(ts_vesicle *vesicle);
-ts_bool run_simulation(ts_vesicle *vesicle, ts_uint mcsweeps, ts_uint inititer, ts_uint iterations);
+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