From 6c3bb91fea92c5013507bdf4f5ac49e889e213ff Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Oct 2015 12:07:39 +0000
Subject: [PATCH] Unkonown merge difference between different directories are merged together.
---
src/io.h | 25 ++-----------------------
1 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/src/io.h b/src/io.h
index eb0b737..66ba7ae 100644
--- a/src/io.h
+++ b/src/io.h
@@ -9,29 +9,6 @@
int force_from_tape;
-typedef struct {
- long int nshell;
- long int ncxmax;
- long int ncymax;
- long int nczmax;
- long int npoly;
- long int nmono;
- long int pswitch;
- char *multiprocessing;
- long int brezveze0;
- long int brezveze1;
- long int brezveze2;
- ts_double xk0;
- ts_double dmax;
- ts_double stepsize;
- ts_double kspring;
- ts_double pressure;
- long int iterations;
- long int inititer;
- long int mcsweeps;
- long int quiet;
-} ts_tape;
-
typedef struct{
ts_int force_from_tape;
ts_int reset_iteration_count;
@@ -94,6 +71,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_bool write_pov_file(ts_vesicle *vesicle, char *filename);
+
ts_tape *parsetape(char *filename);
ts_bool tape_free(ts_tape *tape);
--
Gitblit v1.9.3