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/io.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/io.h b/src/io.h
index 2f3f19a..7ac2160 100644
--- a/src/io.h
+++ b/src/io.h
@@ -48,7 +48,8 @@
 ts_bool write_vertex_vtk_file(ts_vesicle *vesicle,ts_char *filename, ts_char *text);
 ts_bool write_vertex_xml_file(ts_vesicle *vesicle, ts_uint timestepno);
 ts_bool write_master_xml_file(ts_char *filename);
-ts_vesicle *parsetape(ts_uint *iterations);
+ts_vesicle *parsetape(ts_uint *mcsweeps, ts_uint *inititer, ts_uint *iterations);
 
-
+ts_bool dump_state(ts_vesicle *vesicle);
+ts_vesicle *restore_state();
 #endif

--
Gitblit v1.9.3