From 3f970244de480b7d7617aaf4b4d205dc5c205a44 Mon Sep 17 00:00:00 2001
From: Kristian Flikka <kristian.flikka@gmail.com>
Date: Mon, 4 Nov 2013 13:51:32 +0100
Subject: [PATCH] Replaced include math.h with cmath, and changed from fabs to
 abs. Fixed an error in the testfile, a filename was wrong

---
 opm/core/simulator/BlackoilState.hpp | 4 ++--
 tests/test_blackoilstate.cpp         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/opm/core/simulator/BlackoilState.hpp b/opm/core/simulator/BlackoilState.hpp
index c788d9495..a13184d40 100644
--- a/opm/core/simulator/BlackoilState.hpp
+++ b/opm/core/simulator/BlackoilState.hpp
@@ -19,12 +19,12 @@
 
 #ifndef OPM_BLACKOILSTATE_HEADER_INCLUDED
 #define OPM_BLACKOILSTATE_HEADER_INCLUDED
-#include <math.h>
 
 #include <opm/core/grid.h>
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <vector>
+#include <cmath>
 
 namespace Opm
 {
@@ -128,7 +128,7 @@ namespace Opm
                 return false;
             
             for (size_t i = 0; i < v1.size(); i++)
-                if (fabs(v1[i] - v2[i]) > epsilon * (fabs(v1[i]) + fabs(v2[i])))
+                if (std::abs(v1[i] - v2[i]) > epsilon * (std::abs(v1[i]) + std::abs(v2[i])))
                     return false;
             
             return true;
diff --git a/tests/test_blackoilstate.cpp b/tests/test_blackoilstate.cpp
index 9335a9ada..255229a57 100644
--- a/tests/test_blackoilstate.cpp
+++ b/tests/test_blackoilstate.cpp
@@ -50,7 +50,7 @@ BOOST_AUTO_TEST_CASE(EqualsDifferentDeckReturnFalse) {
 
 BOOST_AUTO_TEST_CASE(EqualsDifferentNumPhasesReturnFalse) {
 
-    const string filename = "testBlackoilState.DATA";
+    const string filename = "testBlackoilState1.DATA";
     const EclipseGridParser deck (filename);
 
     GridManager gridManager(deck);
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(EqualsDifferentNumPhasesReturnFalse) {
 
 BOOST_AUTO_TEST_CASE(EqualsNumericalDifferenceReturnFalse) {
 
-    const string filename = "testBlackoilState.DATA";
+    const string filename = "testBlackoilState1.DATA";
     const EclipseGridParser deck (filename);
 
     GridManager gridManager(deck);