Whitespace

ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp

@@ -31,9 +31,9 @@
 #include "Rim3dView.h"
 #include "Rim3dWellLogCurve.h"
 #include "RimCellEdgeColors.h"
-#include "RimEclipseContourMapProjection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
+#include "RimEclipseContourMapProjection.h"
 #include "RimEclipseFaultColors.h"
 #include "RimEclipsePropertyFilter.h"
 #include "RimEclipseResultCase.h"
@@ -43,6 +43,7 @@
 #include "RimIntersectionCollection.h"
 #include "RimPlotCurve.h"
 #include "RimReservoirCellResultsStorage.h"
+#include "RimTools.h"
 #include "RimViewLinker.h"
 #include "RimWellLogExtractionCurve.h"
 
@@ -51,9 +52,6 @@
 #include "cafPdmUiTreeSelectionEditor.h"
 #include "cafUtils.h"
 
-#include <QDebug>
-#include <QList>
-#include "RimTools.h"
 
 namespace caf
 {
@@ -67,8 +65,7 @@ namespace caf
 
     setDefault(RimEclipseResultDefinition::FLOW_TR_INJ_AND_PROD);
 }
-}
+} // namespace caf
-
 
 CAF_PDM_SOURCE_INIT(RimEclipseResultDefinition, "ResultDefinition");
 
@@ -97,7 +94,6 @@ RimEclipseResultDefinition::RimEclipseResultDefinition()
     CAF_PDM_InitField(&m_timeLapseBaseTimestep, "TimeLapseBaseTimeStep", 0, "Base Time Step", "", "", "");
     m_timeLapseBaseTimestep.uiCapability()->setUiHidden(true);
 
-
     // One single tracer list has been split into injectors and producers.
     // The old list is defined as injectors and we'll have to move any producers in old projects.
     CAF_PDM_InitFieldNoDefault(&m_selectedTracers_OBSOLETE, "SelectedTracers", "Tracers", "", "", "");
@@ -109,7 +105,6 @@ RimEclipseResultDefinition::RimEclipseResultDefinition()
     CAF_PDM_InitFieldNoDefault(&m_selectedProducerTracers, "SelectedProducerTracers", "Producer Tracers", "", "", "");
     m_selectedProducerTracers.uiCapability()->setUiHidden(true);
 
-
     CAF_PDM_InitFieldNoDefault(&m_selectedSouringTracers, "SelectedSouringTracers", "Tracers", "", "", "");
     m_selectedSouringTracers.uiCapability()->setUiHidden(true);
 
@@ -124,17 +119,23 @@ RimEclipseResultDefinition::RimEclipseResultDefinition()
     CAF_PDM_InitFieldNoDefault(&m_porosityModelUiField, "MPorosityModelType", "Porosity", "", "", "");
     m_porosityModelUiField.xmlCapability()->disableIO();
 
-    CAF_PDM_InitField(&m_resultVariableUiField, "MResultVariable", RiaDefines::undefinedResultName(), "Result Property", "", "", "" );
+    CAF_PDM_InitField(
+        &m_resultVariableUiField, "MResultVariable", RiaDefines::undefinedResultName(), "Result Property", "", "", "");
     m_resultVariableUiField.xmlCapability()->disableIO();
     m_resultVariableUiField.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName());
 
-    CAF_PDM_InitField(&m_isTimeLapseResultUiField, "IsTimeLapseResultUI", false, "Enable Time Difference", "", "Use the difference with respect to a specific time step as the result variable to plot", "");
+    CAF_PDM_InitField(&m_isTimeLapseResultUiField,
+                      "IsTimeLapseResultUI",
+                      false,
+                      "Enable Time Difference",
+                      "",
+                      "Use the difference with respect to a specific time step as the result variable to plot",
+                      "");
     m_isTimeLapseResultUiField.xmlCapability()->disableIO();
 
     CAF_PDM_InitField(&m_timeLapseBaseTimestepUiField, "TimeLapseBaseTimeStepUI", 0, "Base Time Step", "", "", "");
     m_timeLapseBaseTimestepUiField.xmlCapability()->disableIO();
 
-
     CAF_PDM_InitFieldNoDefault(&m_flowSolutionUiField, "MFlowDiagSolution", "Solution", "", "", "");
     m_flowSolutionUiField.xmlCapability()->disableIO();
     m_flowSolutionUiField.uiCapability()->setUiHidden(true); // For now since there are only one to choose from
@@ -145,7 +146,6 @@ RimEclipseResultDefinition::RimEclipseResultDefinition()
     CAF_PDM_InitField(&m_syncProducerToInjectorSelection, "MSyncSelectedProdInj", false, "<- Add Communicators", "", "", "");
     m_syncProducerToInjectorSelection.uiCapability()->setUiEditorTypeName(caf::PdmUiToolButtonEditor::uiEditorTypeName());
 
-
     CAF_PDM_InitFieldNoDefault(&m_selectedInjectorTracersUiField, "MSelectedInjectorTracers", "Injector Tracers", "", "", "");
     m_selectedInjectorTracersUiField.xmlCapability()->disableIO();
     m_selectedInjectorTracersUiField.uiCapability()->setUiEditorTypeName(caf::PdmUiTreeSelectionEditor::uiEditorTypeName());
@@ -164,10 +164,7 @@ RimEclipseResultDefinition::RimEclipseResultDefinition()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimEclipseResultDefinition::~RimEclipseResultDefinition()
+RimEclipseResultDefinition::~RimEclipseResultDefinition() {}
-{
-}
-
 
 //--------------------------------------------------------------------------------------------------
 ///
@@ -195,7 +192,6 @@ void RimEclipseResultDefinition::setEclipseCase(RimEclipseCase* eclipseCase)
     assignFlowSolutionFromCase();
 }
 
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -209,11 +205,11 @@ RigCaseCellResultsData* RimEclipseResultDefinition::currentGridCellResults() con
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimEclipseResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+void RimEclipseResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
+                                                  const QVariant&            oldValue,
+                                                  const QVariant&            newValue)
 {
-    if (   &m_flowSolutionUiField  == changedField 
+    if (&m_flowSolutionUiField == changedField || &m_resultTypeUiField == changedField || &m_porosityModelUiField == changedField)
-        || &m_resultTypeUiField    == changedField
-        || &m_porosityModelUiField == changedField )
     {
         // If the user are seeing the list with the actually selected result,
         // select that result in the list. Otherwise select nothing.
@@ -222,10 +218,8 @@ void RimEclipseResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
 
         bool isFlowDiagFieldsRelevant = (m_resultType() == RiaDefines::FLOW_DIAGNOSTICS);
 
-
+        if ((m_flowSolutionUiField() == m_flowSolution() || !isFlowDiagFieldsRelevant) &&
-        if (   ( m_flowSolutionUiField() == m_flowSolution() || !isFlowDiagFieldsRelevant)
+            m_resultTypeUiField() == m_resultType() && m_porosityModelUiField() == m_porosityModel())
-            &&  m_resultTypeUiField()    == m_resultType()
-            &&  m_porosityModelUiField() == m_porosityModel() )
         {
             if (varList.contains(resultVariable()))
             {
@@ -287,7 +281,6 @@ void RimEclipseResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
         loadDataAndUpdate();
     }
 
-
     if (&m_selectedInjectorTracersUiField == changedField)
     {
         changedTracerSelectionField(true);
@@ -310,7 +303,6 @@ void RimEclipseResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
         m_syncProducerToInjectorSelection = false;
     }
 
-
     if (&m_selectedSouringTracersUiField == changedField)
     {
         if (!m_resultVariable().isEmpty())
@@ -341,10 +333,9 @@ void RimEclipseResultDefinition::changedTracerSelectionField(bool injector)
 {
     m_flowSolution = m_flowSolutionUiField();
 
-    std::vector<QString>& selectedTracers = injector ? m_selectedInjectorTracers.v()
+    std::vector<QString>& selectedTracers = injector ? m_selectedInjectorTracers.v() : m_selectedProducerTracers.v();
-                                                     : m_selectedProducerTracers.v();
+    std::vector<QString>& selectedTracersUi =
-    std::vector<QString>& selectedTracersUi = injector ? m_selectedInjectorTracersUiField.v()
+        injector ? m_selectedInjectorTracersUiField.v() : m_selectedProducerTracersUiField.v();
-                                                       : m_selectedProducerTracersUiField.v();
 
     selectedTracers = selectedTracersUi;
 
@@ -510,7 +501,8 @@ void RimEclipseResultDefinition::loadDataAndUpdate()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
+QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
+                                                                                bool*                      useOptionsOnly)
 {
     QList<caf::PdmOptionItemInfo> options;
 
@@ -543,7 +535,6 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
         }
 #endif /* ENABLE_SOURING */
 
-
         RimGridTimeHistoryCurve* timeHistoryCurve;
         this->firstAncestorOrThisOfType(timeHistoryCurve);
 
@@ -555,14 +546,12 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
             for (size_t i = 0; i < ResCatEnum::size(); ++i)
             {
                 RiaDefines::ResultCatType resType = ResCatEnum::fromIndex(i);
-                if ( resType == RiaDefines::FLOW_DIAGNOSTICS 
+                if (resType == RiaDefines::FLOW_DIAGNOSTICS && (timeHistoryCurve))
-                    && (timeHistoryCurve) )
                 {
                     continue;
                 }
 
-                if ( resType == RiaDefines::SOURSIMRL 
+                if (resType == RiaDefines::SOURSIMRL && (!hasSourSimRLFile))
-                    && (!hasSourSimRLFile ) )
                 {
                     continue;
                 }
@@ -622,8 +611,7 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
 
                 for (const QString& resultName : dynamicResultNames)
                 {
-                    if (!resultName.endsWith("F") ||
+                    if (!resultName.endsWith("F") || resultName == RiaDefines::completionTypeResultName())
-                        resultName == RiaDefines::completionTypeResultName())
                     {
                         continue;
                     }
@@ -653,13 +641,12 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
 
             for (size_t stepIdx = 0; stepIdx < stepDates.size(); ++stepIdx)
             {
-                options.push_back(caf::PdmOptionItemInfo(stepDates[stepIdx].toString(RimTools::dateFormatString()), 
+                options.push_back(
-                                                         static_cast<int>(stepIdx)));
+                    caf::PdmOptionItemInfo(stepDates[stepIdx].toString(RimTools::dateFormatString()), static_cast<int>(stepIdx)));
             }
         }
     }
 
-
     (*useOptionsOnly) = true;
 
     return options;
@@ -848,7 +835,6 @@ void RimEclipseResultDefinition::loadResult()
 
         gridCellResults->ensureKnownResultLoaded(this->eclipseResultAddress());
     }
-
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -930,7 +916,6 @@ bool RimEclipseResultDefinition::hasDynamicResult() const
     return false;
 }
 
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -1092,16 +1077,15 @@ bool RimEclipseResultDefinition::isCompletionTypeSelected() const
 //--------------------------------------------------------------------------------------------------
 bool RimEclipseResultDefinition::hasCategoryResult() const
 {
-    if (this->m_resultType() == RiaDefines::FORMATION_NAMES
+    if (this->m_resultType() == RiaDefines::FORMATION_NAMES && m_eclipseCase && m_eclipseCase->eclipseCaseData() &&
-        && m_eclipseCase 
+        m_eclipseCase->eclipseCaseData()->activeFormationNames())
-        && m_eclipseCase->eclipseCaseData() 
+        return true;
-        && m_eclipseCase->eclipseCaseData()->activeFormationNames() ) return true;
 
-    if (this->m_resultType() == RiaDefines::DYNAMIC_NATIVE
+    if (this->m_resultType() == RiaDefines::DYNAMIC_NATIVE && this->resultVariable() == RiaDefines::completionTypeResultName())
-        && this->resultVariable() == RiaDefines::completionTypeResultName()) return true;
+        return true;
 
-    if (this->m_resultType() == RiaDefines::FLOW_DIAGNOSTICS
+    if (this->m_resultType() == RiaDefines::FLOW_DIAGNOSTICS && m_resultVariable() == RIG_FLD_MAX_FRACTION_TRACER_RESNAME)
-        && m_resultVariable() == RIG_FLD_MAX_FRACTION_TRACER_RESNAME) return true;
+        return true;
 
     if (!this->hasStaticResult()) return false;
 
@@ -1133,7 +1117,6 @@ void RimEclipseResultDefinition::defineUiOrdering(QString uiConfigName, caf::Pdm
         uiOrdering.add(&m_porosityModelUiField);
     }
 
-
     if (m_resultTypeUiField() == RiaDefines::FLOW_DIAGNOSTICS)
     {
         uiOrdering.add(&m_flowSolutionUiField);
@@ -1180,8 +1163,7 @@ void RimEclipseResultDefinition::defineUiOrdering(QString uiConfigName, caf::Pdm
     {
         caf::PdmUiGroup* timeLapseGr = uiOrdering.addNewGroup("Time Difference Options");
         timeLapseGr->add(&m_isTimeLapseResultUiField);
-        if ( m_isTimeLapseResultUiField() )
+        if (m_isTimeLapseResultUiField()) timeLapseGr->add(&m_timeLapseBaseTimestepUiField);
-            timeLapseGr->add(&m_timeLapseBaseTimestepUiField);
     }
 
     uiOrdering.skipRemainingFields(true);
@@ -1190,7 +1172,9 @@ void RimEclipseResultDefinition::defineUiOrdering(QString uiConfigName, caf::Pdm
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimEclipseResultDefinition::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
+void RimEclipseResultDefinition::defineEditorAttribute(const caf::PdmFieldHandle* field,
+                                                       QString                    uiConfigName,
+                                                       caf::PdmUiEditorAttribute* attribute)
 {
     if (m_resultTypeUiField() == RiaDefines::FLOW_DIAGNOSTICS)
     {
@@ -1202,8 +1186,7 @@ void RimEclipseResultDefinition::defineEditorAttribute(const caf::PdmFieldHandle
                 listEditAttr->m_heightHint = 50;
             }
         }
-        else if (field == &m_syncInjectorToProducerSelection ||
+        else if (field == &m_syncInjectorToProducerSelection || field == &m_syncProducerToInjectorSelection)
-                 field == &m_syncProducerToInjectorSelection)
         {
             caf::PdmUiToolButtonEditorAttribute* toolButtonAttr = dynamic_cast<caf::PdmUiToolButtonEditorAttribute*>(attribute);
             if (toolButtonAttr)
@@ -1291,8 +1274,7 @@ void RimEclipseResultDefinition::assignFlowSolutionFromCase()
 //--------------------------------------------------------------------------------------------------
 bool RimEclipseResultDefinition::hasDualPorFractureResult()
 {
-    if (m_eclipseCase
+    if (m_eclipseCase && m_eclipseCase->eclipseCaseData())
-        && m_eclipseCase->eclipseCaseData())
     {
         return m_eclipseCase->eclipseCaseData()->hasFractureResults();
     }
@@ -1387,13 +1369,17 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calcOptionsForVariable
 
         // Ternary Result
         bool hasAtLeastOneTernaryComponent = false;
-        if (cellCenterResultNames.contains("SOIL")) hasAtLeastOneTernaryComponent = true;
+        if (cellCenterResultNames.contains("SOIL"))
-        else if (cellCenterResultNames.contains("SGAS")) hasAtLeastOneTernaryComponent = true;
+            hasAtLeastOneTernaryComponent = true;
-        else if (cellCenterResultNames.contains("SWAT")) hasAtLeastOneTernaryComponent = true;
+        else if (cellCenterResultNames.contains("SGAS"))
+            hasAtLeastOneTernaryComponent = true;
+        else if (cellCenterResultNames.contains("SWAT"))
+            hasAtLeastOneTernaryComponent = true;
 
         if (m_resultTypeUiField == RiaDefines::DYNAMIC_NATIVE && hasAtLeastOneTernaryComponent)
         {
-            optionList.push_front(caf::PdmOptionItemInfo(RiaDefines::ternarySaturationResultName(), RiaDefines::ternarySaturationResultName()));
+            optionList.push_front(
+                caf::PdmOptionItemInfo(RiaDefines::ternarySaturationResultName(), RiaDefines::ternarySaturationResultName()));
         }
 
         // Cell Face result names
@@ -1497,8 +1483,8 @@ QString RimEclipseResultDefinition::timeOfFlightString(bool shorter) const
         tofString = shorter ? "TOF" : "Time Of Flight";
     }
 
-    multipleSelected = multipleSelected ||
+    multipleSelected =
-        injectorSelectionState() >= MULTIPLE_SELECTED || producerSelectionState() >= MULTIPLE_SELECTED;
+        multipleSelected || injectorSelectionState() >= MULTIPLE_SELECTED || producerSelectionState() >= MULTIPLE_SELECTED;
 
     if (multipleSelected && !shorter)
     {
@@ -1516,14 +1502,12 @@ QString RimEclipseResultDefinition::maxFractionTracerString(bool shorter) const
     if (injectorSelectionState() >= ONE_SELECTED && producerSelectionState() == NONE_SELECTED)
     {
         mfString = shorter ? "FloodReg" : "Flooding Region";
-        if (injectorSelectionState() >= MULTIPLE_SELECTED)
+        if (injectorSelectionState() >= MULTIPLE_SELECTED) mfString += "s";
-            mfString += "s";
     }
     else if (injectorSelectionState() == NONE_SELECTED && producerSelectionState() >= ONE_SELECTED)
     {
         mfString = shorter ? "DrainReg" : "Drainage Region";
-        if (producerSelectionState() >= MULTIPLE_SELECTED)
+        if (producerSelectionState() >= MULTIPLE_SELECTED) mfString += "s";
-            mfString += "s";
     }
     else
     {
@@ -1737,7 +1721,6 @@ RimEclipseResultDefinition::FlowTracerSelectionState RimEclipseResultDefinition:
         }
     }
     return NONE_SELECTED;
-
 }
 
 //--------------------------------------------------------------------------------------------------