1
0
Fork 0
mirror of https://github.com/cosmo-sims/MUSIC.git synced 2024-09-19 17:03:46 +02:00

cleanup and fixes. k-space sampling still needs proper testing (and likely some more fixes)

This commit is contained in:
Oliver Hahn 2013-10-24 12:48:35 +02:00
parent 9ee8a0a6a9
commit f19103d266
2 changed files with 5 additions and 10 deletions

View file

@ -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;
}

View file

@ -737,8 +737,9 @@ void normalize_density( grid_hierarchy& delta )
void coarsen_density( const refinement_hierarchy& rh, GridHierarchy<real_t>& 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<real_t>& 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)) );
}