From 19c1fd84d1fd75e9bfd55feb670fda87a2e02086 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Fri, 08 Feb 2019 08:32:29 +0000 Subject: [PATCH] Merge branch 'master' of ssh://git.penic.eu:29418/trisurf-ng --- src/main.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index 1fe6618..3f91f43 100644 --- a/src/main.c +++ b/src/main.c @@ -30,6 +30,9 @@ ts_tape *tape; ts_uint start_iteration=0; force_from_tape=0; + /* Area and volume for constant area and constant volume are initialized to be zero */ + A0=0; + V0=0; /* create lock file */ createPidFile("ts_trisurf",".lock",0); parse_args(argv,argc); // sets global variable command_line_args (defined in io.h) @@ -45,20 +48,20 @@ ts_fprintf(stdout,"**** Restoring vesicle from VTK points list ****\n"); ts_fprintf(stdout,"************************************************\n\n"); vesicle = parseDump(command_line_args.dump_from_vtk); +// write_vertex_xml_file(vesicle,9999); // here you can test if restoration and rewritting results in the same dump file. Only the date od creation of dump file must differ. tape = vesicle->tape; int arguments_no; FILE *fd=fopen(".status","r"); if(fd!=NULL){ arguments_no=fscanf(fd,"%u", &start_iteration); if(arguments_no==0){ - ts_fprintf(stdout,"No information of start iteration in .status file"); + ts_fprintf(stdout,"No information of start iteration in .status file\n"); } fclose(fd); - start_iteration++; - printf("nucleus coords: %.17e %.17e %.17e\n",vesicle->nucleus_center[0], vesicle->nucleus_center[1], vesicle->nucleus_center[2]); + start_iteration++; } else - ts_fprintf(stdout,"No .status file. The iteration count will start from 0"); + ts_fprintf(stdout,"No .status file. The iteration count will start from 0\n"); /* Here you should read new tape file, reassign some values in vertex from the tape and assign read tape to vesicle->tape */ // tape=parsetape(command_line_args.tape_fullfilename); // vesicle=vtk2vesicle(command_line_args.dump_from_vtk,tape); @@ -123,7 +126,11 @@ } } } + //printf("nucleus coords: %.17e %.17e %.17e\n",vesicle->nucleus_center[0], vesicle->nucleus_center[1], vesicle->nucleus_center[2]); +// write_vertex_xml_file(vesicle,0); +// exit(1); + //write_vertex_xml_file(vesicle,1000); run_simulation(vesicle, tape->mcsweeps, tape->inititer, tape->iterations, start_iteration); write_master_xml_file(command_line_args.output_fullfilename); write_dout_fcompat_file(vesicle,"dout"); -- Gitblit v1.9.3