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

merging upstream changes

Browse source
This commit is contained in:
Oliver Hahn 2013-10-24 10:53:40 +02:00
commit ccaf6762bd
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/convex_hull.hh
View file

@ -273,6 +273,10 @@ struct convex_hull{
{
faceidx_L_.reserve(npoints_*3);
faceidx_U_.reserve(npoints_*3);
normals_L_.reserve(npoints_*3);
normals_U_.reserve(npoints_*3);
x0_L_.reserve(npoints_*3);
x0_U_.reserve(npoints_*3);
size_t i,j,l;
for( i=0, l=1; l<npoints_; ++l )

8
plugins/output_arepo.cc
View file

@ -226,12 +226,12 @@ public:
if( levelmin_ != levelmax_ )
{
double lxref[3];
double lxref[3], x0ref[3], x1ref[3];
double pmgrid_new;
std::string temp = cf.getValue<std::string>( "setup", "ref_extent" );
std::remove_if(temp.begin(),temp.end(),isspace);
sscanf( temp.c_str(), "%lf,%lf,%lf", &lxref[0],&lxref[1],&lxref[2] );
the_region_generator->get_AABB(x0ref,x1ref,levelmax_); // generalized beyond box
for (int i=0; i < 3; i++)
lxref[i] = x1ref[i] - x0ref[i];
// fraction box length of the zoom region
lxref[0] = pow( (lxref[0]*lxref[1]*lxref[2]),0.333 );