From bd826de2f539f2e48c8c01d2d7f9f34c7e97104a Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 13 May 2016 07:43:27 +0000
Subject: [PATCH] Fix in trisurf output, inhibiting print of successful reconstruction. Multiple fixes and improvements in python module. Added symlinking of tapes into the running directories and dumping tapes from snapshots into tape files.
---
src/shcomplex.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/shcomplex.c b/src/shcomplex.c
index 7afe27e..5dc6a97 100644
--- a/src/shcomplex.c
+++ b/src/shcomplex.c
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
#include<math.h>
#include<stdlib.h>
#include<gsl/gsl_complex.h>
@@ -130,9 +131,9 @@
}
-ts_double calculateKc(ts_vesicle *vesicle){
- ts_int min=4;
- ts_int max=vesicle->sphHarmonics->l-6;
+ts_double calculateKc(ts_vesicle *vesicle, ts_int lmin, ts_int lmax){
+ ts_int min=lmin;
+ ts_int max=lmax; //vesicle->sphHarmonics->l-3;
ts_long i,j;
ts_double retval, bval;
gsl_matrix *A=gsl_matrix_alloc(max-min,2);
@@ -146,7 +147,7 @@
for(i=min;i<max;i++){
gsl_matrix_set(A, i-min,0,(ts_double)((i-1)*(i+2)));
gsl_matrix_set(A, i-min,1,(ts_double)((i-1)*(i+2)*(i+1)*i));
- fprintf(stderr,"%e %e\n", gsl_matrix_get(A,i-min,0), gsl_matrix_get(A,i-min,1));
+// fprintf(stderr,"%e %e\n", gsl_matrix_get(A,i-min,0), gsl_matrix_get(A,i-min,1));
bval=0.0;
//average for m from 0..l (only positive m's)
for(j=0;j<=i;j++){
@@ -155,7 +156,7 @@
bval=bval/(ts_double)vesicle->sphHarmonics->N/(ts_double)(i+1);
gsl_vector_set(b,i-min,1.0/bval);
- fprintf(stderr,"%e\n", 1.0/gsl_vector_get(b,i-min));
+// fprintf(stderr,"%e\n", 1.0/gsl_vector_get(b,i-min));
}
// fprintf(stderr,"b[2]=%e\n",gsl_vector_get(b,1));
gsl_linalg_QR_decomp(A,tau);
--
Gitblit v1.9.3