From 5bb6bb1c525a0503f8eb2b1c0fa64a5d3cc6e9bf Mon Sep 17 00:00:00 2001
From: mihaf <miha.fosnaric@gmail.com>
Date: Wed, 16 Apr 2014 10:09:35 +0000
Subject: [PATCH] Output for spherical harmonics testing added.
---
src/main.c | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main.c b/src/main.c
index a89cecf..9bb3430 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,6 +11,7 @@
#include "frame.h"
#include "timestep.h"
#include "poly.h"
+#include "sh.h"
/** Entrance function to the program
* @param argv is a number of parameters used in program call (including the program name
@@ -22,9 +23,10 @@
ts_vesicle *vesicle;
ts_tape *tape;
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(force_from_tape){
+ 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");
@@ -37,8 +39,27 @@
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);
+ vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies;
+ /* spherical harmonics */
+ if(tape->shc>0){
+ vesicle->sphHarmonics=sph_init(vesicle->vlist,tape->shc);
+ }
+ else {
+ vesicle->sphHarmonics=NULL;
+ }
- if(command_line_args.reset_iteration_count) start_iteration=0;
+ if(command_line_args.reset_iteration_count) start_iteration=tape->inititer;
else start_iteration++;
if(start_iteration>=tape->iterations){
--
Gitblit v1.9.3