Changeset 252f5c

Timestamp:

May 2, 2013, 11:58:02 AM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

092b175

Parents:

da7c98

Message:

Added tolerance parameter to Helper::AssertVectorsEqual.

Location:

src

Files:

• base/helper.cpp (modified) (1 diff)
• base/helper.hpp (modified) (1 diff)
• level/level_operator_fas.cpp (modified) (3 diffs)

src/base/helper.cpp

@@ -91 +91 @@
 }
 
-bool Helper::AssertVectorsEqual(const Vector& pos_1, const Vector& pos_2)
+bool Helper::AssertVectorsEqual(const Vector& pos_1, const Vector& pos_2, const vmg_float& tol)
 {
-  bool equal = (pos_1 - pos_2).Abs().IsComponentwiseLessOrEqual(std::numeric_limits<vmg_float>::epsilon());
+  bool equal = (pos_1 - pos_2).Abs().IsComponentwiseLessOrEqual(tol);
   assert(equal);
   return equal;

src/base/helper.hpp

@@ -191 +191 @@
   }
 
-  bool AssertVectorsEqual(const Vector& pos_1, const Vector& pos_2);
+  bool AssertVectorsEqual(const Vector& pos_1, const Vector& pos_2, const vmg_float& tol);
 
   vmg_float InterpolateTrilinear(const Vector& point, const Grid& grid);

src/level/level_operator_fas.cpp

@@ -81 +81 @@
 
   for (iter_f=bounds_f.Begin(), iter_c=bounds_c.Begin(); iter_c!=bounds_c.End(); iter_f+=2, ++iter_c) {
-    Helper::AssertVectorsEqual(sol_c_undist.GetSpatialPos(*iter_c), sol_f.GetSpatialPos(*iter_f));
+    Helper::AssertVectorsEqual(sol_c_undist.GetSpatialPos(*iter_c), sol_f.GetSpatialPos(*iter_f), 4.0 * std::numeric_limits<vmg_float>::epsilon());
     sol_c_undist(*iter_c) = op_sol.Apply(sol_f, *iter_f);
   }
@@ -88 +88 @@
 
   for (iter_f=bounds_f.Begin(), iter_c=bounds_c.Begin(); iter_c!=bounds_c.End(); iter_f+=2, ++iter_c) {
-    Helper::AssertVectorsEqual(rhs_c_undist.GetSpatialPos(*iter_c), (*res_grid).GetSpatialPos(*iter_f));
+    Helper::AssertVectorsEqual(rhs_c_undist.GetSpatialPos(*iter_c), (*res_grid).GetSpatialPos(*iter_f), 4.0 * std::numeric_limits<vmg_float>::epsilon());
     rhs_c_undist(*iter_c) = op_res.Apply(*res_grid, *iter_f) + prefactor * op_pde.Apply(sol_c_undist, *iter_c);
   }
@@ -134 +134 @@
 
   for (iter_f=bounds_f.Begin(), iter_c=bounds_c.Begin(); iter_c!=bounds_c.End(); iter_f+=2, ++iter_c) {
-    Helper::AssertVectorsEqual(sol_c.GetSpatialPos(*iter_c), sol_f_undist.GetSpatialPos(*iter_f));
+    Helper::AssertVectorsEqual(sol_c.GetSpatialPos(*iter_c), sol_f_undist.GetSpatialPos(*iter_f), 4.0 * std::numeric_limits<vmg_float>::epsilon());
     val = sol_c.GetVal(*iter_c) - sol_old->GetVal(*iter_c);
     sol_f_undist(*iter_f) += op.GetDiag() * val;