From 6c274defd904dedd6cb89c002f5eeced6c079d47 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Tue, 11 Dec 2018 11:42:22 +0000 Subject: [PATCH] Added stretching variables --- src/sh.c | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/sh.c b/src/sh.c index 9f28d2f..3f64939 100644 --- a/src/sh.c +++ b/src/sh.c @@ -1,8 +1,10 @@ +/* vim: set ts=4 sts=4 sw=4 noet : */ #include<math.h> #include<stdlib.h> #include "general.h" #include "sh.h" - +#include "io.h" +#include <string.h> ts_spharm *sph_init(ts_vertex_list *vlist, ts_uint l){ @@ -49,6 +51,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 +192,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 +203,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 +221,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){ @@ -384,8 +404,10 @@ ts_bool saveAvgUlm2(ts_vesicle *vesicle){ FILE *fh; - - fh=fopen("sph2out.dat", "w"); + char filename[10000]; + strcpy(filename, command_line_args.path); + strcat(filename, "sph2out.dat"); + fh=fopen(filename, "w"); if(fh==NULL){ err("Cannot open file %s for writing"); return TS_FAIL; -- Gitblit v1.9.3