#1596 Merge dev into pre-proto

ApplicationCode/Application/CMakeLists_files.cmake

@@ -0,0 +1,34 @@
+
+# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly 
+if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
+    set(CEE_CURRENT_LIST_DIR  ${CMAKE_CURRENT_LIST_DIR}/)
+endif()
+
+set (SOURCE_GROUP_HEADER_FILES
+${CEE_CURRENT_LIST_DIR}RiaApplication.h
+${CEE_CURRENT_LIST_DIR}RiaDefines.h
+${CEE_CURRENT_LIST_DIR}RiaPreferences.h
+)
+
+set (SOURCE_GROUP_SOURCE_FILES
+${CEE_CURRENT_LIST_DIR}RiaApplication.cpp
+${CEE_CURRENT_LIST_DIR}RiaDefines.cpp
+${CEE_CURRENT_LIST_DIR}RiaMain.cpp
+${CEE_CURRENT_LIST_DIR}RiaPreferences.cpp
+)
+
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
+
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+set (QT_MOC_HEADERS
+${QT_MOC_HEADERS}
+${CEE_CURRENT_LIST_DIR}RiaApplication.h
+)
+
+
+source_group( "Application" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )

ApplicationCode/Application/RiaApplication.cpp

@@ -37,7 +37,7 @@
 #include "RimCellEdgeColors.h"
 #include "RimCellRangeFilterCollection.h"
 #include "RimCommandObject.h"
-#include "RimDefines.h"
+#include "RiaDefines.h"
 #include "RimEclipseCaseCollection.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseFaultColors.h"
@@ -971,7 +971,7 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas
     RimEclipseView* riv = rimResultReservoir->createAndAddReservoirView();
 
     // Select SOIL as default result variable
-    riv->cellResult()->setResultType(RimDefines::DYNAMIC_NATIVE);
+    riv->cellResult()->setResultType(RiaDefines::DYNAMIC_NATIVE);
 
     if (m_preferences->loadAndShowSoil)
     {
@@ -987,15 +987,15 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas
         {
             if (rimResultReservoir->eclipseCaseData()->unitsType() == RigEclipseCaseData::UNITS_METRIC)
             {
-                project()->activeOilField()->fractureDefinitionCollection->defaultUnitsForFracTemplates = RimUnitSystem::UNITS_METRIC;
+                project()->activeOilField()->fractureDefinitionCollection->defaultUnitsForFracTemplates = RiaEclipseUnitTools::UNITS_METRIC;
             }
             else if (rimResultReservoir->eclipseCaseData()->unitsType() == RigEclipseCaseData::UNITS_FIELD)
             {
-                project()->activeOilField()->fractureDefinitionCollection->defaultUnitsForFracTemplates = RimUnitSystem::UNITS_FIELD;
+                project()->activeOilField()->fractureDefinitionCollection->defaultUnitsForFracTemplates = RiaEclipseUnitTools::UNITS_FIELD;
             }
             else if (rimResultReservoir->eclipseCaseData()->unitsType() == RigEclipseCaseData::UNITS_LAB)
             {
-                project()->activeOilField()->fractureDefinitionCollection->defaultUnitsForFracTemplates = RimUnitSystem::UNITS_METRIC;
+                project()->activeOilField()->fractureDefinitionCollection->defaultUnitsForFracTemplates = RiaEclipseUnitTools::UNITS_METRIC;
             }
         }
     }
@@ -1081,7 +1081,7 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas
 
     if (!riv->cellResult()->hasResult())
     {
-        riv->cellResult()->setResultVariable(RimDefines::undefinedResultName());
+        riv->cellResult()->setResultVariable(RiaDefines::undefinedResultName());
     }
     
     analysisModels->updateConnectedEditors();
@@ -1110,14 +1110,14 @@ bool RiaApplication::openInputEclipseCaseFromFileNames(const QStringList& fileNa
 
     RimEclipseView* riv = rimInputReservoir->createAndAddReservoirView();
 
-    riv->cellResult()->setResultType(RimDefines::INPUT_PROPERTY);
+    riv->cellResult()->setResultType(RiaDefines::INPUT_PROPERTY);
     riv->hasUserRequestedAnimation = true;
 
     riv->loadDataAndUpdate();
 
     if (!riv->cellResult()->hasResult())
     {
-        riv->cellResult()->setResultVariable(RimDefines::undefinedResultName());
+        riv->cellResult()->setResultVariable(RiaDefines::undefinedResultName());
     }
 
     analysisModels->updateConnectedEditors();
@@ -1166,7 +1166,7 @@ bool RiaApplication::openOdbCaseFromFile(const QString& fileName)
 
     //if (!riv->cellResult()->hasResult())
     //{
-    //    riv->cellResult()->setResultVariable(RimDefines::undefinedResultName());
+    //    riv->cellResult()->setResultVariable(RiaEclipseUnitTools::undefinedResultName());
     //}
     progress.incrementProgress();
     progress.setProgressDescription("Loading results information");
@@ -1185,7 +1185,7 @@ bool RiaApplication::openOdbCaseFromFile(const QString& fileName)
 //--------------------------------------------------------------------------------------------------
 void RiaApplication::createMockModel()
 {
-    openEclipseCase(RimDefines::mockModelBasic(), RimDefines::mockModelBasic());
+    openEclipseCase(RiaDefines::mockModelBasic(), RiaDefines::mockModelBasic());
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1193,7 +1193,7 @@ void RiaApplication::createMockModel()
 //--------------------------------------------------------------------------------------------------
 void RiaApplication::createResultsMockModel()
 {
-    openEclipseCase(RimDefines::mockModelBasicWithResults(), RimDefines::mockModelBasicWithResults());
+    openEclipseCase(RiaDefines::mockModelBasicWithResults(), RiaDefines::mockModelBasicWithResults());
 }
 
 
@@ -1202,7 +1202,7 @@ void RiaApplication::createResultsMockModel()
 //--------------------------------------------------------------------------------------------------
 void RiaApplication::createLargeResultsMockModel()
 {
-    openEclipseCase(RimDefines::mockModelLargeWithResults(), RimDefines::mockModelLargeWithResults());
+    openEclipseCase(RiaDefines::mockModelLargeWithResults(), RiaDefines::mockModelLargeWithResults());
 }
 
 
@@ -1211,7 +1211,7 @@ void RiaApplication::createLargeResultsMockModel()
 //--------------------------------------------------------------------------------------------------
 void RiaApplication::createMockModelCustomized()
 {
-    openEclipseCase(RimDefines::mockModelCustomized(), RimDefines::mockModelCustomized());
+    openEclipseCase(RiaDefines::mockModelCustomized(), RiaDefines::mockModelCustomized());
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1219,7 +1219,7 @@ void RiaApplication::createMockModelCustomized()
 //--------------------------------------------------------------------------------------------------
 void RiaApplication::createInputMockModel()
 {
-    openInputEclipseCaseFromFileNames(QStringList(RimDefines::mockModelBasicInputCase()));
+    openInputEclipseCaseFromFileNames(QStringList(RiaDefines::mockModelBasicInputCase()));
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/Application/RiaDefines.cpp

@@ -0,0 +1,111 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2011-     Statoil ASA
+//  Copyright (C) 2013-     Ceetron Solutions AS
+//  Copyright (C) 2011-2012 Ceetron AS
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RiaDefines.h"
+#include "cafAppEnum.h"
+
+
+namespace caf
+{
+    template<>
+    void caf::AppEnum< RiaDefines::ResultCatType >::setUp()
+    {
+        addItem(RiaDefines::DYNAMIC_NATIVE, "DYNAMIC_NATIVE",   "Dynamic");
+        addItem(RiaDefines::STATIC_NATIVE,  "STATIC_NATIVE",    "Static");
+        addItem(RiaDefines::GENERATED,      "GENERATED",        "Generated");
+        addItem(RiaDefines::INPUT_PROPERTY, "INPUT_PROPERTY",   "Input Property");
+        addItem(RiaDefines::FORMATION_NAMES, "FORMATION_NAMES", "Formation Names");
+        addItem(RiaDefines::FLOW_DIAGNOSTICS, "FLOW_DIAGNOSTICS", "Flow Diagnostics");
+        setDefault(RiaDefines::DYNAMIC_NATIVE);
+    }
+
+    template<>
+    void caf::AppEnum< RiaDefines::PorosityModelType >::setUp()
+    {
+        addItem(RiaDefines::MATRIX_MODEL,   "MATRIX_MODEL",     "Matrix");
+        addItem(RiaDefines::FRACTURE_MODEL, "FRACTURE_MODEL",   "Fracture");
+
+        setDefault(RiaDefines::MATRIX_MODEL);
+    }
+
+    template<>
+    void caf::AppEnum< RiaDefines::DepthUnitType >::setUp()
+    {
+        addItem(RiaDefines::UNIT_METER,  "UNIT_METER",   "Meter");
+        addItem(RiaDefines::UNIT_FEET,   "UNIT_FEET",    "Feet");
+        addItem(RiaDefines::UNIT_NONE,   "UNIT_NONE",    "None");
+
+
+        setDefault(RiaDefines::UNIT_METER);
+    }
+
+    template<>
+    void caf::AppEnum< RiaDefines::PlotAxis >::setUp()
+    {
+        addItem(RiaDefines::PLOT_AXIS_LEFT,  "PLOT_AXIS_LEFT",  "Left");
+        addItem(RiaDefines::PLOT_AXIS_RIGHT, "PLOT_AXIS_RIGHT", "Right");
+
+        setDefault(RiaDefines::PLOT_AXIS_LEFT);
+    }
+
+    template<>
+    void caf::AppEnum< RiaDefines::CompletionType >::setUp()
+    {
+        addItem(RiaDefines::WELL_PATH, "WELL_PATH", "Well Path");
+        addItem(RiaDefines::PERFORATION_INTERVAL, "PERFORATION_INTERVAL", "Perforation Interval");
+        addItem(RiaDefines::FISHBONES, "FISHBONES", "Fishbones");
+
+        setDefault(RiaDefines::WELL_PATH);
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RiaDefines::isPerCellFaceResult(const QString& resultName)
+{
+    if (resultName.compare(RiaDefines::combinedTransmissibilityResultName(), Qt::CaseInsensitive) == 0)
+    {
+        return true;
+    }
+    else if (resultName.compare(RiaDefines::combinedMultResultName(), Qt::CaseInsensitive) == 0)
+    {
+        return true;
+    }
+    else if (resultName.compare(RiaDefines::ternarySaturationResultName(), Qt::CaseInsensitive) == 0)
+    {
+        return true;
+    }
+    else if (resultName.compare(RiaDefines::combinedRiTranResultName(), Qt::CaseInsensitive) == 0)
+    {
+        return true;
+    }
+    else if (resultName.compare(RiaDefines::combinedRiMultResultName(), Qt::CaseInsensitive) == 0)
+    {
+        return true;
+    }
+    else if (resultName.compare(RiaDefines::combinedRiAreaNormTranResultName(), Qt::CaseInsensitive) == 0)
+    {
+        return true;
+    }
+
+    return false;
+}

ApplicationCode/Application/RiaDefines.h

@@ -0,0 +1,106 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2011-     Statoil ASA
+//  Copyright (C) 2013-     Ceetron Solutions AS
+//  Copyright (C) 2011-2012 Ceetron AS
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include <QString>
+
+class RiaDefines
+{
+
+public:
+    enum ResultCatType
+    {
+        DYNAMIC_NATIVE,
+        STATIC_NATIVE,
+        GENERATED,
+        INPUT_PROPERTY,
+        FORMATION_NAMES,
+        FLOW_DIAGNOSTICS,
+        REMOVED
+    };
+
+    enum PorosityModelType
+    {
+        MATRIX_MODEL,
+        FRACTURE_MODEL
+    };
+
+    enum CompletionType {
+        WELL_PATH,
+        PERFORATION_INTERVAL,
+        FISHBONES
+    };
+
+    static bool isPerCellFaceResult(const QString& resultName);
+
+    static QString undefinedResultName()                { return "None"; }
+    static QString undefinedGridFaultName()             { return "Undefined Grid Faults"; }
+    static QString undefinedGridFaultWithInactiveName() { return "Undefined Grid Faults With Inactive"; }
+    static QString combinedTransmissibilityResultName() { return "TRANXYZ"; }
+    static QString ternarySaturationResultName()        { return "TERNARY"; }
+    static QString combinedMultResultName()             { return "MULTXYZ"; }
+
+    static QString riTranXResultName()                  { return "riTRANX"; }
+    static QString riTranYResultName()                  { return "riTRANY"; }
+    static QString riTranZResultName()                  { return "riTRANZ"; }
+    static QString combinedRiTranResultName()           { return "riTRANXYZ"; }
+
+    static QString riMultXResultName()                  { return "riMULTX"; }
+    static QString riMultYResultName()                  { return "riMULTY"; }
+    static QString riMultZResultName()                  { return "riMULTZ"; }
+    static QString combinedRiMultResultName()           { return "riMULTXYZ"; }
+
+    static QString riAreaNormTranXResultName()         { return "riTRANXbyArea"; }
+    static QString riAreaNormTranYResultName()         { return "riTRANYbyArea"; }
+    static QString riAreaNormTranZResultName()         { return "riTRANZbyArea"; }
+    static QString combinedRiAreaNormTranResultName()  { return "riTRANXYZbyArea"; }
+
+    static QString completionTypeResultName()          { return "Completion Type"; }
+
+    // Mock model text identifiers
+    static QString mockModelBasic()                    { return "Result Mock Debug Model Simple"; }
+    static QString mockModelBasicWithResults()         { return "Result Mock Debug Model With Results"; }
+    static QString mockModelLargeWithResults()         { return "Result Mock Debug Model Large With Results"; }
+    static QString mockModelCustomized()               { return "Result Mock Debug Model Customized"; }
+    static QString mockModelBasicInputCase()           { return "Input Mock Debug Model Simple"; }
+
+
+    //Units and conversions
+    enum DepthUnitType
+    {
+        UNIT_METER,
+        UNIT_FEET,
+        UNIT_NONE
+    };
+
+
+
+    // Defines relate to plotting
+    enum PlotAxis
+    {
+        PLOT_AXIS_LEFT,
+        PLOT_AXIS_RIGHT
+    };
+
+    static double minimumDefaultValuePlot()         { return - 10.0; }
+    static double maximumDefaultValuePlot()         { return  100.0; }
+};
+

ApplicationCode/Application/RiaMain.cpp

@@ -0,0 +1,62 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2011-2012 Statoil ASA, Ceetron AS
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RiaApplication.h"
+#include "RiaLogging.h"
+
+#include "RiuMainWindow.h"
+#include "RiuMessagePanel.h"
+
+int main(int argc, char *argv[])
+{
+    RiaLogging::loggerInstance()->setLevel(RI_LL_DEBUG);
+
+    RiaApplication app(argc, argv);
+
+    QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
+    setlocale(LC_NUMERIC,"C");
+
+    int unitTestResult = app.parseArgumentsAndRunUnitTestsIfRequested();
+    if (unitTestResult > -1)
+    {
+        return unitTestResult;
+    }
+
+    RiuMainWindow window;
+    QString platform = cvf::System::is64Bit() ? "(64bit)" : "(32bit)";
+    window.setWindowTitle("ResInsight " + platform);
+    window.setDefaultWindowSize();
+    window.loadWinGeoAndDockToolBarLayout();
+    window.showWindow();
+
+    RiaLogging::setLoggerInstance(new RiuMessagePanelLogger(window.messagePanel()));
+    RiaLogging::loggerInstance()->setLevel(RI_LL_DEBUG);
+
+    if (app.parseArguments())
+    {
+        int exitCode = app.exec();
+        RiaLogging::deleteLoggerInstance();
+
+        return exitCode;
+    }
+
+    RiaLogging::deleteLoggerInstance();
+
+    return 0;
+}
+

ApplicationCode/Application/Tools/CMakeLists_files.cmake

@@ -0,0 +1,41 @@
+
+# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly 
+if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
+    set(CEE_CURRENT_LIST_DIR  ${CMAKE_CURRENT_LIST_DIR}/)
+endif()
+
+
+set (SOURCE_GROUP_HEADER_FILES
+${CEE_CURRENT_LIST_DIR}RiaColorTables.h
+${CEE_CURRENT_LIST_DIR}RiaEclipseUnitTools.h
+${CEE_CURRENT_LIST_DIR}RiaImageCompareReporter.h
+${CEE_CURRENT_LIST_DIR}RiaImageFileCompare.h
+${CEE_CURRENT_LIST_DIR}RiaLogging.h
+${CEE_CURRENT_LIST_DIR}RiaProjectModifier.h
+${CEE_CURRENT_LIST_DIR}RiaRegressionTest.h
+)
+
+set (SOURCE_GROUP_SOURCE_FILES
+${CEE_CURRENT_LIST_DIR}RiaColorTables.cpp
+${CEE_CURRENT_LIST_DIR}RiaEclipseUnitTools.cpp
+${CEE_CURRENT_LIST_DIR}RiaImageCompareReporter.cpp
+${CEE_CURRENT_LIST_DIR}RiaImageFileCompare.cpp
+${CEE_CURRENT_LIST_DIR}RiaLogging.cpp
+${CEE_CURRENT_LIST_DIR}RiaProjectModifier.cpp
+${CEE_CURRENT_LIST_DIR}RiaRegressionTest.cpp
+)
+
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
+
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+set (QT_MOC_HEADERS
+${QT_MOC_HEADERS}
+)
+
+
+source_group( "Application\\Tools" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )

ApplicationCode/Application/Tools/RiaEclipseUnitTools.cpp

@@ -0,0 +1,59 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2017-     Statoil ASA
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RiaEclipseUnitTools.h"
+
+#include "cafAppEnum.h"
+
+#include "cvfAssert.h"
+
+namespace caf
+{
+    template<>
+    void RiaEclipseUnitTools::UnitSystemType::setUp()
+    {
+        addItem(RiaEclipseUnitTools::UNITS_METRIC,  "UNITS_METRIC",  "Metric");
+        addItem(RiaEclipseUnitTools::UNITS_FIELD,   "UNITS_FIELD",   "Field");
+        addItem(RiaEclipseUnitTools::UNITS_UNKNOWN, "UNITS_UNKNOWN", "Unknown");
+
+        setDefault(RiaEclipseUnitTools::UNITS_METRIC);
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+double RiaEclipseUnitTools::darcysConstant(UnitSystem unitSystem)
+{
+    // See "Cartesian transmissibility calculations" in the "Eclipse Technical Description"
+    //     CDARCY Darcys constant
+    //         = 0.00852702 (E300); 0.008527 (ECLIPSE 100) (METRIC)
+    //         = 0.00112712 (E300); 0.001127 (ECLIPSE 100) (FIELD)
+    //         = 3.6 (LAB)
+    //         = 0.00864 (PVT - M)
+    switch (unitSystem)
+    {
+    case UNITS_FIELD:
+        return 0.001127;
+    case UNITS_METRIC:
+        return 0.008527;
+    default:
+        CVF_ASSERT(false);
+        return 0.0;
+    }
+}

ApplicationCode/Application/Tools/RiaEclipseUnitTools.h

@@ -0,0 +1,48 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2017-     Statoil ASA
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "cafAppEnum.h"
+
+class RiaEclipseUnitTools
+{
+
+public:
+    enum UnitSystem
+    {
+        UNITS_METRIC,
+        UNITS_FIELD,
+        //UNITS_LAB, // Not yet
+        UNITS_UNKNOWN,
+    };
+
+    typedef caf::AppEnum< RiaEclipseUnitTools::UnitSystem > UnitSystemType;
+
+    static double feetPerMeter()                    { return 3.2808399; }
+    static double meterPerFeet()                    { return 0.3048000; }
+
+    static double meterToFeet(double meter)         { return meter*feetPerMeter(); }
+    static double feetToMeter(double feet)          { return feet*meterPerFeet();}
+    static double meterToInch(double meter)         { return meter*feetPerMeter()*12; }
+    static double inchToMeter(double inch)          { return (inch / 12)*meterPerFeet(); }
+    static double inchToFeet (double inch)          { return (inch / 12.0); } 
+
+    static double darcysConstant(UnitSystem unitSystem);
+};
+

ApplicationCode/Application/Tools/RiaImageFileCompare.cpp

@@ -1,156 +1,156 @@
-/////////////////////////////////////////////////////////////////////////////////
-//
-//  Copyright (C) 2011-2012 Statoil ASA, Ceetron AS
-// 
-//  ResInsight is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-// 
-//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
-//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE.
-// 
-//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
-//  for more details.
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-#include "RiaImageFileCompare.h"
-#include <QtCore/QProcess>
-
-
-//==================================================================================================
-//
-// 
-//
-//==================================================================================================
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-RiaImageFileCompare::RiaImageFileCompare(QString compareExecutable)
-:   m_compareExecutable(compareExecutable)
-{
-    reset();
-}
-
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-RiaImageFileCompare::~RiaImageFileCompare()
-{
-}
-
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RiaImageFileCompare::reset()
-{
-    m_imagesEqual = false;
-    m_lastError = IC_NO_ERROR;
-    m_errorMsg = "";
-    m_errorDetails = "";
-}
-
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-bool RiaImageFileCompare::runComparison(QString imgFileName, QString refFileName, QString diffFileName)
-{
-    reset();
-
-    if (m_compareExecutable.isEmpty())
-    {
-        m_lastError = SEVERE_ERROR;
-        m_errorMsg = "Cannot compare images, no compare executable set";
-        return false;
-    }
-
-
-    //QString args = QString("-fuzz 2% -lowlight-color white -metric ae \"%1\" \"%2\" \"%3\"").arg(imgFileName).arg(refFileName).arg((diffFileName));
-    // The ImageMagick compare tool on RedHat 5 does not support the lowlight-color options
-    // Use GCC version as a crude mechanism for disabling use of this option on RedHat5
-#if (__GNUC__ == 4 && __GNUC_MINOR__ <= 1)
-    QString args = QString("-fuzz 0.4% -metric ae \"%1\" \"%2\" \"%3\"").arg(imgFileName).arg(refFileName).arg((diffFileName));
-#else
-    QString args = QString("-fuzz 0.4% -lowlight-color white -metric ae \"%1\" \"%2\" \"%3\"").arg(imgFileName).arg(refFileName).arg((diffFileName));
-#endif
-    QString completeCommand = QString("\"%1\" %2").arg(m_compareExecutable).arg(args);
-
-    // Launch process and wait
-    QProcess proc;
-    proc.start(completeCommand);
-    proc.waitForFinished(30000);
-
-    QProcess::ProcessError procError = proc.error();
-    if (procError != QProcess::UnknownError)
-    {
-        m_lastError = SEVERE_ERROR;
-        m_errorMsg = "Error running compare tool process";
-        m_errorDetails = completeCommand;
-        return false;
-    }
-
-    QByteArray stdErr = proc.readAllStandardError();
-    int procExitCode = proc.exitCode();
-    if (procExitCode == 0)
-    {
-        // Strip out whitespace and look for 0 (as in zero pixel differences)
-        stdErr = stdErr.simplified();
-        if (!stdErr.isEmpty() && stdErr[0] == '0')
-        {
-            m_imagesEqual = true;
-        }
-
-        return true;
-    }
-    else
-    {
-        // Report non-severe error
-        m_lastError = IC_ERROR;
-        m_errorMsg = "Error running compare tool process";
-        m_errorDetails = stdErr;
-
-        return false;
-    }
-}
-
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-bool RiaImageFileCompare::imagesEqual() const
-{
-    return m_imagesEqual;
-}
-
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-RiaImageFileCompare::ErrorType RiaImageFileCompare::error() const
-{
-    return m_lastError;
-}
-
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-QString RiaImageFileCompare::errorMessage() const
-{
-    return m_errorMsg;
-}
-
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-QString RiaImageFileCompare::errorDetails() const
-{
-    return m_errorDetails;
-}
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2011-2012 Statoil ASA, Ceetron AS
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RiaImageFileCompare.h"
+#include <QtCore/QProcess>
+
+
+//==================================================================================================
+//
+// 
+//
+//==================================================================================================
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RiaImageFileCompare::RiaImageFileCompare(QString compareExecutable)
+:   m_compareExecutable(compareExecutable)
+{
+    reset();
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RiaImageFileCompare::~RiaImageFileCompare()
+{
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiaImageFileCompare::reset()
+{
+    m_imagesEqual = false;
+    m_lastError = IC_NO_ERROR;
+    m_errorMsg = "";
+    m_errorDetails = "";
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RiaImageFileCompare::runComparison(QString imgFileName, QString refFileName, QString diffFileName)
+{
+    reset();
+
+    if (m_compareExecutable.isEmpty())
+    {
+        m_lastError = SEVERE_ERROR;
+        m_errorMsg = "Cannot compare images, no compare executable set";
+        return false;
+    }
+
+
+    //QString args = QString("-fuzz 2% -lowlight-color white -metric ae \"%1\" \"%2\" \"%3\"").arg(imgFileName).arg(refFileName).arg((diffFileName));
+    // The ImageMagick compare tool on RedHat 5 does not support the lowlight-color options
+    // Use GCC version as a crude mechanism for disabling use of this option on RedHat5
+#if (__GNUC__ == 4 && __GNUC_MINOR__ <= 1)
+    QString args = QString("-fuzz 0.4% -metric ae \"%1\" \"%2\" \"%3\"").arg(imgFileName).arg(refFileName).arg((diffFileName));
+#else
+    QString args = QString("-fuzz 0.4% -lowlight-color white -metric ae \"%1\" \"%2\" \"%3\"").arg(imgFileName).arg(refFileName).arg((diffFileName));
+#endif
+    QString completeCommand = QString("\"%1\" %2").arg(m_compareExecutable).arg(args);
+
+    // Launch process and wait
+    QProcess proc;
+    proc.start(completeCommand);
+    proc.waitForFinished(30000);
+
+    QProcess::ProcessError procError = proc.error();
+    if (procError != QProcess::UnknownError)
+    {
+        m_lastError = SEVERE_ERROR;
+        m_errorMsg = "Error running compare tool process";
+        m_errorDetails = completeCommand;
+        return false;
+    }
+
+    QByteArray stdErr = proc.readAllStandardError();
+    int procExitCode = proc.exitCode();
+    if (procExitCode == 0)
+    {
+        // Strip out whitespace and look for 0 (as in zero pixel differences)
+        stdErr = stdErr.simplified();
+        if (!stdErr.isEmpty() && stdErr[0] == '0')
+        {
+            m_imagesEqual = true;
+        }
+
+        return true;
+    }
+    else
+    {
+        // Report non-severe error
+        m_lastError = IC_ERROR;
+        m_errorMsg = "Error running compare tool process";
+        m_errorDetails = stdErr;
+
+        return false;
+    }
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RiaImageFileCompare::imagesEqual() const
+{
+    return m_imagesEqual;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RiaImageFileCompare::ErrorType RiaImageFileCompare::error() const
+{
+    return m_lastError;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaImageFileCompare::errorMessage() const
+{
+    return m_errorMsg;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaImageFileCompare::errorDetails() const
+{
+    return m_errorDetails;
+}