From 42641cde38cfd1d27a2031604cc1397b5bd2849b Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 21 Mar 2014 20:57:24 +0000
Subject: [PATCH] Merge with trout-rnc.

---
 src/sh.h |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/sh.h b/src/sh.h
index 5b8a10c..7853139 100644
--- a/src/sh.h
+++ b/src/sh.h
@@ -1,13 +1,16 @@
 #ifndef _H_SH
 #define _H_SH
 #include "general.h"
-
-ts_double plgndr(ts_int l, ts_int m, ts_float x);
+ts_bool storeUlm2(ts_vesicle *vesicle);
+ts_double plgndr(ts_int l, ts_int m, ts_double x);
 ts_double shY(ts_int l,ts_int m,ts_double theta,ts_double fi);
 
-
+ts_bool *cart2sph(ts_coord *coord, ts_double x, ts_double y, ts_double z);
 ts_bool precomputeShCoeff(ts_spharm *sph);
 ts_spharm *sph_init(ts_vertex_list *vlist, ts_uint l);
 ts_bool sph_free(ts_spharm *sph);
-
+ts_double getR0(ts_vesicle *vesicle);
+ts_bool preparationSh(ts_vesicle *vesicle, ts_double r0);
+ts_bool calculateYlmi(ts_vesicle *vesicle);
+ts_bool calculateUlm(ts_vesicle *vesicle);
 #endif

--
Gitblit v1.9.3