From 82a8abcddd62838bfcd06b6081042caf4d385a88 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 13 Jul 2016 21:37:13 +0000
Subject: [PATCH] Seems that the bugs are fixed. Pegs are self avoidant now
---
src/main.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main.c b/src/main.c
index ac92fd5..085e09f 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)
@@ -51,13 +54,13 @@
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);
@@ -122,7 +125,9 @@
}
}
}
-
+ //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);
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