From 67749cb5e94a7d28a449a8346b8b3efad786e765 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 01 Jun 2016 19:27:58 +0000
Subject: [PATCH] Added statistics combining python script. Rudimentary at the moment.
---
src/main.c | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main.c b/src/main.c
index e4b306f..72e2b74 100644
--- a/src/main.c
+++ b/src/main.c
@@ -42,10 +42,23 @@
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);
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");
+ }
+ fclose(fd);
+ start_iteration++;
+ }
+ else
+ ts_fprintf(stdout,"No .status file. The iteration count will start from 0");
+/* 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,6 +122,7 @@
}
}
}
+ //printf("nucleus coords: %.17e %.17e %.17e\n",vesicle->nucleus_center[0], vesicle->nucleus_center[1], vesicle->nucleus_center[2]);
run_simulation(vesicle, tape->mcsweeps, tape->inititer, tape->iterations, start_iteration);
write_master_xml_file(command_line_args.output_fullfilename);
--
Gitblit v1.9.3