From bfa6c4d2d234dac214ae05855669844255a32979 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sun, 03 Jul 2016 20:46:31 +0000
Subject: [PATCH] Merge branch 'paraview'. This enables view of triangles in paraview.
---
src/main.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main.c b/src/main.c
index 36da13a..c2e51af 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)
@@ -46,12 +49,18 @@
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){
- fscanf(fd,"%u", &start_iteration);
+ 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++;
+ 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);
@@ -116,6 +125,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