guilhem_lavaux/cosmotool
0
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix compilation process. Fix compile error on new compiler

Browse source
This commit is contained in:
Guilhem Lavaux 2017-08-09 17:24:54 +02:00
parent 8cbec6637c
commit 170e7b7020
4 changed files with 55 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sample/simple3DFilter.cpp
View file

@ -62,7 +62,7 @@ void computeInterpolatedField(MyTree *tree1, double boxsize, int Nres, double cx
{
double px = (rx)*boxsize/Nres-cx;
MyTree::coords c = { px, py, pz };
MyTree::coords c = { float(px), float(py), float(pz) };
double r2 = c[0]*c[0]+c[1]*c[1]+c[2]*c[2];
if (r2 > rLimit2)
@ -179,7 +179,7 @@ int main(int argc, char **argv)
{
double px = (rx)*boxsize/Nres-cx;
MyTree::coords c = { px, py, pz };
MyTree::coords c = { float(px), float(py), float(pz) };
double r2 = c[0]*c[0]+c[1]*c[1]+c[2]*c[2];
if (r2 > rLimit2)

4
sample/testSmooth.cpp
View file

@ -75,7 +75,7 @@ int main()
cout << "iy=" << iy << endl;
for (uint32_t ix = 0; ix < NX; ix++)
{
MyTree::coords c = { 1.0*ix/NX, 1.0*iy/NX };
MyTree::coords c = { 1.0f*ix/NX, 1.0f*iy/NX };
smooth.fetchNeighbours(c);
smooth.addGridSite(c);
}
@ -92,7 +92,7 @@ int main()
cout << "iy=" << iy << endl;
for (uint32_t ix = 0; ix < NX; ix++)
{
MyTree::coords c = { 1.0*ix/NX, 1.0*iy/NX };
MyTree::coords c = { 1.0f*ix/NX, 1.0f*iy/NX };
smooth.fetchNeighbours(c, &state);
out.put(smooth.computeSmoothedValue(c, unit_fun, &state));