From 80f2a33e4b55c7259bdb4bff66a0ce12b96edd80 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Mon, 11 Jul 2016 19:29:28 +0000
Subject: [PATCH] Merge branch 'master' of bitbucket.org:samop/trisurf-ng

---
 src/sh.h |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/sh.h b/src/sh.h
index 67aeb59..ae5cd3e 100644
--- a/src/sh.h
+++ b/src/sh.h
@@ -1,11 +1,13 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
 #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 sph2cart(ts_coord *coord);
 ts_bool precomputeShCoeff(ts_spharm *sph);
 ts_spharm *sph_init(ts_vertex_list *vlist, ts_uint l);
 ts_bool sph_free(ts_spharm *sph);
@@ -13,4 +15,5 @@
 ts_bool preparationSh(ts_vesicle *vesicle, ts_double r0);
 ts_bool calculateYlmi(ts_vesicle *vesicle);
 ts_bool calculateUlm(ts_vesicle *vesicle);
+ts_bool saveAvgUlm2(ts_vesicle *vesicle);
 #endif

--
Gitblit v1.9.3