Merge branch 'master' of bitbucket.org:glavaux/cosmotool

This commit is contained in:
Guilhem Lavaux 2015-02-10 13:43:20 +01:00
commit f22bd42e21

View File

@ -1,3 +1,4 @@
#include "openmp.hpp"
#include "omptl/algorithm" #include "omptl/algorithm"
#include <cassert> #include <cassert>
#include "yorick.hpp" #include "yorick.hpp"
@ -53,7 +54,7 @@ void computeInterpolatedField(MyTree *tree1, double boxsize, int Nres, double cx
{ {
double pz = (rz)*boxsize/Nres-cz; double pz = (rz)*boxsize/Nres-cz;
cout << format("[%d] %d / %d") % omp_get_thread_num() % rz % Nres << endl; cout << format("[%d] %d / %d") % smp_get_thread_id() % rz % Nres << endl;
for (int ry = 0; ry < Nres; ry++) for (int ry = 0; ry < Nres; ry++)
{ {
double py = (ry)*boxsize/Nres-cy; double py = (ry)*boxsize/Nres-cy;