From e9c87efeb9235748e8d19a3f5a067ec442d8a500 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Thu, 17 Apr 2014 07:32:43 +0000
Subject: [PATCH] Changed atan to atan2 for transfroming coordinates from cartesian to spherical. Added function for reverse transformation
---
src/sh.h | 1 +
src/sh.c | 19 ++++++++++++++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/sh.c b/src/sh.c
index 5ab56eb..f5c310a 100644
--- a/src/sh.c
+++ b/src/sh.c
@@ -201,7 +201,7 @@
#ifdef TS_DOUBLE_DOUBLE
coord->e1=sqrt(x*x+y*y+z*z);
if(z==0) coord->e3=M_PI/2.0;
- else coord->e3=atan(sqrt(x*x+y*y)/z);
+ else coord->e3=atan2(sqrt(x*x+y*y),z);
coord->e2=atan2(y,x);
#endif
#ifdef TS_DOUBLE_FLOAT
@@ -220,6 +220,23 @@
return TS_SUCCESS;
}
+
+ts_bool sph2cart(ts_coord *coord){
+ coord->coord_type=TS_COORD_CARTESIAN;
+ ts_double x,y,z;
+
+ x=coord->e1*cos(coord->e2)*sin(coord->e3);
+ y=coord->e1*sin(coord->e2)*sin(coord->e3);
+ z=coord->e1*cos(coord->e3);
+
+ coord->e1=x;
+ coord->e2=y;
+ coord->e3=z;
+
+ return TS_SUCCESS;
+}
+
+
/* Function returns radius of the sphere with the same volume as vesicle (r0) */
ts_double getR0(ts_vesicle *vesicle){
ts_double r0;
diff --git a/src/sh.h b/src/sh.h
index 32df46b..dabece2 100644
--- a/src/sh.h
+++ b/src/sh.h
@@ -6,6 +6,7 @@
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);
--
Gitblit v1.9.3