From: David Wells Date: Sat, 5 Mar 2016 19:32:10 +0000 (-0500) Subject: Fix the failing indentation. X-Git-Tag: v8.5.0-rc1~1244^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fcc4edf7ef6ed85c94accb62027d731ef71e9cf;p=dealii.git Fix the failing indentation. --- diff --git a/tests/manifold/chart_manifold_07.cc b/tests/manifold/chart_manifold_07.cc index ba50b51b58..e6738cec8c 100644 --- a/tests/manifold/chart_manifold_07.cc +++ b/tests/manifold/chart_manifold_07.cc @@ -18,8 +18,8 @@ Point<3> periodicity (/*r=*/0, - /*phi=*/2*numbers::PI, - /*z=*/0); + /*phi=*/2*numbers::PI, + /*z=*/0); class MyCylinderManifold : public ChartManifold<2,3,3> { @@ -27,7 +27,7 @@ public: static const int dim = 2; static const int spacedim = 3; static const int chartdim = 3; - + MyCylinderManifold () : ChartManifold(periodicity) @@ -44,7 +44,7 @@ public: const double r = std::sqrt(x*x + y*y); const double phi = std::atan2(y,x); - + return Point<3>(r, phi, z); @@ -58,7 +58,7 @@ public: const double r = chart_point[0]; const double phi = chart_point[1]; const double z = chart_point[2]; - + return Point<3>(r*std::cos(phi), r*std::sin(phi), z); @@ -69,7 +69,7 @@ public: push_forward_gradient(const Point &chart_point) const { DerivativeForm<1,spacedim,spacedim> g; - + const double r = chart_point[0]; const double phi = chart_point[1]; const double z = chart_point[2]; @@ -77,15 +77,15 @@ public: g[0][0] = std::cos(phi); g[0][1] = -r*std::sin(phi); g[0][2] = 0; - + g[1][0] = std::sin(phi); g[1][1] = r*std::cos(phi); g[1][2] = 0; - + g[2][0] = 0; g[2][1] = 0; g[2][2] = 1; - + return g; } }; @@ -111,44 +111,44 @@ void test() // check two points that are straight up and down from each other test_direction (manifold.push_forward (Point<3>(/*r =*/4, - /*phi=*/0.1, - /*z =*/-1)), + /*phi=*/0.1, + /*z =*/-1)), manifold.push_forward (Point<3>(/*r =*/4, - /*phi=*/0.1, - /*z =*/+2))); + /*phi=*/0.1, + /*z =*/+2))); // check two points that are radial test_direction (manifold.push_forward (Point<3>(/*r =*/1, - /*phi=*/0.1, - /*z =*/-1)), + /*phi=*/0.1, + /*z =*/-1)), manifold.push_forward (Point<3>(/*r =*/4, - /*phi=*/0.1, - /*z =*/-1))); + /*phi=*/0.1, + /*z =*/-1))); // check two points that are horizontal test_direction (manifold.push_forward (Point<3>(/*r =*/4, - /*phi=*/0, - /*z =*/-1)), + /*phi=*/0, + /*z =*/-1)), manifold.push_forward (Point<3>(/*r =*/4, - /*phi=*/numbers::PI/4, - /*z =*/-1))); + /*phi=*/numbers::PI/4, + /*z =*/-1))); // same but rotated test_direction (manifold.push_forward (Point<3>(/*r =*/4, - /*phi=*/numbers::PI/4, - /*z =*/-1)), + /*phi=*/numbers::PI/4, + /*z =*/-1)), manifold.push_forward (Point<3>(/*r =*/4, - /*phi=*/numbers::PI/2, - /*z =*/-1))); + /*phi=*/numbers::PI/2, + /*z =*/-1))); // check two points that are at the same radius but not horizontal test_direction (manifold.push_forward (Point<3>(/*r =*/4, - /*phi=*/0, - /*z =*/-1)), + /*phi=*/0, + /*z =*/-1)), manifold.push_forward (Point<3>(/*r =*/4, - /*phi=*/numbers::PI/4, - /*z =*/1))); + /*phi=*/numbers::PI/4, + /*z =*/1))); } int main () diff --git a/tests/manifold/chart_manifold_08.cc b/tests/manifold/chart_manifold_08.cc index b20297f2bc..cbf2574408 100644 --- a/tests/manifold/chart_manifold_08.cc +++ b/tests/manifold/chart_manifold_08.cc @@ -20,8 +20,8 @@ Point<3> periodicity (/*r=*/0, - /*phi=*/2*numbers::PI, - /*z=*/0); + /*phi=*/2*numbers::PI, + /*z=*/0); class MyCylinderManifold : public ChartManifold<2,3,3> { @@ -29,7 +29,7 @@ public: static const int dim = 2; static const int spacedim = 3; static const int chartdim = 3; - + MyCylinderManifold () : ChartManifold(periodicity) @@ -46,7 +46,7 @@ public: const double r = std::sqrt(x*x + y*y); const double phi = std::atan2(y,x); - + return Point<3>(r, phi, z); @@ -60,7 +60,7 @@ public: const double r = chart_point[0]; const double phi = chart_point[1]; const double z = chart_point[2]; - + return Point<3>(r*std::cos(phi), r*std::sin(phi), z); @@ -71,7 +71,7 @@ public: push_forward_gradient(const Point &chart_point) const { DerivativeForm<1,spacedim,spacedim> g; - + const double r = chart_point[0]; const double phi = chart_point[1]; const double z = chart_point[2]; @@ -79,15 +79,15 @@ public: g[0][0] = std::cos(phi); g[0][1] = -r*std::sin(phi); g[0][2] = 0; - + g[1][0] = std::sin(phi); g[1][1] = r*std::cos(phi); g[1][2] = 0; - + g[2][0] = 0; g[2][1] = 0; g[2][2] = 1; - + return g; } }; @@ -113,19 +113,19 @@ void test() // check two points that are horizontal test_direction (manifold.push_forward (Point<3>(/*r =*/2, - /*phi=*/3*numbers::PI/4, - /*z =*/-1)), + /*phi=*/3*numbers::PI/4, + /*z =*/-1)), manifold.push_forward (Point<3>(/*r =*/2, - /*phi=*/-3*numbers::PI/4, - /*z =*/-1))); + /*phi=*/-3*numbers::PI/4, + /*z =*/-1))); // same but rotated test_direction (manifold.push_forward (Point<3>(/*r =*/2, - /*phi=*/-numbers::PI/4, - /*z =*/-1)), + /*phi=*/-numbers::PI/4, + /*z =*/-1)), manifold.push_forward (Point<3>(/*r =*/2, - /*phi=*/numbers::PI/4, - /*z =*/-1))); + /*phi=*/numbers::PI/4, + /*z =*/-1))); } int main ()