From 7b0a49834d98d840882b26564641debcb957d207 Mon Sep 17 00:00:00 2001 From: Simon Layton Date: Tue, 23 Apr 2013 10:19:55 -0400 Subject: [PATCH] Changes to comply with new Vec class from Cris --- Makefile.inc | 2 +- kernel/StokesSpherical.hpp | 16 ++++++++-------- serialrun_stresslet.cpp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index d84292e..238c691 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -5,6 +5,6 @@ FMMW_DIR = . # External libraries -BOOST_DIR = /usr/include +BOOST_DIR = /usr/local/include FFTW_DIR = /usr/include GSL_DIR = /usr/include diff --git a/kernel/StokesSpherical.hpp b/kernel/StokesSpherical.hpp index e1d480b..56c1600 100644 --- a/kernel/StokesSpherical.hpp +++ b/kernel/StokesSpherical.hpp @@ -248,10 +248,10 @@ class StokesSpherical : public LaplaceSpherical complex Ynm[4*P*P], YnmTheta[4*P*P]; point_type dist = target - center; point_type gradient[4]; // = {0.,0.,0.,0.}; - gradient[0] = 0.; - gradient[1] = 0.; - gradient[2] = 0.; - gradient[3] = 0.; + gradient[0] = point_type(0.); + gradient[1] = point_type(0.); + gradient[2] = point_type(0.); + gradient[3] = point_type(0.); point_type cartesian(0); real r, theta, phi; @@ -357,10 +357,10 @@ class StokesSpherical : public LaplaceSpherical complex Ynm[4*P*P], YnmTheta[4*P*P]; point_type dist = target - center; point_type gradient[4]; // = {0.,0.,0.,0.}; - gradient[0] = 0.; - gradient[1] = 0.; - gradient[2] = 0.; - gradient[3] = 0.; + gradient[0] = point_type(0.); + gradient[1] = point_type(0.); + gradient[2] = point_type(0.); + gradient[3] = point_type(0.); point_type cartesian(0); real r, theta, phi; diff --git a/serialrun_stresslet.cpp b/serialrun_stresslet.cpp index c78b504..559f8f4 100644 --- a/serialrun_stresslet.cpp +++ b/serialrun_stresslet.cpp @@ -180,7 +180,7 @@ int main(int argc, char **argv) for (unsigned k = 0; k < exact.size(); ++k) { auto exact_val = exact[k]; auto fmm_val = result[sample_map[k]]; - std::cout << exact_val << " : " << fmm_val << std::endl; + // std::cout << exact_val << " : " << fmm_val << std::endl; for (unsigned i=0; i < 3; i++) { rdiff[i] += (fmm_val[i]-exact_val[i])*(fmm_val[i]-exact_val[i]);