From 5ec690fdf8f463a02c4e4d5505d5486b9a5bbd70 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 08 Jul 2014 16:21:14 +0000
Subject: [PATCH] Merge branch 'master' of bitbucket.org:samop/trisurf-ng into cross-section
---
src/main.c | 78 ++++++++++++++++++++++++++++----------
1 files changed, 57 insertions(+), 21 deletions(-)
diff --git a/src/main.c b/src/main.c
index 44d90e2..00bd95f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,6 @@
#include<stdio.h>
#include<math.h>
+#include<stdlib.h>
#include "general.h"
#include "vertex.h"
#include "bond.h"
@@ -11,6 +12,8 @@
#include "frame.h"
#include "timestep.h"
#include "poly.h"
+#include "sh.h"
+#include "shcomplex.h"
/** Entrance function to the program
* @param argv is a number of parameters used in program call (including the program name
@@ -22,27 +25,60 @@
ts_vesicle *vesicle;
ts_tape *tape;
ts_uint start_iteration=0;
- 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 {
+ 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);
+ if(vesicle==NULL){
+ ts_fprintf(stderr, "Dump file does not exist or is not a regular file! Did you mean to invoke trisurf with --force-from-tape option?\n\n");
+ return 1;
+ }
+ // nove vrednosti iz tapea...
+ vesicle->bending_rigidity=tape->xk0;
+ vtx_set_global_values(vesicle);
+ vesicle->pswitch =tape->pswitch;
+ vesicle->pressure=tape->pressure;
+ vesicle->dmax=tape->dmax*tape->dmax;
+ poly_assign_filament_xi(vesicle,tape);
+ free(vesicle->tape);
+ vesicle->tape=tape;
+ vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies;
-run_simulation(vesicle, tape->mcsweeps, tape->inititer, tape->iterations);
-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.
+
+
+ /* spherical harmonics */
+ if(tape->shc>0){
+ vesicle->sphHarmonics=complex_sph_init(vesicle->vlist,tape->shc);
+ }
+ else {
+ vesicle->sphHarmonics=NULL;
+ }
+
+ if(command_line_args.reset_iteration_count) start_iteration=tape->inititer;
+ 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;
+ }
+ }
+
+ 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