From 91c712c267f72f0dbbe865fec9d2eefd77ff8c0e Mon Sep 17 00:00:00 2001 From: Samo <samo@beti.(none)> Date: Tue, 10 Jul 2012 05:36:21 +0000 Subject: [PATCH] Fixede bug in spherical harmonics. Added new test program with initial shape relaxation to sphere --- src/Makefile.am | 3 +++ src/spherical_trisurf.c | 2 +- src/sh.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d1ae2ab..90d92c2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,3 +12,6 @@ spherical_trisurfdir=../ spherical_trisurf_PROGRAMS = spherical_trisurf spherical_trisurf_SOURCES = general.c vertex.c bond.c triangle.c cell.c vesicle.c initial_distribution.c io.c frame.c energy.c timestep.c vertexmove.c spherical_trisurf.c sh.c +spherical_trisurf_ffdir=../ +spherical_trisurf_ff_PROGRAMS = spherical_trisurf_ff +spherical_trisurf_ff_SOURCES = general.c vertex.c bond.c triangle.c cell.c vesicle.c initial_distribution.c io.c frame.c energy.c timestep.c vertexmove.c spherical_trisurf_ff.c sh.c diff --git a/src/sh.c b/src/sh.c index baeb8f9..a792715 100644 --- a/src/sh.c +++ b/src/sh.c @@ -343,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 !!! diff --git a/src/spherical_trisurf.c b/src/spherical_trisurf.c index 8ede5f4..feba26a 100644 --- a/src/spherical_trisurf.c +++ b/src/spherical_trisurf.c @@ -44,7 +44,7 @@ -for(i=0;i<5;i++){ +for(i=0;i<10000;i++){ cell_occupation(vesicle); for(j=0;j<1000;j++){ single_timestep(vesicle); -- Gitblit v1.9.3