From 06afc729f9061c1cfa14c78728d61d518324c2f0 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Wed, 04 May 2022 05:46:43 +0000 Subject: [PATCH] Moved all global variables to separate file and defined extern keyword where appropriate --- src/main.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main.c b/src/main.c index 8ef8904..5f8858f 100644 --- a/src/main.c +++ b/src/main.c @@ -17,7 +17,7 @@ #include "shcomplex.h" #include "dumpstate.h" #include "restore.h" - +#include "globals.h" #include <fcntl.h> /** Entrance function to the program * @param argv is a number of parameters used in program call (including the program name @@ -48,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++; - write_vertex_xml_file(vesicle,1000); + 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); @@ -127,10 +127,12 @@ } } //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