Commit d9d335cb authored by Pierre Kraemer's avatar Pierre Kraemer

Merge branch 'develop' into 'master'

Develop



See merge request !84
parents 44801e31 1729eb93
......@@ -14,9 +14,9 @@ Linux
=====
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 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**
......
......@@ -66,7 +66,7 @@ private:
static double SHEvalCartesian_Error(double x, double y, double z, void* 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();
}
......
......@@ -66,7 +66,7 @@ private:
static double SHEvalCartesian_Error(double x, double y, double z, void* 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();
}
......
......@@ -173,7 +173,7 @@ protected:
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);
PFP2::VEC3 c = e.evaluate_at(x, y, z);
PFP2::VEC3 c = e.evaluate_at(x, y, z, 0);
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