From 0634b97e436e480b203a22e1113c473d3ae4d281 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:35:11 +0000
Subject: [PATCH] Merge branch 'nirgov' into HEAD
---
src/main.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main.c b/src/main.c
index 72e2b74..7e65aea 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,19 +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++;
+ 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);
@@ -124,6 +128,7 @@
}
//printf("nucleus coords: %.17e %.17e %.17e\n",vesicle->nucleus_center[0], vesicle->nucleus_center[1], vesicle->nucleus_center[2]);
+ //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