Unkonown merge difference between different directories are merged together.

Samo Penic

2015-10-06 6c3bb91fea92c5013507bdf4f5ac49e889e213ff

 src/io.h

@@ -6,8 +6,19 @@
static char prefixname[1024];
static ts_bool restore=0;
static char tape[1024]; */
char path[1024];
int force_from_tape;


typedef struct{
   ts_int force_from_tape;
   ts_int reset_iteration_count;
    char path[1024]; //path where all files should be added
    char output_fullfilename[1024]; //name of the master file
    char dump_fullfilename[1024]; //name of the dump file
    char tape_fullfilename[1024]; //name of the tape file
} ts_args;

ts_args command_line_args;

ts_bool parse_args(int argc, char **argv);

@@ -60,8 +71,11 @@
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_bool write_pov_file(ts_vesicle *vesicle, char *filename);

ts_bool dump_state(ts_vesicle *vesicle);
ts_vesicle *restore_state();
ts_tape *parsetape(char *filename);
ts_bool tape_free(ts_tape *tape);

ts_bool dump_state(ts_vesicle *vesicle, ts_uint iteration);
ts_vesicle *restore_state(ts_uint *iteration);
#endif