From a99f2bb2d3af25b4cc14848647522c1997862652 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Thu, 03 Mar 2016 16:22:23 +0000 Subject: [PATCH] Fix --- src/main.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main.c b/src/main.c index 7d3726a..8cf3e92 100644 --- a/src/main.c +++ b/src/main.c @@ -1,3 +1,4 @@ +/* vim: set ts=4 sts=4 sw=4 noet : */ #include<stdio.h> #include<math.h> #include<stdlib.h> @@ -14,7 +15,8 @@ #include "poly.h" #include "sh.h" #include "shcomplex.h" - +#include "dumpstate.h" +#include "restore.h" /** Entrance function to the program * @param argv is a number of parameters used in program call (including the program name * @param argc is a pointer to strings (character arrays) which holds the arguments @@ -27,8 +29,23 @@ ts_uint start_iteration=0; force_from_tape=0; parse_args(argv,argc); // sets global variable command_line_args (defined in io.h) + ts_fprintf(stdout,"TRISURF-NG v. %s, compiled on: %s %s.\n", TS_VERSION, __DATE__, __TIME__); + ts_fprintf(stdout,"Programming done by: Samo Penic and Miha Fosnaric\n"); + ts_fprintf(stdout,"Released under terms of GPLv3\n"); ts_fprintf(stdout,"Starting program...\n\n"); - if(command_line_args.force_from_tape){ +// vesicle = parseDump("timestep_000000.vtu"); +// run_simulation(vesicle, vesicle->tape->mcsweeps, vesicle->tape->inititer, vesicle->tape->iterations, 1); + + if(command_line_args.dump_from_vtk[0]!=0){ + ts_fprintf(stdout,"************************************************\n"); + ts_fprintf(stdout,"***** Dumping vesicle from VTK points list *****\n"); + ts_fprintf(stdout,"************************************************\n\n"); + vesicle = parseDump(command_line_args.dump_from_vtk); + tape = vesicle->tape; +// tape=parsetape(command_line_args.tape_fullfilename); + // vesicle=vtk2vesicle(command_line_args.dump_from_vtk,tape); + } + else if(command_line_args.force_from_tape){ ts_fprintf(stdout,"************************************************\n"); ts_fprintf(stdout,"**** Generating initial geometry from tape *****\n"); ts_fprintf(stdout,"************************************************\n\n"); -- Gitblit v1.9.3