Merge branch 'master' of bitbucket.org:glavaux/cosmotool
This commit is contained in:
commit
0b77b010e4
11 changed files with 243 additions and 226 deletions
|
@ -108,7 +108,7 @@ int main(int argc, char **argv)
|
|||
H5::H5File in_f(fname1, 0);
|
||||
H5::H5File out_f(outFile, H5F_ACC_TRUNC);
|
||||
array_type v1_data;
|
||||
uint32_t N1_points, N2_points;
|
||||
uint64_t N1_points, N2_points;
|
||||
|
||||
array3_type bins(boost::extents[Nres][Nres][Nres]);
|
||||
|
||||
|
@ -124,12 +124,12 @@ int main(int argc, char **argv)
|
|||
MyCell *allCells_1 = new MyCell[N1_points];
|
||||
|
||||
#pragma omp parallel for schedule(static)
|
||||
for (long i = 0; i < Nres*Nres*Nres; i++)
|
||||
for (uint32_t i = 0; i < Nres*Nres*Nres; i++)
|
||||
bins.data()[i] = 0;
|
||||
|
||||
cout << "Shuffling data in cells..." << endl;
|
||||
#pragma omp parallel for schedule(static)
|
||||
for (int i = 0 ; i < N1_points; i++)
|
||||
for (uint64_t i = 0 ; i < N1_points; i++)
|
||||
{
|
||||
for (int j = 0; j < 3; j++)
|
||||
allCells_1[i].coord[j] = v1_data[i][j];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue