Changeset 3f6604

Timestamp:

Sep 6, 2015, 10:27:54 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Children:

199fe3

Parents:

b303d0

git-author:

Frederik Heber <heber@…> (03/13/15 15:03:26)

git-committer:

Frederik Heber <heber@…> (09/06/15 22:27:54)

Message:

tempcommit: Some fixes to interpolate_test.

• now they don't fail anymore and test something sensible.

File:

• test/unit_test/unit_test/interpolate_test.cpp (modified) (6 diffs)

test/unit_test/unit_test/interpolate_test.cpp

@@ -34 +34 @@
 using namespace VMG;
 
-const vmg_float sine_factor = 2.0 * Math::pi;
+const Vector sine_factor(1.5 * Math::pi, 3.7 * Math::pi, 2.213 * Math::pi);
 
 static inline vmg_float f(const Vector& pos)
 {
-  return std::sin(sine_factor*pos.X())
-       * std::sin(sine_factor*pos.Y())
-       * std::sin(sine_factor*pos.Z());
+  return std::sin(sine_factor[0]*pos.X())
+       * std::sin(sine_factor[1]*pos.Y())
+       * std::sin(sine_factor[2]*pos.Z());
 }
 
-/*
 static inline Vector grad_f(const Vector& pos)
 {
-  return -1.0 * sine_factor * Vector(std::cos(sine_factor*pos.X()) * std::sin(sine_factor*pos.Y()) * std::sin(sine_factor*pos.Z()),
-                                     std::sin(sine_factor*pos.X()) * std::cos(sine_factor*pos.Y()) * std::sin(sine_factor*pos.Z()),
-                                     std::sin(sine_factor*pos.X()) * std::sin(sine_factor*pos.Y()) * std::cos(sine_factor*pos.Z()));
+  return -1.0 * sine_factor * Vector(std::cos(sine_factor[0]*pos.X()) * std::sin(sine_factor[1]*pos.Y()) * std::sin(sine_factor[2]*pos.Z()),
+                                     std::sin(sine_factor[0]*pos.X()) * std::cos(sine_factor[1]*pos.Y()) * std::sin(sine_factor[2]*pos.Z()),
+                                     std::sin(sine_factor[0]*pos.X()) * std::sin(sine_factor[1]*pos.Y()) * std::cos(sine_factor[2]*pos.Z()));
 }
-*/
 
 struct InterpolateFixture
@@ -101 +99 @@
         p.Pos() += 0.5 * grid->Extent().MeshWidth();
         ip.Evaluate(p);
-        BOOST_CHECK_SMALL(p.Pot() - f(p.Pos()), vmg_float(1.0e-7));
+        BOOST_CHECK_SMALL(p.Pot() - f(p.Pos()), vmg_float(1.0e-6));
 
       }
@@ -107 +105 @@
 }
 
-/*
 BOOST_AUTO_TEST_CASE(InterpolateFieldTest)
 {
@@ -115 +112 @@
   Particle::Particle p;
 
-  vmg_float max_error = 0.0;
+  vmg_float max_error = std::numeric_limits<vmg_float>::min();
 
   for(p.Pos().X()=grid->Extent().Begin().X(); p.Pos().X()<grid->Extent().End().X(); p.Pos().X() += 0.01 * (grid->Extent().End().X() - grid->Extent().Begin().X()))
@@ -130 +127 @@
         ip.Evaluate(p);
 
-        for (int j=0; j<3; ++j)
-          max_error = std::max(max_error, p.Field()[j] - grad_f(p.Pos())[j]);
-
+        for (int j=0; j<3; ++j) {
+          BOOST_CHECK_SMALL(p.Field()[j] - grad_f(p.Pos())[j], vmg_float(1.0e-4));
+          if (fabs(grad_f(p.Pos())[j]) > 1e-10)
+                max_error = std::max(max_error, fabs((p.Field()[j] - grad_f(p.Pos())[j])/grad_f(p.Pos())[j]));
+        }
       }
 
-  std::printf("Max error: %e\n", max_error);
+  std::printf("Max rel. error: %e\n", max_error);
 
+  max_error = std::numeric_limits<vmg_float>::min();
   p.Pos().X() = 0.25;
   p.Pos().Y() = 0.25;
@@ -149 +149 @@
 
     ip.Evaluate(p);
+
+    for (int j=0; j<3; ++j) {
+          BOOST_CHECK_SMALL(p.Field()[j] - grad_f(p.Pos())[j], vmg_float(1.0e-4));
+      if (fabs(grad_f(p.Pos())[j]) > 1e-10)
+        max_error = std::max(max_error, fabs((p.Field()[j] - grad_f(p.Pos())[j])/grad_f(p.Pos())[j]));
+    }
   }
+  std::printf("Max rel. error moving along z: %e\n", max_error);
 }
-*/
+
 
 BOOST_AUTO_TEST_SUITE_END()