Changeset 4087cb

Timestamp:

Oct 15, 2013, 2:55:12 PM (12 years ago)

Author:

Frederik Heber <heber@…>

Children:

fb3b4c

Parents:

b4ac80

git-author:

Frederik Heber <heber@…> (08/30/13 20:45:35)

git-committer:

Frederik Heber <heber@…> (10/15/13 14:55:12)

Message:

Increased numerical tolerance of assert in LevelOperatorFAS::Restrict().

• modified VMG::Vector::IsComponentWise..(), e.g. ..LessOr..() to accept equality within interval of width tol.

Location:

src

Files:

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

src/base/helper.cpp

@@ -93 +93 @@
 bool Helper::AssertVectorsEqual(const Vector& pos_1, const Vector& pos_2, const vmg_float& tol)
 {
-  bool equal = (pos_1 - pos_2).Abs().IsComponentwiseLessOrEqual(tol);
+  // create factor with similar magnitude as pos1 but always greater equal 1
+  const VMG::Vector factor( abs(pos_1.X())+1, abs(pos_1.Y())+1, abs(pos_1.Z())+1);
+  const VMG::Vector temp = (pos_1 - pos_2).Abs() / factor;
+  bool equal = temp.IsComponentwiseLessOrEqual(tol);
   assert(equal);
   return equal;

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), 4.0 * std::numeric_limits<vmg_float>::epsilon());
+    Helper::AssertVectorsEqual(sol_c_undist.GetSpatialPos(*iter_c), sol_f.GetSpatialPos(*iter_f), 1e6 * 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), 4.0 * std::numeric_limits<vmg_float>::epsilon());
+    Helper::AssertVectorsEqual(rhs_c_undist.GetSpatialPos(*iter_c), (*res_grid).GetSpatialPos(*iter_f), 1e6 * 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), 4.0 * std::numeric_limits<vmg_float>::epsilon());
+    Helper::AssertVectorsEqual(sol_c.GetSpatialPos(*iter_c), sol_f_undist.GetSpatialPos(*iter_f), 1e6 * 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;