From 3b39021cfdf157d35ce3475fb33b2c7a35bce676 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 27 Jun 2012 14:09:49 +0000
Subject: [PATCH] Debugged the spherical harmonics
---
src/sh.c | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/src/sh.c b/src/sh.c
index 12a6ce4..ea050b9 100644
--- a/src/sh.c
+++ b/src/sh.c
@@ -69,7 +69,7 @@
}
/* Gives you legendre polynomials. Taken from NR, p. 254 */
-ts_double plgndr(ts_int l, ts_int m, ts_float x){
+ts_double plgndr(ts_int l, ts_int m, ts_double x){
ts_double fact, pll, pmm, pmmp1, somx2;
ts_int i,ll;
@@ -120,7 +120,9 @@
}
+/** @brief: Precomputes coefficients that are required for spherical harmonics computations.
+*/
ts_bool precomputeShCoeff(ts_spharm *sph){
ts_int i,j,al,am;
ts_double **co=sph->co;
@@ -141,7 +143,16 @@
}
-/*Computes Y(l,m,theta,fi) (Miha's definition that is different from common definition for factor srqt(1/(2*pi)) */
+/** @brief: Computes Y(l,m,theta,fi)
+ *
+ * Function calculates Y^l_m for vertex with given (\theta, \fi) coordinates in
+ * spherical coordinate system.
+ * @param l is an ts_int argument.
+ * @param m is an ts_int argument.
+ * @param theta is ts_double argument.
+ * @param fi is a ts_double argument.
+ *
+ * (Miha's definition that is different from common definition for factor srqt(1/(2*pi)) */
ts_double shY(ts_int l,ts_int m,ts_double theta,ts_double fi){
ts_double fac1, fac2, K;
int i;
@@ -263,7 +274,7 @@
r=sqrtl(cvtx->x*cvtx->x+cvtx->y*cvtx->y+cvtx->z*cvtx->z);
#endif
cvtx->relR=(r-r0)/r0;
- cvtx->solAngle=cvtx->projArea/cvtx->relR * cvtx->projArea/cvtx->relR;
+ cvtx->solAngle=cvtx->projArea/r/r;
}
return TS_SUCCESS;
}
@@ -271,10 +282,11 @@
ts_bool calculateYlmi(ts_vesicle *vesicle){
- ts_uint i,j,k;
+ ts_int i,j,k;
ts_spharm *sph=vesicle->sphHarmonics;
ts_coord *coord=(ts_coord *)malloc(sizeof(ts_coord));
ts_double fi, theta;
+ ts_int m;
ts_vertex *cvtx;
for(k=0;k<vesicle->vlist->n;k++){
cvtx=vesicle->vlist->vtx[k];
@@ -282,13 +294,34 @@
cart2sph(coord,cvtx->x, cvtx->y, cvtx->z);
fi=coord->e2;
theta=coord->e3;
- for(i=0; i<sph->l; i++){
+ for(i=1; i<sph->l; i++){
for(j=0;j<i;j++){
- sph->Ylmi[i][j][k]=sph->co[i][j]*cos((j-i-1)*fi)*pow(-1,j-i-1)*plgndr(i,abs(j-i-1),cos(theta));
+ m=j+1;
+//Nastudiraj!!!!!
+ sph->Ylmi[i][j][k]=sph->co[i][m]*cos((m-i-1)*fi)*pow(-1,m-i-1)*plgndr(i,abs(m-i-1),cos(theta));
+ if(i==2 && j==0){
+ /* fprintf(stderr," **** vtx %d ****\n", k+1);
+ fprintf(stderr,"m-i-1 =%d\n",m-i-1);
+ fprintf(stderr,"fi =%e\n",fi);
+ fprintf(stderr,"(m-i-1)*fi =%e\n",((ts_double)(m-i-1))*fi);
+ fprintf(stderr,"-2*fi =%e\n",-2*fi);
+ fprintf(stderr,"m =%d\n",m);
+
+ fprintf(stderr," cos(m-i-1)=%e\n",cos((m-i-1)*fi));
+ fprintf(stderr," cos(-2*fi)=%e\n",cos(-2*fi));
+ fprintf(stderr," sph->co[i][m]=%e\n",sph->co[i][m]);
+ fprintf(stderr," plgndr(i,abs(m-i-1),cos(theta))=%e\n",plgndr(i,abs(m-i-1),cos(theta)));
+*/
+ }
}
- sph->Ylmi[i][j+1][k]=sph->co[i][j+1]*plgndr(i,0,cos(theta));
- for(j=sph->l;j<2*i;j++){
- sph->Ylmi[i][j][k]=sph->co[i][j]*sin((j-i-1)*fi)*plgndr(i,j-i-1,cos(theta));
+//Nastudiraj!!!!!
+ j=i;
+ m=j+1;
+ sph->Ylmi[i][j][k]=sph->co[i][m]*plgndr(i,0,cos(theta));
+ for(j=i+1;j<2*i+1;j++){
+ m=j+1;
+//Nastudiraj!!!!!
+ sph->Ylmi[i][j][k]=sph->co[i][m]*sin((m-i-1)*fi)*plgndr(i,m-i-1,cos(theta));
}
}
@@ -312,7 +345,7 @@
for(k=0;k<vesicle->vlist->n; k++){
cvtx=vesicle->vlist->vtx[k];
for(i=0;i<vesicle->sphHarmonics->l;i++){
- for(j=0;j<2*i;j++){
+ for(j=0;j<2*i+1;j++){
vesicle->sphHarmonics->ulm[i][j]+= cvtx->solAngle*cvtx->relR*vesicle->sphHarmonics->Ylmi[i][j][k];
}
--
Gitblit v1.9.3