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 |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/main.c b/src/main.c
index 290142e..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
@@ -45,11 +46,20 @@
 		// 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=tape->inititer+1;
+		if(command_line_args.reset_iteration_count) start_iteration=tape->inititer;
 		else start_iteration++;
 
 		if(start_iteration>=tape->iterations){

--
Gitblit v1.9.3