From 2a1e3d528265c3d366dab9ad4b0c4d3d65e1c4ed Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Mon, 13 Apr 2020 12:13:50 +0000 Subject: [PATCH] Storing previously debugged version --- src/main.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main.c b/src/main.c index e4b306f..ee462aa 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) @@ -42,10 +45,24 @@ 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,"**** 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\n"); + } + fclose(fd); + start_iteration++; + } + else + 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); } @@ -109,10 +126,13 @@ } } } + //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"); vesicle_free(vesicle); tape_free(tape); return 0; //program finished perfectly ok. We return 0. -- Gitblit v1.9.3