From f19103d2669cd3bc13198927f9f827f3e75e421b Mon Sep 17 00:00:00 2001 From: Oliver Hahn Date: Thu, 24 Oct 2013 12:48:35 +0200 Subject: [PATCH] cleanup and fixes. k-space sampling still needs proper testing (and likely some more fixes) --- convolution_kernel.cc | 6 ------ densities.cc | 9 +++++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/convolution_kernel.cc b/convolution_kernel.cc index 06b503d..84cd7ff 100644 --- a/convolution_kernel.cc +++ b/convolution_kernel.cc @@ -281,14 +281,8 @@ namespace convolution{ } - - - - LOGINFO("l = (%f,%f,%f) ",cparam_.lx, cparam_.ly, cparam_.lz ); - //volfac_ = 1.0/(cparam_.lx*cparam_.ly*cparam_.lz); - return this; } diff --git a/densities.cc b/densities.cc index aa26b01..4efca46 100644 --- a/densities.cc +++ b/densities.cc @@ -737,8 +737,9 @@ void normalize_density( grid_hierarchy& delta ) void coarsen_density( const refinement_hierarchy& rh, GridHierarchy& u ) { unsigned levelmin_TF = rh.levelmin(); - - for( unsigned i=levelmin_TF+1; i<=rh.levelmax(); ++i ) + + //for( unsigned i=levelmin_TF+1; i<=rh.levelmax(); ++i ) + for( unsigned i=1; i<=rh.levelmax(); ++i ) { if( rh.offset(i,0) != u.get_grid(i)->offset(0) || rh.offset(i,1) != u.get_grid(i)->offset(1) @@ -752,8 +753,8 @@ void coarsen_density( const refinement_hierarchy& rh, GridHierarchy& u ) } } - //for( int i=rh.levelmax(); i>0; --i ) - // mg_straight().restrict( *(u.get_grid(i)), *(u.get_grid(i-1)) ); + for( int i=rh.levelmax(); i>0; --i ) + mg_straight().restrict( *(u.get_grid(i)), *(u.get_grid(i-1)) ); }