Merge branch 'dev' into pre-proto

ApplicationCode/Application/RiaDefines.cpp

@@ -19,6 +19,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RiaDefines.h"
+
 #include "cafAppEnum.h"
 
 
@@ -36,15 +37,6 @@ namespace caf
         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()
     {
@@ -110,3 +102,211 @@ bool RiaDefines::isPerCellFaceResult(const QString& resultName)
 
     return false;
 }
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::undefinedResultName()
+{
+    return "None";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::undefinedGridFaultName()
+{
+    return "Undefined Grid Faults";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::undefinedGridFaultWithInactiveName()
+{
+    return "Undefined Grid Faults With Inactive";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::combinedTransmissibilityResultName()
+{
+    return "TRANXYZ";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::ternarySaturationResultName()
+{
+    return "TERNARY";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::combinedMultResultName()
+{
+    return "MULTXYZ";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riTranXResultName()
+{
+    return "riTRANX";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riTranYResultName()
+{
+    return "riTRANY";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riTranZResultName()
+{
+    return "riTRANZ";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::combinedRiTranResultName()
+{
+    return "riTRANXYZ";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riMultXResultName()
+{
+    return "riMULTX";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riMultYResultName()
+{
+    return "riMULTY";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riMultZResultName()
+{
+    return "riMULTZ";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::combinedRiMultResultName()
+{
+    return "riMULTXYZ";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riAreaNormTranXResultName()
+{
+    return "riTRANXbyArea";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riAreaNormTranYResultName()
+{
+    return "riTRANYbyArea";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::riAreaNormTranZResultName()
+{
+    return "riTRANZbyArea";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::combinedRiAreaNormTranResultName()
+{
+    return "riTRANXYZbyArea";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::completionTypeResultName()
+{
+    return "Completion Type";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::mockModelBasic()
+{
+    return "Result Mock Debug Model Simple";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::mockModelBasicWithResults()
+{
+    return "Result Mock Debug Model With Results";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::mockModelLargeWithResults()
+{
+    return "Result Mock Debug Model Large With Results";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::mockModelCustomized()
+{
+    return "Result Mock Debug Model Customized";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RiaDefines::mockModelBasicInputCase()
+{
+    return "Input Mock Debug Model Simple";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+double RiaDefines::minimumDefaultValuePlot()
+{
+    return -10.0;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+double RiaDefines::maximumDefaultValuePlot()
+{
+    return 100.0;
+}