From 84597a992df68f8208a7a6abf6ca92602e36f238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8ren?= <jacob.storen@ceetronSolutions.com>
Date: Wed, 14 Jun 2017 11:15:59 +0200
Subject: [PATCH] Add condictivity conversion method From pre-proto branch, to
 delete it there. Unused for now

---
 .../Application/Tools/RiaEclipseUnitTools.cpp | 24 +++++++++++++++++++
 .../Application/Tools/RiaEclipseUnitTools.h   |  3 +++
 2 files changed, 27 insertions(+)

diff --git a/ApplicationCode/Application/Tools/RiaEclipseUnitTools.cpp b/ApplicationCode/Application/Tools/RiaEclipseUnitTools.cpp
index 09f5a239ca..328a68cc26 100644
--- a/ApplicationCode/Application/Tools/RiaEclipseUnitTools.cpp
+++ b/ApplicationCode/Application/Tools/RiaEclipseUnitTools.cpp
@@ -57,3 +57,27 @@ double RiaEclipseUnitTools::darcysConstant(UnitSystem unitSystem)
         return 0.0;
     }
 }
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+double RiaEclipseUnitTools::convertConductivtyValue(double Kw, UnitSystem fromUnit, UnitSystem toUnit)
+{
+
+    if (fromUnit == toUnit) return Kw;
+
+    else if (fromUnit == UNITS_METRIC && toUnit == UNITS_FIELD)
+    {
+        return meterToFeet(Kw);
+    }
+    else if (fromUnit == UNITS_METRIC && toUnit == UNITS_FIELD)
+    {
+        return feetToMeter(Kw);
+    }
+    
+    CVF_ASSERT(false);
+
+    return HUGE_VAL;
+}
+
diff --git a/ApplicationCode/Application/Tools/RiaEclipseUnitTools.h b/ApplicationCode/Application/Tools/RiaEclipseUnitTools.h
index 29bf4387bb..63f3a2ab93 100644
--- a/ApplicationCode/Application/Tools/RiaEclipseUnitTools.h
+++ b/ApplicationCode/Application/Tools/RiaEclipseUnitTools.h
@@ -43,5 +43,8 @@ public:
     static double inchToMeter(double inch)          { return (inch / 12)*meterPerFeet(); }
 
     static double darcysConstant(UnitSystem unitSystem);
+    
+    static double convertConductivtyValue(double Kw, UnitSystem fromUnit, UnitSystem toUnit);
+
 };