From 152052a93b7e7b5151c42992c79d8e3667471a3e Mon Sep 17 00:00:00 2001
From: mihaf <miha.fosnaric@gmail.com>
Date: Mon, 10 Mar 2014 11:08:40 +0000
Subject: [PATCH] not using global force_from_tape
---
src/main.c | 60 ++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/src/main.c b/src/main.c
index 506bd37..25dc047 100644
--- a/src/main.c
+++ b/src/main.c
@@ -21,33 +21,41 @@
int main(int argv, char *argc[]){
ts_vesicle *vesicle;
ts_tape *tape;
- ts_uint start_iteration=-1;
- parse_args(argv,argc);
- ts_fprintf(stdout,"\nStarting program...\n\n");
-if(force_from_tape){
-ts_fprintf(stdout,"****************************************************\n");
-ts_fprintf(stdout,"**** Reinitializing initial geometry from tape *****\n");
-ts_fprintf(stdout,"****************************************************\n\n");
-tape=parsetape("tape");
-vesicle=create_vesicle_from_tape(tape);
-} else {
+ ts_uint start_iteration=0;
+ force_from_tape=0;
+ parse_args(argv,argc); // sets global variable command_line_args (defined in io.h)
+ ts_fprintf(stdout,"Starting program...\n\n");
+ if(command_line_args.force_from_tape){
+ ts_fprintf(stdout,"************************************************\n");
+ ts_fprintf(stdout,"**** Generating initial geometry from tape *****\n");
+ ts_fprintf(stdout,"************************************************\n\n");
+ tape=parsetape("tape");
+ vesicle=create_vesicle_from_tape(tape);
+ } else {
-ts_fprintf(stdout,"**********************************************************************\n");
-ts_fprintf(stdout,"**** Recreating vesicle from dump file and continuing simulation *****\n");
-ts_fprintf(stdout,"**********************************************************************\n\n");
-tape=parsetape("tape");
-vesicle=restore_state(&start_iteration);
+ ts_fprintf(stdout,"**********************************************************************\n");
+ ts_fprintf(stdout,"**** Recreating vesicle from dump file and continuing simulation *****\n");
+ ts_fprintf(stdout,"**********************************************************************\n\n");
+ tape=parsetape("tape");
+ vesicle=restore_state(&start_iteration);
+ // nove vrednosti iz tapea...
+/* vesicle->bending_stiffness=tape->xk0;
+ set_global_values(tape->xk0);
+ vesicle->pressure=tape->pressure;
+*/
+ if(command_line_args.reset_iteration_count) start_iteration=tape->inititer+1;
+ else start_iteration++;
-if(start_iteration>=tape->iterations){
- ts_fprintf(stdout, "Simulation already completed. if you want to rerun it try with --force-from-tape or --reset-iteration-count\n\n");
- return 0;
-}
-}
+ if(start_iteration>=tape->iterations){
+ ts_fprintf(stdout, "Simulation already completed. if you want to rerun it try with --force-from-tape or --reset-iteration-count\n\n");
+ return 0;
+ }
+ }
-run_simulation(vesicle, tape->mcsweeps, tape->inititer, tape->iterations, start_iteration+1);
-write_master_xml_file("test.pvd");
-write_dout_fcompat_file(vesicle,"dout");
-vesicle_free(vesicle);
-tape_free(tape);
-return 0; //program finished perfectly ok. We return 0.
+ run_simulation(vesicle, tape->mcsweeps, tape->inititer, tape->iterations, start_iteration);
+ write_master_xml_file("test.pvd");
+ 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