From 9166cbcd0e28d61a69646911af35bb7895ff9203 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Mon, 28 Apr 2014 11:16:45 +0000
Subject: [PATCH] Did major change in vesicle datastructure. Added tape information into vesicle. This means the dump files will be broken each time tape structure changes. Beware.
---
src/main.c | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main.c b/src/main.c
index 25dc047..e67764d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,6 +11,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
@@ -38,12 +40,29 @@
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_stiffness=tape->xk0;
- set_global_values(tape->xk0);
+ vesicle->bending_rigidity=tape->xk0;
+ vtx_set_global_values(vesicle);
+ vesicle->pswitch =tape->pswitch;
vesicle->pressure=tape->pressure;
-*/
- if(command_line_args.reset_iteration_count) start_iteration=tape->inititer+1;
+ vesicle->dmax=tape->dmax*tape->dmax;
+ poly_assign_filament_xi(vesicle,tape);
+ tape_free(vesicle->tape);
+ vesicle->tape=tape;
+ vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies;
+ /* 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){
--
Gitblit v1.9.3