tests: Re-organise the adaptive MLSDC tests a bit.

Signed-off-by: Matthew Emmett <[email protected]>

Author: memmett

tests/examples/advection_diffusion/test_advection_diffusion.cpp

@@ -35,39 +35,43 @@ TEST(ErrorTest, VanillaSDC)
   auto get_iter  = [](const vtype x) { return get<1>(get<0>(x)); };
   auto get_error = [](const vtype x) { return get<1>(x); };
 
-  {
-    auto errors = run_vanilla_sdc(0.0);
-    auto max_iter = get_iter(*std::max_element(errors.begin(), errors.end(),
-                                               [get_iter](const vtype p1, const vtype p2) { return get_iter(p1) < get_iter(p2); }));
-
-    vector<double> tol = { 7e-9, 7e-9, 7e-9, 7e-9 };
-    vector<double> err;
-    for (auto& x: errors) {
-      if (get_iter(x) == max_iter) {
-        err.push_back(get_error(x));
-      }
-    }
+  auto errors = run_vanilla_sdc(0.0);
+  auto max_iter = get_iter(*std::max_element(errors.begin(), errors.end(),
+                                             [get_iter](const vtype p1, const vtype p2) { return get_iter(p1) < get_iter(p2); }));
 
-    EXPECT_THAT(err, testing::Pointwise(DoubleLess(), tol));
-    ASSERT_EQ(max_iter, (size_t)3);
+  vector<double> tol = { 7e-9, 7e-9, 7e-9, 7e-9 };
+  vector<double> err;
+  for (auto& x: errors) {
+    if (get_iter(x) == max_iter) {
+      err.push_back(get_error(x));
+    }
   }
 
-  {
-    auto errors = run_vanilla_sdc(1.e-6);
-    auto max_iter = get_iter(*std::max_element(errors.begin(), errors.end(),
-                                               [get_iter](const vtype p1, const vtype p2) { return get_iter(p1) < get_iter(p2); }));
-
-    vector<double> tol = { 5e-8, 5e-8, 5e-8, 5e-8 };
-    vector<double> err;
-    for (auto& x: errors) {
-      if (get_iter(x) == max_iter) {
-        err.push_back(get_error(x));
-      }
-    }
+  EXPECT_THAT(err, testing::Pointwise(DoubleLess(), tol));
+  ASSERT_EQ(max_iter, (size_t) 3);
+}
+
+TEST(AdaptiveErrorTest, VanillaSDC)
+{
+  typedef error_map::value_type vtype;
 
-    EXPECT_THAT(err, testing::Pointwise(DoubleLess(), tol));
-    ASSERT_EQ(max_iter, (size_t)2);
+  auto get_iter  = [](const vtype x) { return get<1>(get<0>(x)); };
+  auto get_error = [](const vtype x) { return get<1>(x); };
+
+  auto errors = run_vanilla_sdc(1.e-6);
+  auto max_iter = get_iter(*std::max_element(errors.begin(), errors.end(),
+                                             [get_iter](const vtype p1, const vtype p2) { return get_iter(p1) < get_iter(p2); }));
+
+  vector<double> tol = { 5e-8, 5e-8, 5e-8, 5e-8 };
+  vector<double> err;
+  for (auto& x: errors) {
+    if (get_iter(x) == max_iter) {
+      err.push_back(get_error(x));
+    }
   }
+
+  EXPECT_THAT(err, testing::Pointwise(DoubleLess(), tol));
+  ASSERT_EQ(max_iter, (size_t) 2);
 }
 
 TEST(ErrorTest, SerialMLSDC)