Skip to content

Commit

Permalink
Changes to comply with new Vec class from Cris
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Layton committed Apr 23, 2013
1 parent 50c2e04 commit 7b0a498
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile.inc
Expand Up @@ -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
16 changes: 8 additions & 8 deletions kernel/StokesSpherical.hpp
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion serialrun_stresslet.cpp
Expand Up @@ -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]);
Expand Down

0 comments on commit 7b0a498

Please sign in to comment.