Changeset f57182 for src/base/helper.hpp

Timestamp:

Mar 30, 2013, 2:44:52 PM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

8180d8

Parents:

d13e27

git-author:

Julian Iseringhausen <isering@…> (06/11/12 14:02:16)

git-committer:

Julian Iseringhausen <isering@…> (03/30/13 14:44:52)

Message:

Open boundary conditions.

Conflicts:

lib/vmg/src/Makefile.am
lib/vmg/src/base/factory.cpp
lib/vmg/test/unit_test/library/dirichlet_fas_lr_mpi.cpp

File:

• src/base/helper.hpp (modified) (2 diffs)

src/base/helper.hpp

@@ -80 +80 @@
    * Checks a number for validity, i.e. it is neither nan nor inf.
    */
-  inline bool CheckNumber(const vmg_float& number)
+  template <class T>
+  inline bool CheckNumber(const T& number)
   {
     bool valid = true;
 
-    if (std::numeric_limits<vmg_float>::has_quiet_NaN) {
-      valid &= number != std::numeric_limits<vmg_float>::quiet_NaN();
-      assert(number != std::numeric_limits<vmg_float>::quiet_NaN());
-    }
+    // Check for nan
+    valid &= number == number;
+    assert(number == number);
 
-    if (std::numeric_limits<vmg_float>::has_signaling_NaN) {
-      valid &= number != std::numeric_limits<vmg_float>::signaling_NaN();
-      assert(number != std::numeric_limits<vmg_float>::signaling_NaN());
-    }
-
-    if (std::numeric_limits<vmg_float>::has_infinity) {
-      valid &= number != std::numeric_limits<vmg_float>::infinity();
-      valid &= number != -1 * std::numeric_limits<vmg_float>::infinity();
-      assert(number != std::numeric_limits<vmg_float>::infinity());
-      assert(number != -1 * std::numeric_limits<vmg_float>::infinity());
+    // Check for infinity
+    if (!std::numeric_limits<T>::is_integer && std::numeric_limits<T>::has_denorm == std::denorm_present) {
+      valid &= number >= -1 * std::numeric_limits<T>::max();
+      valid &= number <= std::numeric_limits<T>::max();
+      assert(number >= -1 * std::numeric_limits<T>::max());
+      assert(number <= std::numeric_limits<T>::max());
+    }else {
+      valid &= number >= std::numeric_limits<T>::min();
+      valid &= number <= std::numeric_limits<T>::max();
+      assert(number >= std::numeric_limits<T>::min());
+      assert(number <= std::numeric_limits<T>::max());
     }
 
@@ -179 +180 @@
   }
 
+  bool AssertVectorsEqual(const Vector& pos_1, const Vector& pos_2);
+
   vmg_float InterpolateTrilinear(const Vector& point, const Grid& grid);