Commit 1729eb93 authored by Pierre Kraemer's avatar Pierre Kraemer

fix ambiguous call (SphericalHarmonics : evaluate_at)

parent 5e6ce870
...@@ -14,9 +14,9 @@ Linux ...@@ -14,9 +14,9 @@ Linux
===== =====
Dependencies Dependencies
------------ ------------
* install for following package cmake cmake-curses-gui cmake-qt-gui libXi-dev libXmu-dev libglew-dev zlib1g-dev uuid-dev libgsl0-dev libsuitesparse-dev python27 * install for following package cmake cmake-curses-gui cmake-qt-gui libXi-dev libXmu-dev libglew-dev zlib1g-dev uuid-dev libgsl0-dev libsuitesparse-dev python2.7-dev
* for Qt4: libqt4-dev qt4-dev-tools qtcreator * for Qt4: libqt4-dev qt4-dev-tools qtcreator
* for Qt5: qt5-default qtbase5-dev-tools qtcreator * for Qt5: qt5-default qtbase5-dev-tools qtcreator libqt5svg5-dev libqt5opengl5-dev
**Supported compilers: g++ 4.8 or greater** **Supported compilers: g++ 4.8 or greater**
......
...@@ -66,7 +66,7 @@ private: ...@@ -66,7 +66,7 @@ private:
static double SHEvalCartesian_Error(double x, double y, double z, void* u) static double SHEvalCartesian_Error(double x, double y, double z, void* u)
{ {
SH& e = *(SH*)(u); SH& e = *(SH*)(u);
VEC3 c = e.evaluate_at(x, y, z); VEC3 c = e.evaluate_at(x, y, z, 0);
return c.norm2(); return c.norm2();
} }
......
...@@ -66,7 +66,7 @@ private: ...@@ -66,7 +66,7 @@ private:
static double SHEvalCartesian_Error(double x, double y, double z, void* u) static double SHEvalCartesian_Error(double x, double y, double z, void* u)
{ {
SH& e = *(SH*)(u); SH& e = *(SH*)(u);
VEC3 c = e.evaluate_at(x, y, z); VEC3 c = e.evaluate_at(x, y, z, 0);
return c.norm2(); return c.norm2();
} }
......
...@@ -173,7 +173,7 @@ protected: ...@@ -173,7 +173,7 @@ protected:
static double SHEvalCartesian_Error(double x, double y, double z, void* u) static double SHEvalCartesian_Error(double x, double y, double z, void* u)
{ {
Utils::SphericalHarmonics<PFP2::REAL, PFP2::VEC3>& e = *(Utils::SphericalHarmonics<PFP2::REAL, PFP2::VEC3>*)(u); Utils::SphericalHarmonics<PFP2::REAL, PFP2::VEC3>& e = *(Utils::SphericalHarmonics<PFP2::REAL, PFP2::VEC3>*)(u);
PFP2::VEC3 c = e.evaluate_at(x, y, z); PFP2::VEC3 c = e.evaluate_at(x, y, z, 0);
return c.norm2(); return c.norm2();
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment