From c0d703a09da108f218b687beeec671f71b7a44c9 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Sat, 08 Mar 2014 18:25:50 +0000 Subject: [PATCH] Merge branch 'trisurf-polyel' --- src/io.h | 38 +++++++++++++++++++++++++++++++++++--- 1 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/io.h b/src/io.h index f76eb09..c8dfd17 100644 --- a/src/io.h +++ b/src/io.h @@ -9,6 +9,37 @@ char path[1024]; 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; +} ts_args; + +ts_args command_line_args; + ts_bool parse_args(int argc, char **argv); @@ -60,8 +91,9 @@ 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 *mcsweeps, ts_uint *inititer, ts_uint *iterations); +ts_tape *parsetape(char *filename); +ts_bool tape_free(ts_tape *tape); -ts_bool dump_state(ts_vesicle *vesicle); -ts_vesicle *restore_state(); +ts_bool dump_state(ts_vesicle *vesicle, ts_uint iteration); +ts_vesicle *restore_state(ts_uint *iteration); #endif -- Gitblit v1.9.3