From 9d5216497310cf33ef3db2d511787a779ebccda3 Mon Sep 17 00:00:00 2001
From: mihaf <miha.fosnaric@gmail.com>
Date: Tue, 08 Jul 2014 16:27:32 +0000
Subject: [PATCH] Merge branch 'master' of https://bitbucket.org/samop/trisurf-ng
---
src/main.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main.c b/src/main.c
index 9bb3430..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"
@@ -12,6 +13,7 @@
#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
@@ -50,10 +52,15 @@
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;
+
+
+
/* spherical harmonics */
if(tape->shc>0){
- vesicle->sphHarmonics=sph_init(vesicle->vlist,tape->shc);
+ vesicle->sphHarmonics=complex_sph_init(vesicle->vlist,tape->shc);
}
else {
vesicle->sphHarmonics=NULL;
--
Gitblit v1.9.3