From 6c274defd904dedd6cb89c002f5eeced6c079d47 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Tue, 11 Dec 2018 11:42:22 +0000 Subject: [PATCH] Added stretching variables --- src/io.h | 48 ++++++++++++++++++------------------------------ 1 files changed, 18 insertions(+), 30 deletions(-) diff --git a/src/io.h b/src/io.h index c8dfd17..6ca8331 100644 --- a/src/io.h +++ b/src/io.h @@ -1,41 +1,24 @@ +/* vim: set ts=4 sts=4 sw=4 noet : */ #ifndef _IO_H #define _IO_H - +#include <confuse.h> /** @ Global variables for I/O operations like filenames etc. */ /*static char mastername[1024]; static char prefixname[1024]; static ts_bool restore=0; static char tape[1024]; */ -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; - +char tapetxt[128000]; //stores text file of the 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 + char tape_templatefull[1024]; //name of the tape template file + char tape_opts[1000]; //commandline tape options + char dump_from_vtk[1024]; } ts_args; ts_args command_line_args; @@ -89,11 +72,16 @@ * @param *text is a description line (max. 255 characters) to be included in the file */ 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_vertex_xml_file(ts_vesicle *vesicle, ts_uint timestepno, ts_cluster_list *cstlist); ts_bool write_master_xml_file(ts_char *filename); -ts_tape *parsetape(char *filename); -ts_bool tape_free(ts_tape *tape); +ts_bool write_pov_file(ts_vesicle *vesicle, char *filename); +ts_tape *parsetape(char *filename); +ts_tape *parsetapebuffer(char *buffer); +ts_bool tape_free(ts_tape *tape); +ts_bool getcmdline_tape(cfg_t *cfg, char *opts); +ts_bool cmdline_to_tape(cfg_t *cfg, char *key, char *val); +ts_bool print_help(FILE *fd); ts_bool dump_state(ts_vesicle *vesicle, ts_uint iteration); ts_vesicle *restore_state(ts_uint *iteration); #endif -- Gitblit v1.9.3