From 672ae43d88ba88cf1f4183511bd56f90c7c4d2ed Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 13 Jul 2012 13:28:26 +0000
Subject: [PATCH] merged
---
src/sh.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/sh.c b/src/sh.c
index 31df74f..0c4b06d 100644
--- a/src/sh.c
+++ b/src/sh.c
@@ -238,6 +238,7 @@
ts_bool preparationSh(ts_vesicle *vesicle, ts_double r0){
//TODO: before calling or during the call calculate area of each triangle! Can
//be also done after vertexmove and bondflip //
+//DONE: in energy calculation! //
ts_uint i,j;
ts_vertex **vtx=vesicle->vlist->vtx;
ts_vertex *cvtx;
@@ -342,7 +343,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 !!!
@@ -371,7 +372,8 @@
ts_int i,j;
for(i=0;i<sph->l;i++){
for(j=0;j<2*i+1;j++){
- sph->sumUlm2[i][j]+=sph->ulm[i][j]* sph->ulm[i][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++;
--
Gitblit v1.9.3