From 002b70ce9bba4475376eb4933f1e7c58cac89c57 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@fe.uni-lj.si> Date: Wed, 18 May 2016 14:26:22 +0000 Subject: [PATCH] Started valgrinding. Memory leaks are still present --- src/io.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/io.c b/src/io.c index 0a6cd57..c35d42b 100644 --- a/src/io.c +++ b/src/io.c @@ -1,3 +1,4 @@ +/* vim: set ts=4 sts=4 sw=4 noet : */ #include "general.h" #include<stdio.h> #include "io.h" @@ -450,18 +451,19 @@ {"force-from-tape", no_argument, &(command_line_args.force_from_tape), 1}, {"reset-iteration-count", no_argument, &(command_line_args.reset_iteration_count), 1}, {"tape", no_argument, 0, 't'}, + {"version", no_argument, 0, 'v'}, {"output-file", required_argument, 0, 'o'}, {"directory", required_argument, 0, 'd'}, {"dump-filename", required_argument,0, 'f'}, {"tape-options",required_argument,0,'c'}, {"tape-template", required_argument,0,0}, - {"dump-from-vtk",required_argument,0,0}, + {"restore-from-vtk",required_argument,0,0}, {0, 0, 0, 0} }; /* getopt_long stores the option index here. */ int option_index = 0; - c = getopt_long (argc, argv, "d:f:o:t:c:", + c = getopt_long (argc, argv, "d:f:o:t:c:v", long_options, &option_index); /* Detect the end of the options. */ @@ -482,10 +484,15 @@ if(strcmp(long_options[option_index].name,"tape-template")==0){ strcpy(command_line_args.tape_templatefull,optarg); } - if(strcmp(long_options[option_index].name,"dump-from-vtk")==0){ + if(strcmp(long_options[option_index].name,"restore-from-vtk")==0){ strcpy(command_line_args.dump_from_vtk,optarg); } break; + case 'v': + fprintf(stdout,"TRISURF-NG v. %s, compiled on: %s %s.\n", TS_VERSION, __DATE__, __TIME__); + fprintf(stdout,"Programming done by: Samo Penic and Miha Fosnaric\n"); + fprintf(stdout,"Released under terms of GPLv3\n"); + exit(0); case 'c': strcpy(command_line_args.tape_opts,optarg); @@ -855,13 +862,13 @@ fprintf(fh,"</DataArray>\n</PointData>\n<CellData>\n</CellData>\n<Points>\n<DataArray type=\"Float64\" Name=\"Koordinate tock\" NumberOfComponents=\"3\" format=\"ascii\">\n"); for(i=0;i<vlist->n;i++){ - fprintf(fh,"%e %e %e\n",vtx[i]->x,vtx[i]->y, vtx[i]->z); + fprintf(fh,"%.17e %.17e %.17e\n",vtx[i]->x,vtx[i]->y, vtx[i]->z); } //polymeres if(poly){ for(i=0;i<vesicle->poly_list->n;i++){ for(j=0;j<vesicle->poly_list->poly[i]->vlist->n;j++){ - fprintf(fh,"%e %e %e\n", vesicle->poly_list->poly[i]->vlist->vtx[j]->x,vesicle->poly_list->poly[i]->vlist->vtx[j]->y, vesicle->poly_list->poly[i]->vlist->vtx[j]->z ); + fprintf(fh,"%.17e %.17e %.17e\n", vesicle->poly_list->poly[i]->vlist->vtx[j]->x,vesicle->poly_list->poly[i]->vlist->vtx[j]->y, vesicle->poly_list->poly[i]->vlist->vtx[j]->z ); } } } @@ -869,7 +876,7 @@ if(fil){ for(i=0;i<vesicle->filament_list->n;i++){ for(j=0;j<vesicle->filament_list->poly[i]->vlist->n;j++){ - fprintf(fh,"%e %e %e\n", vesicle->filament_list->poly[i]->vlist->vtx[j]->x,vesicle->filament_list->poly[i]->vlist->vtx[j]->y, vesicle->filament_list->poly[i]->vlist->vtx[j]->z ); + fprintf(fh,"%.17e %.17e %.17e\n", vesicle->filament_list->poly[i]->vlist->vtx[j]->x,vesicle->filament_list->poly[i]->vlist->vtx[j]->y, vesicle->filament_list->poly[i]->vlist->vtx[j]->z ); } } } -- Gitblit v1.9.3