From d52214ab921ed06bdef24c105e1eb57a7f9a6247 Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 3 Jul 2001 11:42:42 +0000 Subject: [PATCH] Fix missing std::s and disambiguate call to sqrt(int). git-svn-id: https://svn.dealii.org/trunk@4803 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/grid/grid_generator.cc | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/deal.II/deal.II/source/grid/grid_generator.cc b/deal.II/deal.II/source/grid/grid_generator.cc index ba4e69ee28..9f9f012451 100644 --- a/deal.II/deal.II/source/grid/grid_generator.cc +++ b/deal.II/deal.II/source/grid/grid_generator.cc @@ -656,32 +656,32 @@ GridGenerator::hyper_ball (Triangulation<3> &tria, // altogether Assert(false, ExcNotImplemented()); - const double a = 1./(1+std::sqrt(3)); // equilibrate cell sizes at transition - // from the inner part to the radial - // cells + const double a = 1./(1+std::sqrt(3.0)); // equilibrate cell sizes at transition + // from the inner part to the radial + // cells const unsigned int n_vertices = 16; const Point<3> vertices[n_vertices] = { // first the vertices of the inner // cell - p+Point<3>(-1,-1,-1)*(radius/sqrt(3)*a), - p+Point<3>(+1,-1,-1)*(radius/sqrt(3)*a), - p+Point<3>(+1,+1,-1)*(radius/sqrt(3)*a), - p+Point<3>(-1,+1,-1)*(radius/sqrt(3)*a), - p+Point<3>(-1,-1,+1)*(radius/sqrt(3)*a), - p+Point<3>(+1,-1,+1)*(radius/sqrt(3)*a), - p+Point<3>(+1,+1,+1)*(radius/sqrt(3)*a), - p+Point<3>(-1,+1,+1)*(radius/sqrt(3)*a), + p+Point<3>(-1,-1,-1)*(radius/std::sqrt(3.0)*a), + p+Point<3>(+1,-1,-1)*(radius/std::sqrt(3.0)*a), + p+Point<3>(+1,+1,-1)*(radius/std::sqrt(3.0)*a), + p+Point<3>(-1,+1,-1)*(radius/std::sqrt(3.0)*a), + p+Point<3>(-1,-1,+1)*(radius/std::sqrt(3.0)*a), + p+Point<3>(+1,-1,+1)*(radius/std::sqrt(3.0)*a), + p+Point<3>(+1,+1,+1)*(radius/std::sqrt(3.0)*a), + p+Point<3>(-1,+1,+1)*(radius/std::sqrt(3.0)*a), // now the eight vertices at // the outer sphere - p+Point<3>(-1,-1,-1)*(radius/sqrt(3)), - p+Point<3>(+1,-1,-1)*(radius/sqrt(3)), - p+Point<3>(+1,+1,-1)*(radius/sqrt(3)), - p+Point<3>(-1,+1,-1)*(radius/sqrt(3)), - p+Point<3>(-1,-1,+1)*(radius/sqrt(3)), - p+Point<3>(+1,-1,+1)*(radius/sqrt(3)), - p+Point<3>(+1,+1,+1)*(radius/sqrt(3)), - p+Point<3>(-1,+1,+1)*(radius/sqrt(3)) + p+Point<3>(-1,-1,-1)*(radius/std::sqrt(3.0)), + p+Point<3>(+1,-1,-1)*(radius/std::sqrt(3.0)), + p+Point<3>(+1,+1,-1)*(radius/std::sqrt(3.0)), + p+Point<3>(-1,+1,-1)*(radius/std::sqrt(3.0)), + p+Point<3>(-1,-1,+1)*(radius/std::sqrt(3.0)), + p+Point<3>(+1,-1,+1)*(radius/std::sqrt(3.0)), + p+Point<3>(+1,+1,+1)*(radius/std::sqrt(3.0)), + p+Point<3>(-1,+1,+1)*(radius/std::sqrt(3.0)) }; // one needs to draw the seven cubes to -- 2.39.5