From 6c3bb91fea92c5013507bdf4f5ac49e889e213ff Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Oct 2015 12:07:39 +0000
Subject: [PATCH] Unkonown merge difference between different directories are merged together.
---
src/main.c | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main.c b/src/main.c
index 1b97f10..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
@@ -45,10 +48,25 @@
// 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;
- if(command_line_args.reset_iteration_count) start_iteration=tape->inititer+1;
+
+
+ /* 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