Merge branch 'master' of bitbucket.org:samop/trisurf-ng

Samo

2012-07-10 8f94c84216247a1edd9f6cf756a167be35ed8057

Merge branch 'master' of bitbucket.org:samop/trisurf-ng

 src/co_test.c

@@ -40,8 +40,10 @@

preparationSh(vesicle,r0);
calculateYlmi(vesicle);
/*
ts_coord *coord=(ts_coord *)malloc(sizeof(ts_coord));
ts_double fi, theta;

  for(i=0;i<vesicle->vlist->n;i++){

    cart2sph(coord,vesicle->vlist->vtx[i]->x, vesicle->vlist->vtx[i]->y, vesicle->vlist->vtx[i]->z);
@@ -54,15 +56,15 @@
    }

free(coord);
*/
calculateUlm(vesicle);

for(i=0;i<vesicle->sphHarmonics->l;i++){
    for(j=0;j<2*i+1;j++){
    fprintf(stderr,"ulm(%d,%d)=%e\n",i,j+1,vesicle->sphHarmonics->ulm[i][j]);
    }
}


storeUlm2(vesicle);

sph_free(vesicle->sphHarmonics);
vesicle_free(vesicle);

 src/sh.c

@@ -372,6 +372,7 @@
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];
    }
}