mirror of
https://github.com/cosmo-sims/MUSIC.git
synced 2024-09-19 17:03:46 +02:00
updated output plugins to use new masking/refinement tagging API
This commit is contained in:
parent
a4f6909982
commit
144efb78ea
5 changed files with 22 additions and 22 deletions
|
@ -320,7 +320,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
data[count++] = pmass;
|
data[count++] = pmass;
|
||||||
}
|
}
|
||||||
|
@ -359,7 +359,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
double xx[3];
|
double xx[3];
|
||||||
gh.cell_pos(ilevel, i, j, k, xx);
|
gh.cell_pos(ilevel, i, j, k, xx);
|
||||||
|
@ -385,7 +385,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
double xx[3];
|
double xx[3];
|
||||||
gh.cell_pos(ilevel, i, j, k, xx);
|
gh.cell_pos(ilevel, i, j, k, xx);
|
||||||
|
@ -418,7 +418,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
data[count++] = (*gh.get_grid(ilevel))(i,j,k) * velFac;
|
data[count++] = (*gh.get_grid(ilevel))(i,j,k) * velFac;
|
||||||
}
|
}
|
||||||
|
@ -438,7 +438,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
data[count++] = (*gh.get_grid(ilevel))(i,j,k) * velFac;
|
data[count++] = (*gh.get_grid(ilevel))(i,j,k) * velFac;
|
||||||
}
|
}
|
||||||
|
@ -470,7 +470,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
gas_data[count++] = (*gh.get_grid(ilevel))(i,j,k) * velFac;
|
gas_data[count++] = (*gh.get_grid(ilevel))(i,j,k) * velFac;
|
||||||
}
|
}
|
||||||
|
@ -520,7 +520,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
double xx[3];
|
double xx[3];
|
||||||
gh.cell_pos(ilevel, i, j, k, xx);
|
gh.cell_pos(ilevel, i, j, k, xx);
|
||||||
|
|
|
@ -663,7 +663,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
double xx[3];
|
double xx[3];
|
||||||
gh.cell_pos(ilevel, i, j, k, xx);
|
gh.cell_pos(ilevel, i, j, k, xx);
|
||||||
|
@ -727,7 +727,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
if( temp_data.size() < block_buf_size_ )
|
if( temp_data.size() < block_buf_size_ )
|
||||||
temp_data.push_back( (*gh.get_grid(ilevel))(i,j,k) * vfac );
|
temp_data.push_back( (*gh.get_grid(ilevel))(i,j,k) * vfac );
|
||||||
|
@ -793,7 +793,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
double xx[3];
|
double xx[3];
|
||||||
gh.cell_pos(ilevel, i, j, k, xx);
|
gh.cell_pos(ilevel, i, j, k, xx);
|
||||||
|
@ -858,7 +858,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
if( temp_data.size() < block_buf_size_ )
|
if( temp_data.size() < block_buf_size_ )
|
||||||
temp_data.push_back( (*gh.get_grid(ilevel))(i,j,k) * vfac );
|
temp_data.push_back( (*gh.get_grid(ilevel))(i,j,k) * vfac );
|
||||||
|
|
|
@ -686,7 +686,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
double xx[3];
|
double xx[3];
|
||||||
gh.cell_pos(ilevel, i, j, k, xx);
|
gh.cell_pos(ilevel, i, j, k, xx);
|
||||||
|
@ -764,7 +764,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
if( temp_data.size() < block_buf_size_ ){
|
if( temp_data.size() < block_buf_size_ ){
|
||||||
//snl std::cout << "coord " << coord<< " "<< i <<" " << j << " " << k << " " << (*gh.get_grid(ilevel))(i,j,k) * header_.extras[NFILL-1] << "\n" ; //snl
|
//snl std::cout << "coord " << coord<< " "<< i <<" " << j << " " << k << " " << (*gh.get_grid(ilevel))(i,j,k) * header_.extras[NFILL-1] << "\n" ; //snl
|
||||||
|
@ -823,7 +823,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
double xx[3];
|
double xx[3];
|
||||||
gh.cell_pos(ilevel, i, j, k, xx);
|
gh.cell_pos(ilevel, i, j, k, xx);
|
||||||
|
@ -896,7 +896,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
if( temp_data.size() < block_buf_size_ )
|
if( temp_data.size() < block_buf_size_ )
|
||||||
temp_data.push_back( (*gh.get_grid(ilevel))(i,j,k) * vfac );
|
temp_data.push_back( (*gh.get_grid(ilevel))(i,j,k) * vfac );
|
||||||
|
@ -953,7 +953,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
pma = ( 1 + (*gh.get_grid(ilevel))(i,j,k) ) * pmafac * pow(8.0, -1.0*(ilevel-gh.levelmin())) ;
|
pma = ( 1 + (*gh.get_grid(ilevel))(i,j,k) ) * pmafac * pow(8.0, -1.0*(ilevel-gh.levelmin())) ;
|
||||||
if( temp_data.size() < block_buf_size_ )
|
if( temp_data.size() < block_buf_size_ )
|
||||||
|
|
|
@ -1110,7 +1110,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if( !gh.is_refined(ilevel,ix,iy,iz) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
dorefine = false;
|
dorefine = false;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -705,7 +705,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
if( temp_dat.size() < block_buf_size_ )
|
if( temp_dat.size() < block_buf_size_ )
|
||||||
temp_dat.push_back( pmass );
|
temp_dat.push_back( pmass );
|
||||||
|
@ -813,7 +813,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
double xx[3];
|
double xx[3];
|
||||||
gh.cell_pos(ilevel, i, j, k, xx);
|
gh.cell_pos(ilevel, i, j, k, xx);
|
||||||
|
@ -874,7 +874,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
if( temp_data.size() < block_buf_size_ )
|
if( temp_data.size() < block_buf_size_ )
|
||||||
temp_data.push_back( (*gh.get_grid(ilevel))(i,j,k) * vfac );
|
temp_data.push_back( (*gh.get_grid(ilevel))(i,j,k) * vfac );
|
||||||
|
@ -948,7 +948,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
if( temp_data.size() < block_buf_size_ )
|
if( temp_data.size() < block_buf_size_ )
|
||||||
temp_data.push_back( (*gh.get_grid(ilevel))(i,j,k) * vfac );
|
temp_data.push_back( (*gh.get_grid(ilevel))(i,j,k) * vfac );
|
||||||
|
@ -1010,7 +1010,7 @@ public:
|
||||||
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
for( unsigned i=0; i<gh.get_grid(ilevel)->size(0); ++i )
|
||||||
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
for( unsigned j=0; j<gh.get_grid(ilevel)->size(1); ++j )
|
||||||
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
for( unsigned k=0; k<gh.get_grid(ilevel)->size(2); ++k )
|
||||||
if( ! gh.is_refined(ilevel,i,j,k) )
|
if( gh.is_in_mask(ilevel,i,j,k) && !gh.is_refined(ilevel,i,j,k) )
|
||||||
{
|
{
|
||||||
double xx[3];
|
double xx[3];
|
||||||
gh.cell_pos(ilevel, i, j, k, xx);
|
gh.cell_pos(ilevel, i, j, k, xx);
|
||||||
|
|
Loading…
Reference in a new issue