From b36841fb1903e9945cb4a1dbc4dd7761556e07e2 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Mon, 28 Apr 2014 10:40:08 +0000
Subject: [PATCH] Merge branch 'trout-rbc'
---
src/sh.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/src/sh.c b/src/sh.c
index baeb8f9..f5c310a 100644
--- a/src/sh.c
+++ b/src/sh.c
@@ -49,6 +49,7 @@
ts_bool sph_free(ts_spharm *sph){
int i,j;
+ if(sph==NULL) return TS_FAIL;
for(i=0;i<sph->l;i++){
if(sph->ulm[i]!=NULL) free(sph->ulm[i]);
if(sph->sumUlm2[i]!=NULL) free(sph->sumUlm2[i]);
@@ -189,7 +190,7 @@
K=-sqrt(1.0/(M_PI))*cos(m*fi);
}
- return K*sqrt((2.0*l+1.0)/2.0*fac1/fac2)*plgndr(l,abs(m),cos(theta));
+ return K*sqrt((2.0*l+1.0)/2.0*(ts_double)(fac1/fac2))*plgndr(l,abs(m),cos(theta));
}
@@ -200,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
@@ -218,6 +219,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){
@@ -343,7 +361,7 @@
ts_uint i,j,k;
ts_vertex *cvtx;
for(i=0;i<vesicle->sphHarmonics->l;i++){
- for(j=0;j<2*i;j++) vesicle->sphHarmonics->ulm[i][j]=0.0;
+ for(j=0;j<2*i+1;j++) vesicle->sphHarmonics->ulm[i][j]=0.0;
}
//TODO: call calculateYlmi !!!
@@ -372,9 +390,35 @@
ts_int i,j;
for(i=0;i<sph->l;i++){
for(j=0;j<2*i+1;j++){
+ /* DEBUG fprintf(stderr,"sph->sumUlm2[%d][%d]=%e\n",i,j,sph->ulm[i][j]* sph->ulm[i][j]); */
sph->sumUlm2[i][j]+=sph->ulm[i][j]* sph->ulm[i][j];
}
}
sph->N++;
return TS_SUCCESS;
}
+
+
+ts_bool saveAvgUlm2(ts_vesicle *vesicle){
+
+ FILE *fh;
+
+ fh=fopen("sph2out.dat", "w");
+ if(fh==NULL){
+ err("Cannot open file %s for writing");
+ return TS_FAIL;
+ }
+
+ ts_spharm *sph=vesicle->sphHarmonics;
+ ts_int i,j;
+ fprintf(fh,"l,\tm,\tulm^2avg\n");
+ for(i=0;i<sph->l;i++){
+ for(j=0;j<2*i+1;j++){
+ fprintf(fh,"%d,\t%d,\t%e\n", i, j-i, sph->sumUlm2[i][j]/(ts_double)sph->N);
+
+ }
+ fprintf(fh,"\n");
+ }
+ fclose(fh);
+ return TS_SUCCESS;
+}
--
Gitblit v1.9.3