From 5f6468898bd4f8f8a03753766cb247aeb88abf87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 3 Jan 2017 13:14:07 +0100 Subject: [PATCH 01/27] #1052 3D info box: Added Flow Diag results statistics etc. --- .../Rim3dOverlayInfoConfig.cpp | 84 ++++++++++++++++++- .../ProjectDataModel/Rim3dOverlayInfoConfig.h | 3 + .../ReservoirDataModel/CMakeLists_files.cmake | 1 + .../RigFlowDiagResultAddress.cpp | 47 +++++++++++ .../RigFlowDiagResultAddress.h | 3 +- .../ReservoirDataModel/RigFlowDiagResults.cpp | 3 + 6 files changed, 136 insertions(+), 5 deletions(-) create mode 100644 ApplicationCode/ReservoirDataModel/RigFlowDiagResultAddress.cpp diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index 5685f9e142..d4021d87f2 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -45,6 +45,8 @@ #include "RimView.h" #include "RiuViewer.h" +#include "RigFlowDiagResults.h" +#include "RigFlowDiagVisibleCellsStatCalc.h" CAF_PDM_SOURCE_INIT(Rim3dOverlayInfoConfig, "View3dOverlayInfoConfig"); //-------------------------------------------------------------------------------------------------- @@ -182,6 +184,31 @@ caf::PdmFieldHandle* Rim3dOverlayInfoConfig::objectToggleField() return &active; } + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void Rim3dOverlayInfoConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) +{ + caf::PdmUiGroup* visGroup = uiOrdering.addNewGroup("Visibility"); + + visGroup->add(&showAnimProgress); + visGroup->add(&showCaseInfo); + visGroup->add(&showResultInfo); + visGroup->add(&showHistogram); + + caf::PdmUiGroup* statGroup = uiOrdering.addNewGroup("Statistics Options"); + RimEclipseView * eclipseView = dynamic_cast(m_viewDef.p()); + + if ( !eclipseView || eclipseView->cellResult()->resultType() != RimDefines::FLOW_DIAGNOSTICS ) // + { + statGroup->add(&m_statisticsTimeRange); + } + statGroup->add(&m_statisticsCellRange); + + uiOrdering.setForgetRemainingFields(true); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -260,6 +287,36 @@ void Rim3dOverlayInfoConfig::updateEclipse3DInfo(RimEclipseView * eclipseView) } } } + else if (eclipseView->cellResult()->resultType() == RimDefines::FLOW_DIAGNOSTICS) + { + if ( m_statisticsTimeRange == CURRENT_TIMESTEP || m_statisticsTimeRange == ALL_TIMESTEPS) // All timesteps is ignored + { + int currentTimeStep = eclipseView->currentTimeStep(); + + if ( m_statisticsCellRange == ALL_CELLS ) + { + RigFlowDiagResults* fldResults = eclipseView->cellResult()->flowDiagSolution()->flowDiagResults(); + RigFlowDiagResultAddress resAddr = eclipseView->cellResult()->flowDiagResAddress(); + + fldResults->minMaxScalarValues(resAddr, currentTimeStep, &min, &max); + fldResults->p10p90ScalarValues(resAddr, currentTimeStep, &p10, &p90); + fldResults->meanScalarValue(resAddr, currentTimeStep, &mean); + fldResults->sumScalarValue(resAddr, currentTimeStep, &sum); + histogram = &(fldResults->scalarValuesHistogram(resAddr, currentTimeStep)); + } + else if (m_statisticsCellRange == VISIBLE_CELLS ) + { + updateVisCellStatsIfNeeded(); + + m_visibleCellStatistics->meanCellScalarValues(currentTimeStep, mean); + m_visibleCellStatistics->minMaxCellScalarValues(currentTimeStep, min, max); + m_visibleCellStatistics->p10p90CellScalarValues(currentTimeStep, p10, p90); + m_visibleCellStatistics->sumCellScalarValues(currentTimeStep, sum); + + histogram = &(m_visibleCellStatistics->cellScalarValuesHistogram(currentTimeStep)); + } + } + } } } @@ -310,8 +367,15 @@ void Rim3dOverlayInfoConfig::updateEclipse3DInfo(RimEclipseView * eclipseView) if (isResultsInfoRelevant) { QString propName = eclipseView->cellResult()->resultVariable(); + QString timeRangeText = m_statisticsTimeRange().uiText(); + if ( eclipseView->cellResult()->resultType() == RimDefines::FLOW_DIAGNOSTICS ) + { + timeRangeText = caf::AppEnum::uiText(CURRENT_TIMESTEP); + propName = QString::fromStdString( eclipseView->cellResult()->flowDiagResAddress().uiText()); + } + infoText += QString("Cell Property: %1 ").arg(propName); - infoText += QString("
Statistics: ") + m_statisticsTimeRange().uiText() + " and " + m_statisticsCellRange().uiText(); + infoText += QString("
Statistics: ") + timeRangeText + " and " + m_statisticsCellRange().uiText(); infoText += QString("" "" "" @@ -550,10 +614,22 @@ void Rim3dOverlayInfoConfig::updateVisCellStatsIfNeeded() } else if (eclipseView) { - size_t scalarIndex = eclipseView->cellResult()->scalarResultIndex(); - calc = new RigEclipseNativeVisibleCellsStatCalc(eclipseView->currentGridCellResults()->cellResults(), - scalarIndex, + if ( eclipseView->cellResult()->resultType() == RimDefines::FLOW_DIAGNOSTICS ) + { + RigFlowDiagResultAddress resAddr = eclipseView->cellResult()->flowDiagResAddress(); + RigFlowDiagResults* fldResults = eclipseView->cellResult()->flowDiagSolution()->flowDiagResults(); + calc = new RigFlowDiagVisibleCellsStatCalc(fldResults, + resAddr, eclipseView->currentTotalCellVisibility().p()); + + } + else + { + size_t scalarIndex = eclipseView->cellResult()->scalarResultIndex(); + calc = new RigEclipseNativeVisibleCellsStatCalc(eclipseView->currentGridCellResults()->cellResults(), + scalarIndex, + eclipseView->currentTotalCellVisibility().p()); + } } m_visibleCellStatistics = new RigStatisticsDataCache(calc.p()); diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h index 47dbd1e3fc..3852387beb 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h @@ -65,6 +65,9 @@ public: protected: virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue); virtual caf::PdmFieldHandle* objectToggleField(); + + virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; + private: void updateEclipse3DInfo(RimEclipseView * reservoirView); diff --git a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake index 37b2250550..598b7806e8 100644 --- a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake @@ -66,6 +66,7 @@ ${CEE_CURRENT_LIST_DIR}RigCombTransResultAccessor.cpp ${CEE_CURRENT_LIST_DIR}RigCombMultResultAccessor.cpp ${CEE_CURRENT_LIST_DIR}RigResultModifierFactory.cpp ${CEE_CURRENT_LIST_DIR}RigFormationNames.cpp +${CEE_CURRENT_LIST_DIR}RigFlowDiagResultAddress.cpp ${CEE_CURRENT_LIST_DIR}RigFlowDiagResults.cpp ${CEE_CURRENT_LIST_DIR}RigFlowDiagResultFrames.cpp ${CEE_CURRENT_LIST_DIR}RigFlowDiagSolverInterface.cpp diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagResultAddress.cpp b/ApplicationCode/ReservoirDataModel/RigFlowDiagResultAddress.cpp new file mode 100644 index 0000000000..c21712362c --- /dev/null +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagResultAddress.cpp @@ -0,0 +1,47 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// 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 +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#include "RigFlowDiagResultAddress.h" + + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +bool RigFlowDiagResultAddress::isNativeResult() const +{ + return (((variableName == RIG_FLD_TOF_RESNAME) || (variableName == RIG_FLD_CELL_FRACTION_RESNAME)) && selectedTracerNames.size() <= 1); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +std::string RigFlowDiagResultAddress::uiText() +{ + std::string uiVarname = variableName; + + std::string uitext = uiVarname; + uitext += "("; + for (const std::string& tracerName : selectedTracerNames) + { + uitext += " " + tracerName; + } + uitext += ")"; + return uitext; +} + + diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagResultAddress.h b/ApplicationCode/ReservoirDataModel/RigFlowDiagResultAddress.h index 57cff37897..89fea6e947 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagResultAddress.h +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagResultAddress.h @@ -38,8 +38,9 @@ public: selectedTracerNames.insert(tracerName); } - bool isNativeResult() const { return ( ( (variableName == RIG_FLD_TOF_RESNAME) || (variableName == RIG_FLD_CELL_FRACTION_RESNAME) ) && selectedTracerNames.size() <= 1); } + bool isNativeResult() const; + std::string uiText(); std::string variableName; std::set selectedTracerNames; diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp index 678629b0f3..b2a1f3eeb6 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp @@ -201,6 +201,9 @@ std::vector* RigFlowDiagResults::calculateDerivedResult(const RigFlowDia } } + /// Test to remove all averaging + // if (injectorTOFs.size()) averageTof = (*injectorTOFs[0]); + return &averageTof; } else if (resVarAddr.variableName == RIG_FLD_CELL_FRACTION_RESNAME) From 5aed8ea939201df01b3ad86e1517b5ea7b81a4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 3 Jan 2017 14:58:34 +0100 Subject: [PATCH 02/27] #1053 Disabled the All Timesteps option in Legend range selection --- .../ProjectDataModel/RimEclipseView.cpp | 5 ++-- .../ProjectDataModel/RimLegendConfig.cpp | 26 ++++++++++++++++++- .../ProjectDataModel/RimLegendConfig.h | 3 +++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index bf4b6125bf..71e01a8b9e 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -1024,6 +1024,7 @@ void RimEclipseView::updateMinMaxValuesAndAddLegendToView(QString legendLabel, R CVF_ASSERT(resultColors->legendConfig()); + resultColors->legendConfig()->disableAllTimeStepsRange(true); resultColors->legendConfig()->setClosestToZeroValues(globalPosClosestToZero, globalNegClosestToZero, localPosClosestToZero, localNegClosestToZero); resultColors->legendConfig()->setAutomaticRanges(globalMin, globalMax, localMin, localMax); @@ -1033,8 +1034,7 @@ void RimEclipseView::updateMinMaxValuesAndAddLegendToView(QString legendLabel, R } m_viewer->addColorLegendToBottomLeftCorner(resultColors->legendConfig()->legend()); - resultColors->legendConfig()->setTitle(cvfqt::Utils::toString(legendLabel + resultColors->resultVariable())); - + resultColors->legendConfig()->setTitle(cvfqt::Utils::toString(legendLabel + QString::fromStdString( resultColors->flowDiagResAddress().uiText()))); } else { @@ -1061,6 +1061,7 @@ void RimEclipseView::updateMinMaxValuesAndAddLegendToView(QString legendLabel, R CVF_ASSERT(resultColors->legendConfig()); + resultColors->legendConfig()->disableAllTimeStepsRange(false); resultColors->legendConfig()->setClosestToZeroValues(globalPosClosestToZero, globalNegClosestToZero, localPosClosestToZero, localNegClosestToZero); resultColors->legendConfig()->setAutomaticRanges(globalMin, globalMax, localMin, localMax); diff --git a/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp b/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp index 36dfc9e653..15649e4d53 100644 --- a/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp +++ b/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp @@ -113,7 +113,8 @@ RimLegendConfig::RimLegendConfig() m_globalAutoPosClosestToZero(0), m_globalAutoNegClosestToZero(0), m_localAutoPosClosestToZero(0), - m_localAutoNegClosestToZero(0) + m_localAutoNegClosestToZero(0), + m_isAllTimeStepsRangeDisabled(false) { CAF_PDM_InitObject("Legend Definition", ":/Legend.png", "", ""); CAF_PDM_InitField(&m_numLevels, "NumberOfLevels", 8, "Number of levels", "", "A hint on how many tick marks you whish.",""); @@ -488,6 +489,21 @@ void RimLegendConfig::updateLegend() } } + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimLegendConfig::disableAllTimeStepsRange(bool doDisable) +{ + // If we enable AllTimesteps, and we have used current timestep, then "restore" the default + if (m_isAllTimeStepsRangeDisabled && !doDisable && m_rangeMode == AUTOMATIC_CURRENT_TIMESTEP) m_rangeMode = AUTOMATIC_ALLTIMESTEPS; + + m_isAllTimeStepsRangeDisabled = doDisable; + + if (doDisable && m_rangeMode == AUTOMATIC_ALLTIMESTEPS) m_rangeMode = AUTOMATIC_CURRENT_TIMESTEP; + +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -890,6 +906,14 @@ QList RimLegendConfig::calculateValueOptions(const caf:: optionList.push_back(caf::PdmOptionItemInfo(ColorRangeEnum::uiText(colType), colType)); } } + else if (fieldNeedingOptions == &m_rangeMode) + { + if (!m_isAllTimeStepsRangeDisabled) { + optionList.push_back(caf::PdmOptionItemInfo(RangeModeEnum::uiText(RimLegendConfig::AUTOMATIC_ALLTIMESTEPS), RimLegendConfig::AUTOMATIC_ALLTIMESTEPS)); + } + optionList.push_back(caf::PdmOptionItemInfo(RangeModeEnum::uiText(RimLegendConfig::AUTOMATIC_CURRENT_TIMESTEP), RimLegendConfig::AUTOMATIC_CURRENT_TIMESTEP)); + optionList.push_back(caf::PdmOptionItemInfo(RangeModeEnum::uiText(RimLegendConfig::USER_DEFINED), RimLegendConfig::USER_DEFINED)); + } return optionList; } diff --git a/ApplicationCode/ProjectDataModel/RimLegendConfig.h b/ApplicationCode/ProjectDataModel/RimLegendConfig.h index f679074eb8..de64b7e9a9 100644 --- a/ApplicationCode/ProjectDataModel/RimLegendConfig.h +++ b/ApplicationCode/ProjectDataModel/RimLegendConfig.h @@ -101,6 +101,7 @@ public: ColorRangesType colorRangeMode() { return m_colorRangeMode();} void setMappingMode(MappingType mappingType); MappingType mappingMode() { return m_mappingMode();} + void disableAllTimeStepsRange(bool doDisable); void setAutomaticRanges(double globalMin, double globalMax, double localMin, double localMax); void setClosestToZeroValues(double globalPosClosestToZero, double globalNegClosestToZero, double localPosClosestToZero, double localNegClosestToZero); @@ -150,6 +151,8 @@ private: double m_localAutoPosClosestToZero; double m_localAutoNegClosestToZero; + bool m_isAllTimeStepsRangeDisabled; + std::vector m_categories; std::vector m_categoryNames; From 6d498cce982bfad9afa878e5b199642e6c9bbfcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 3 Jan 2017 14:59:48 +0100 Subject: [PATCH 03/27] #1052 Improved the result variable text a bit for Flow Diag Results --- .../ReservoirDataModel/RigFlowDiagResultAddress.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagResultAddress.cpp b/ApplicationCode/ReservoirDataModel/RigFlowDiagResultAddress.cpp index c21712362c..001203baa7 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagResultAddress.cpp +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagResultAddress.cpp @@ -35,12 +35,12 @@ std::string RigFlowDiagResultAddress::uiText() std::string uiVarname = variableName; std::string uitext = uiVarname; - uitext += "("; + uitext += " ("; for (const std::string& tracerName : selectedTracerNames) { uitext += " " + tracerName; } - uitext += ")"; + uitext += " )"; return uitext; } From 03cf09d90ab8f41ab84a9b978548e6ae739dbe71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Wed, 4 Jan 2017 10:45:04 +0100 Subject: [PATCH 04/27] System: Created a general basename cleanup function, and applied that when creating filenames from userdescription etc. Related to #1054 preparations --- .../Application/RiaApplication.cpp | 2 +- .../Commands/RicExportFaultsFeature.cpp | 3 ++- .../RicExportMultipleSnapshotsFeature.cpp | 5 ++-- .../RicSnapshotViewToClipboardFeature.cpp | 4 +-- .../ReservoirDataModel/RigLasFileExporter.cpp | 26 +++++++------------ Fwk/AppFwk/CommonCode/cafUtils.cpp | 26 +++++++++++++++++++ Fwk/AppFwk/CommonCode/cafUtils.h | 1 + 7 files changed, 44 insertions(+), 23 deletions(-) diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index fab486cfba..d398c5c4e2 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -2086,7 +2086,7 @@ void RiaApplication::saveSnapshotForAllViews(const QString& snapshotFolderName) viewer->repaint(); QString fileName = cas->caseUserDescription() + "-" + riv->name(); - fileName.replace(" ", "_"); + fileName = caf::Utils::makeValidFileBasename(fileName); QString absoluteFileName = caf::Utils::constructFullFileName(absSnapshotPath, fileName, ".png"); diff --git a/ApplicationCode/Commands/RicExportFaultsFeature.cpp b/ApplicationCode/Commands/RicExportFaultsFeature.cpp index 293567a759..29a0e30d8e 100644 --- a/ApplicationCode/Commands/RicExportFaultsFeature.cpp +++ b/ApplicationCode/Commands/RicExportFaultsFeature.cpp @@ -30,6 +30,7 @@ #include "RigMainGrid.h" #include "RigCaseData.h" #include "QMessageBox" +#include "cafUtils.h" CAF_CMD_SOURCE_INIT(RicExportFaultsFeature, "RicExportFaultsFeature"); @@ -79,7 +80,7 @@ void RicExportFaultsFeature::onActionTriggered(bool isChecked) if ( faultName == RimDefines::undefinedGridFaultWithInactiveName() ) faultName = "UNDEF_IA"; QString baseFilename = "Fault_" + faultName + "_" + caseName; - baseFilename.replace(" ", "_"); + baseFilename = caf::Utils::makeValidFileBasename(baseFilename); QString completeFilename = selectedDir + "/" + baseFilename + ".grdecl"; diff --git a/ApplicationCode/Commands/RicExportMultipleSnapshotsFeature.cpp b/ApplicationCode/Commands/RicExportMultipleSnapshotsFeature.cpp index a5847c00ab..789f22d4f2 100644 --- a/ApplicationCode/Commands/RicExportMultipleSnapshotsFeature.cpp +++ b/ApplicationCode/Commands/RicExportMultipleSnapshotsFeature.cpp @@ -214,6 +214,7 @@ void RicExportMultipleSnapshotsFeature::exportViewVariationsToFolder(RimView* ri QString resName = resultName(rimView); QString viewCaseResultString = rimCase->caseUserDescription() + "_" + rimView->name() + "_" + resName; + viewCaseResultString = caf::Utils::makeValidFileBasename(viewCaseResultString); for (int i = msd->timeStepStart(); i <= msd->timeStepEnd(); i++) { @@ -235,7 +236,6 @@ void RicExportMultipleSnapshotsFeature::exportViewVariationsToFolder(RimView* ri if (msd->sliceDirection == RimMultiSnapshotDefinition::NO_RANGEFILTER) { QString fileName = viewCaseResultString + "_" + timeStepString; - fileName.replace(" ", "-"); QString absoluteFileName = caf::Utils::constructFullFileName(folder, fileName, ".png"); RicSnapshotViewToFileFeature::saveSnapshotAs(absoluteFileName, rimView); @@ -252,7 +252,6 @@ void RicExportMultipleSnapshotsFeature::exportViewVariationsToFolder(RimView* ri { QString rangeFilterString = msd->sliceDirection().text() + "-" + QString::number(i); QString fileName = viewCaseResultString + "_" + timeStepString + "_" + rangeFilterString; - fileName.replace(" ", "-"); rangeFilter->setDefaultValues(); if (msd->sliceDirection == RimMultiSnapshotDefinition::RANGEFILTER_I) @@ -293,7 +292,7 @@ QString RicExportMultipleSnapshotsFeature::resultName(RimView* rimView) if (dynamic_cast(rimView)) { RimEclipseView* eclView = dynamic_cast(rimView); - + return eclView->cellResult()->resultVariable(); } else if (dynamic_cast(rimView)) diff --git a/ApplicationCode/Commands/RicSnapshotViewToClipboardFeature.cpp b/ApplicationCode/Commands/RicSnapshotViewToClipboardFeature.cpp index 513d77c000..774ce09d64 100644 --- a/ApplicationCode/Commands/RicSnapshotViewToClipboardFeature.cpp +++ b/ApplicationCode/Commands/RicSnapshotViewToClipboardFeature.cpp @@ -208,7 +208,7 @@ void RicSnapshotAllPlotsToFileFeature::createSnapshotOfAllPlotsInFolder(QString if (wellLogPlot && wellLogPlot->viewWidget()) { QString fileName = wellLogPlot->description(); - fileName.replace(" ", "_"); + fileName = caf::Utils::makeValidFileBasename(fileName); QString absoluteFileName = caf::Utils::constructFullFileName(absSnapshotPath, fileName, ".png"); @@ -226,7 +226,7 @@ void RicSnapshotAllPlotsToFileFeature::createSnapshotOfAllPlotsInFolder(QString if (summaryPlot && summaryPlot->viewWidget()) { QString fileName = summaryPlot->description(); - fileName.replace(" ", "_"); + fileName = caf::Utils::makeValidFileBasename(fileName); QString absoluteFileName = caf::Utils::constructFullFileName(absSnapshotPath, fileName, ".png"); diff --git a/ApplicationCode/ReservoirDataModel/RigLasFileExporter.cpp b/ApplicationCode/ReservoirDataModel/RigLasFileExporter.cpp index d304e09aa5..c7201c9ae9 100644 --- a/ApplicationCode/ReservoirDataModel/RigLasFileExporter.cpp +++ b/ApplicationCode/ReservoirDataModel/RigLasFileExporter.cpp @@ -24,6 +24,7 @@ #include "RimWellLogCurve.h" #include "RimWellLogExtractionCurve.h" +#include "cafUtils.h" #include "cvfAssert.h" #include "laswell.hpp" @@ -146,41 +147,34 @@ public: std::string generateFilename() const { - QString f; + QString fileBasenameCandidate; QString separator("-"); if (!m_wellName.isEmpty()) { - f += m_wellName; + fileBasenameCandidate += m_wellName; } if (!m_caseName.isEmpty()) { - if (!f.isEmpty()) f += separator; - f += m_caseName; + if (!fileBasenameCandidate.isEmpty()) fileBasenameCandidate += separator; + fileBasenameCandidate += m_caseName; } // Add property name if only one curve is exported if (m_logCurveData.size() == 1) { - if (!f.isEmpty()) f += separator; - f += QString::fromStdString(m_logCurveData[0].channelName()); + if (!fileBasenameCandidate.isEmpty()) fileBasenameCandidate += separator; + fileBasenameCandidate += QString::fromStdString(m_logCurveData[0].channelName()); } if (!m_date.isEmpty()) { - if (!f.isEmpty()) f += separator; - f += m_date; + if (!fileBasenameCandidate.isEmpty()) fileBasenameCandidate += separator; + fileBasenameCandidate += m_date; } - QString cleanFileName = f.trimmed(); - cleanFileName.replace(".", "_"); - cleanFileName.replace(",", "_"); - cleanFileName.replace(":", "_"); - cleanFileName.replace(";", "_"); - cleanFileName.replace(" ", "_"); - cleanFileName.replace("/", "_"); - cleanFileName.replace(QRegExp("_+"), "_"); + QString cleanFileName = caf::Utils::makeValidFileBasename( fileBasenameCandidate); cleanFileName += ".las"; diff --git a/Fwk/AppFwk/CommonCode/cafUtils.cpp b/Fwk/AppFwk/CommonCode/cafUtils.cpp index 1b29cd721d..1ee416b9a1 100644 --- a/Fwk/AppFwk/CommonCode/cafUtils.cpp +++ b/Fwk/AppFwk/CommonCode/cafUtils.cpp @@ -121,6 +121,32 @@ QString Utils::constructFullFileName(const QString& folder, const QString& baseF } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString Utils::makeValidFileBasename(const QString& fileBasenameCandidate) +{ + QString cleanBasename = fileBasenameCandidate.trimmed(); + cleanBasename.replace(".", "_"); + cleanBasename.replace(",", "_"); + cleanBasename.replace(":", "_"); + cleanBasename.replace(";", "_"); + cleanBasename.replace(" ", "_"); + cleanBasename.replace("/", "_"); + cleanBasename.replace("\\", "_"); + cleanBasename.replace("<", "_"); + cleanBasename.replace(">", "_"); + cleanBasename.replace("\"", "_"); + cleanBasename.replace("|", "_"); + cleanBasename.replace("?", "_"); + cleanBasename.replace("*", "_"); + + + cleanBasename.replace(QRegExp("_+"), "_"); + + return cleanBasename; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/Fwk/AppFwk/CommonCode/cafUtils.h b/Fwk/AppFwk/CommonCode/cafUtils.h index 27e85796c8..7ff61e78d5 100644 --- a/Fwk/AppFwk/CommonCode/cafUtils.h +++ b/Fwk/AppFwk/CommonCode/cafUtils.h @@ -56,6 +56,7 @@ public: static QString absoluteFileName(const QString& fileName); static QStringList getFilesInDirectory(const QString& dirPath, const QString& filter, bool getAbsoluteFileNames); static QString constructFullFileName(const QString& folder, const QString& baseFileName, const QString& extension); + static QString makeValidFileBasename(const QString& fileBasenameCandidate); static QString indentString(int numSpacesToIndent, const QString& str); From ebddaa31e66071ca33e389b557a9cf02607d1d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Wed, 4 Jan 2017 13:13:06 +0100 Subject: [PATCH 05/27] #1054 Added sensible information to the Result Info window when picking Flow Diag results. Also rolled out the use of resultVariableUiName() to places that should use it. --- ...icSaveEclipseResultAsInputPropertyExec.cpp | 4 +++- .../RicExportMultipleSnapshotsFeature.cpp | 2 +- .../RifEclipseInputFileTools.cpp | 8 +++++++- .../Rim3dOverlayInfoConfig.cpp | 6 +++--- .../RimEclipsePropertyFilter.cpp | 2 +- .../RimEclipseResultDefinition.cpp | 13 ++++++++++++ .../RimEclipseResultDefinition.h | 2 ++ .../ProjectDataModel/RimEclipseView.cpp | 20 +++++++++---------- .../RimWellLogExtractionCurve.cpp | 3 ++- .../UserInterface/RiuResultTextBuilder.cpp | 11 +++++----- .../RiuSelectionChangedHandler.cpp | 2 +- 11 files changed, 48 insertions(+), 25 deletions(-) diff --git a/ApplicationCode/Commands/EclipseCommands/RicSaveEclipseResultAsInputPropertyExec.cpp b/ApplicationCode/Commands/EclipseCommands/RicSaveEclipseResultAsInputPropertyExec.cpp index 49f274112a..aa8fef57e5 100644 --- a/ApplicationCode/Commands/EclipseCommands/RicSaveEclipseResultAsInputPropertyExec.cpp +++ b/ApplicationCode/Commands/EclipseCommands/RicSaveEclipseResultAsInputPropertyExec.cpp @@ -37,6 +37,7 @@ #include #include +#include "cafUtils.h" //-------------------------------------------------------------------------------------------------- /// @@ -84,12 +85,13 @@ void RicSaveEclipseResultAsInputPropertyExec::redo() projectFolder = m_cellColors->reservoirView()->eclipseCase()->locationOnDisc(); } - QString outputFileName = projectFolder + "/" + m_cellColors->resultVariable(); + QString outputFileName = projectFolder + "/" + caf::Utils::makeValidFileBasename( m_cellColors->resultVariableUiName()); exportSettings.fileName = outputFileName; } caf::PdmUiPropertyViewDialog propertyDialog(RiuMainWindow::instance(), &exportSettings, "Export Binary Eclipse Data to Text File", ""); + if (propertyDialog.exec() == QDialog::Accepted) { size_t timeStep = m_cellColors->reservoirView()->currentTimeStep(); diff --git a/ApplicationCode/Commands/RicExportMultipleSnapshotsFeature.cpp b/ApplicationCode/Commands/RicExportMultipleSnapshotsFeature.cpp index 789f22d4f2..76c441c870 100644 --- a/ApplicationCode/Commands/RicExportMultipleSnapshotsFeature.cpp +++ b/ApplicationCode/Commands/RicExportMultipleSnapshotsFeature.cpp @@ -293,7 +293,7 @@ QString RicExportMultipleSnapshotsFeature::resultName(RimView* rimView) { RimEclipseView* eclView = dynamic_cast(rimView); - return eclView->cellResult()->resultVariable(); + return caf::Utils::makeValidFileBasename(eclView->cellResult()->resultVariableUiName()); } else if (dynamic_cast(rimView)) { diff --git a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp index 55a4d894fa..deb5de8404 100644 --- a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp +++ b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp @@ -472,7 +472,13 @@ bool RifEclipseInputFileTools::writePropertyToTextFile(const QString& fileName, /// Create and write a result vector with values for all cells. /// undefinedValue is used for cells with no result //-------------------------------------------------------------------------------------------------- -bool RifEclipseInputFileTools::writeBinaryResultToTextFile(const QString& fileName, RigCaseData* eclipseCase, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStep, const QString& resultName, const QString& eclipseKeyWord, const double undefinedValue) +bool RifEclipseInputFileTools::writeBinaryResultToTextFile(const QString& fileName, + RigCaseData* eclipseCase, + RifReaderInterface::PorosityModelResultType porosityModel, + size_t timeStep, + const QString& resultName, + const QString& eclipseKeyWord, + const double undefinedValue) { CVF_ASSERT(eclipseCase); diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index d4021d87f2..d318791e0d 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -360,13 +360,13 @@ void Rim3dOverlayInfoConfig::updateEclipse3DInfo(RimEclipseView * eclipseView) if (eclipseView->cellResult()->isTernarySaturationSelected()) { - QString propName = eclipseView->cellResult()->resultVariable(); + QString propName = eclipseView->cellResult()->resultVariableUiName(); infoText += QString("Cell Property: %1 ").arg(propName); } if (isResultsInfoRelevant) { - QString propName = eclipseView->cellResult()->resultVariable(); + QString propName = eclipseView->cellResult()->resultVariableUiName(); QString timeRangeText = m_statisticsTimeRange().uiText(); if ( eclipseView->cellResult()->resultType() == RimDefines::FLOW_DIAGNOSTICS ) { @@ -406,7 +406,7 @@ void Rim3dOverlayInfoConfig::updateEclipse3DInfo(RimEclipseView * eclipseView) } infoText += QString("Fault results: %1
").arg(faultMapping); - infoText += QString("Fault Property: %1
").arg(eclipseView->faultResultSettings()->customFaultResult()->resultVariable()); + infoText += QString("Fault Property: %1
").arg(eclipseView->faultResultSettings()->customFaultResult()->resultVariableUiName()); } } diff --git a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp index f8c11becd1..9c47f1c756 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp @@ -353,7 +353,7 @@ void RimEclipsePropertyFilter::computeResultValueRange() //-------------------------------------------------------------------------------------------------- void RimEclipsePropertyFilter::updateFilterName() { - QString newFiltername = resultDefinition->resultVariable(); + QString newFiltername = resultDefinition->resultVariableUiName(); if (isCategorySelectionActive()) { diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 6220eaf6bb..985670e728 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -515,6 +515,19 @@ RigFlowDiagResultAddress RimEclipseResultDefinition::flowDiagResAddress() const return RigFlowDiagResultAddress(m_resultVariable().toStdString(), selTracerNames); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RimEclipseResultDefinition::resultVariableUiName() +{ + if (resultType() == RimDefines::FLOW_DIAGNOSTICS) + { + return QString::fromStdString(flowDiagResAddress().uiText()); + } + + return m_resultVariable(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h index ca4c638294..26c6cc3cba 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h @@ -59,6 +59,8 @@ public: RimFlowDiagSolution* flowDiagSolution(); RigFlowDiagResultAddress flowDiagResAddress() const; + QString resultVariableUiName(); + void loadResult(); size_t scalarResultIndex() const; bool hasStaticResult() const; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index 71e01a8b9e..f4369d56de 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -1000,18 +1000,18 @@ void RimEclipseView::updateMinMaxValuesAndAddLegendToView(QString legendLabel, R { double globalMin, globalMax; double globalPosClosestToZero, globalNegClosestToZero; - RigFlowDiagResults* cellResultsData = resultColors->flowDiagSolution()->flowDiagResults(); + RigFlowDiagResults* flowResultsData = resultColors->flowDiagSolution()->flowDiagResults(); RigFlowDiagResultAddress resAddr = resultColors->flowDiagResAddress(); - cellResultsData->minMaxScalarValues(resAddr, m_currentTimeStep, &globalMin, &globalMax); - cellResultsData->posNegClosestToZero(resAddr, m_currentTimeStep, &globalPosClosestToZero, &globalNegClosestToZero); + flowResultsData->minMaxScalarValues(resAddr, m_currentTimeStep, &globalMin, &globalMax); + flowResultsData->posNegClosestToZero(resAddr, m_currentTimeStep, &globalPosClosestToZero, &globalNegClosestToZero); double localMin, localMax; double localPosClosestToZero, localNegClosestToZero; if ( resultColors->hasDynamicResult() ) { - cellResultsData->minMaxScalarValues(resAddr, m_currentTimeStep, &localMin, &localMax); - cellResultsData->posNegClosestToZero(resAddr, m_currentTimeStep, &localPosClosestToZero, &localNegClosestToZero); + flowResultsData->minMaxScalarValues(resAddr, m_currentTimeStep, &localMin, &localMax); + flowResultsData->posNegClosestToZero(resAddr, m_currentTimeStep, &localPosClosestToZero, &localNegClosestToZero); } else { @@ -1033,9 +1033,7 @@ void RimEclipseView::updateMinMaxValuesAndAddLegendToView(QString legendLabel, R resultColors->legendConfig()->setNamedCategories(resultColors->flowDiagSolution()->tracerNames()); } - m_viewer->addColorLegendToBottomLeftCorner(resultColors->legendConfig()->legend()); - resultColors->legendConfig()->setTitle(cvfqt::Utils::toString(legendLabel + QString::fromStdString( resultColors->flowDiagResAddress().uiText()))); - } + } else { double globalMin, globalMax; @@ -1077,10 +1075,10 @@ void RimEclipseView::updateMinMaxValuesAndAddLegendToView(QString legendLabel, R resultColors->legendConfig()->setNamedCategoriesInverse(fnVector); } } - - m_viewer->addColorLegendToBottomLeftCorner(resultColors->legendConfig()->legend()); - resultColors->legendConfig()->setTitle(cvfqt::Utils::toString(legendLabel + resultColors->resultVariable())); } + + m_viewer->addColorLegendToBottomLeftCorner(resultColors->legendConfig()->legend()); + resultColors->legendConfig()->setTitle(cvfqt::Utils::toString(legendLabel + resultColors->resultVariableUiName())); } diff --git a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp index fb76e70358..461aca615d 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp @@ -51,6 +51,7 @@ #include "cafPdmUiTreeOrdering.h" #include +#include "cafUtils.h" //================================================================================================== /// @@ -570,7 +571,7 @@ QString RimWellLogExtractionCurve::wellLogChannelName() const QString name; if (eclipseCase) { - name = m_eclipseResultDefinition->resultVariable(); + name = caf::Utils::makeValidFileBasename( m_eclipseResultDefinition->resultVariableUiName()); } else if (geoMechCase) { diff --git a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp index cece373605..e8f791b9ec 100644 --- a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp +++ b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp @@ -345,7 +345,7 @@ QString RiuResultTextBuilder::nncResultText() const std::vector* nncValues = nncData->connectionScalarResult(scalarResultIdx); if (nncValues) { - QString resultVar = m_reservoirView->currentFaultResultColors()->resultVariable(); + QString resultVar = m_reservoirView->currentFaultResultColors()->resultVariableUiName(); double scalarValue = (*nncValues)[m_nncIndex]; text = QString("%1 : %2").arg(resultVar).arg(scalarValue); @@ -489,14 +489,14 @@ void RiuResultTextBuilder::appendTextFromResultColors(RigCaseData* eclipseCase, } else { - resultAccessor = RigResultAccessorFactory::createFromResultIdx(eclipseCase, gridIndex, porosityModel, timeStepIndex, resultColors->scalarResultIndex()); + resultAccessor = RigResultAccessorFactory::createFromResultDefinition(eclipseCase, gridIndex, timeStepIndex, resultColors); } if (resultAccessor.notNull()) { double scalarValue = resultAccessor->cellScalar(cellIndex); resultInfoText->append("Cell result : "); - resultInfoText->append(resultColors->resultVariable()); + resultInfoText->append(resultColors->resultVariableUiName()); resultInfoText->append(QString(" : %1\n").arg(scalarValue)); } } @@ -649,7 +649,6 @@ QString RiuResultTextBuilder::cellResultText(RimEclipseCellColors* resultColors) RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(resultColors->porosityModel()); - QString resultVar = resultColors->resultVariable(); if (resultColors->isTernarySaturationSelected()) { @@ -687,10 +686,12 @@ QString RiuResultTextBuilder::cellResultText(RimEclipseCellColors* resultColors) adjustedTimeStep = 0; } - cvf::ref resultAccessor = RigResultAccessorFactory::createFromUiResultName(eclipseCaseData, m_gridIndex, porosityModel, adjustedTimeStep, resultVar); + cvf::ref resultAccessor = RigResultAccessorFactory::createFromResultDefinition(eclipseCaseData, m_gridIndex, adjustedTimeStep, resultColors); if (resultAccessor.notNull()) { double scalarValue = resultAccessor->cellFaceScalar(m_cellIndex, m_face); + QString resultVar = resultColors->resultVariableUiName(); + text = QString("%1 : %2").arg(resultVar).arg(scalarValue); } } diff --git a/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp b/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp index e24c06dcaf..35e3bce98b 100644 --- a/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp +++ b/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp @@ -123,7 +123,7 @@ void RiuSelectionChangedHandler::addCurveFromSelectionItem(const RiuEclipseSelec QString curveName = eclipseView->eclipseCase()->caseUserDescription(); curveName += ", "; - curveName += eclipseView->cellResult()->resultVariable(); + curveName += eclipseView->cellResult()->resultVariableUiName(); curveName += ", "; curveName += QString("Grid index %1").arg(eclipseSelectionItem->m_gridIndex); curveName += ", "; From a9984c4bd53549e648cce682a8c8cff247613e7b Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 5 Jan 2017 07:53:14 +0100 Subject: [PATCH 06/27] #1059 System : Use PdmOptionItemInfo constructor for PdmObjects --- .../ViewLink/RicLinkVisibleViewsFeatureUi.cpp | 12 ++--- .../RicChangeDataSourceFeatureUi.cpp | 25 ++-------- ApplicationCode/ProjectDataModel/RimCase.cpp | 7 +-- .../ProjectDataModel/RimIntersection.cpp | 23 +++------ .../RimMultiSnapshotDefinition.cpp | 11 +--- ApplicationCode/ProjectDataModel/RimTools.cpp | 50 +++++++++++++++++++ ApplicationCode/ProjectDataModel/RimTools.h | 8 +++ .../ProjectDataModel/RimViewController.cpp | 20 ++++---- .../RimWellLogExtractionCurve.cpp | 44 ++++++---------- .../ProjectDataModel/RimWellLogFileCurve.cpp | 5 +- .../Summary/RimSummaryCurve.cpp | 8 ++- .../Summary/RimSummaryCurveFilter.cpp | 6 +-- 12 files changed, 109 insertions(+), 110 deletions(-) diff --git a/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp b/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp index 37f7470602..1305bdf65d 100644 --- a/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp +++ b/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp @@ -79,10 +79,10 @@ QList RicLinkVisibleViewsFeatureUi::calculateValueOption if (fieldNeedingOptions == &m_masterView) { - for (size_t i = 0; i < m_allViews.size(); i++) + for (RimView* v : m_allViews) { - RimCase* rimCase = NULL; - m_allViews[i]->firstAncestorOrThisOfType(rimCase); + RimCase* rimCase = nullptr; + v->firstAncestorOrThisOfType(rimCase); QIcon icon; if (rimCase) @@ -90,11 +90,7 @@ QList RicLinkVisibleViewsFeatureUi::calculateValueOption icon = rimCase->uiCapability()->uiIcon(); } - - optionList.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(m_allViews[i]), - QVariant::fromValue(caf::PdmPointer(m_allViews[i])), - false, - icon)); + optionList.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(v), v, false, icon)); } } diff --git a/ApplicationCode/Commands/WellLogCommands/RicChangeDataSourceFeatureUi.cpp b/ApplicationCode/Commands/WellLogCommands/RicChangeDataSourceFeatureUi.cpp index d6b29c2a8b..0b2c1de315 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicChangeDataSourceFeatureUi.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicChangeDataSourceFeatureUi.cpp @@ -21,6 +21,7 @@ #include "RimCase.h" #include "RimOilField.h" #include "RimProject.h" +#include "RimTools.h" #include "RimWellPath.h" #include "RimWellPathCollection.h" @@ -45,34 +46,18 @@ RicChangeDataSourceFeatureUi::RicChangeDataSourceFeatureUi() //-------------------------------------------------------------------------------------------------- QList RicChangeDataSourceFeatureUi::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) { - QList optionList; + QList options; if (fieldNeedingOptions == &caseToApply) { - RimProject* proj = RiaApplication::instance()->project(); - - std::vector cases; - proj->allCases(cases); - - for (RimCase* c : cases) - { - optionList.push_back(caf::PdmOptionItemInfo(c->caseUserDescription(), c)); - } + RimTools::caseOptionItems(&options); } else if (fieldNeedingOptions == &wellPathToApply) { - RimProject* proj = RiaApplication::instance()->project(); - - if (proj->activeOilField()->wellPathCollection()) - { - for (RimWellPath* wellPath : proj->activeOilField()->wellPathCollection()->wellPaths) - { - optionList.push_back(caf::PdmOptionItemInfo(wellPath->name(), wellPath)); - } - } + RimTools::wellPathOptionItems(&options); } - return optionList; + return options; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimCase.cpp b/ApplicationCode/ProjectDataModel/RimCase.cpp index daefa3f2ec..eb0076beec 100644 --- a/ApplicationCode/ProjectDataModel/RimCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimCase.cpp @@ -78,14 +78,11 @@ QList RimCase::calculateValueOptions(const caf::PdmField { for(RimFormationNames* fnames : proj->activeOilField()->formationNamesCollection()->formationNamesList()) { - optionList.push_back(caf::PdmOptionItemInfo(fnames->fileNameWoPath(), - QVariant::fromValue(caf::PdmPointer(fnames)), - false, - fnames->uiCapability()->uiIcon())); + optionList.push_back(caf::PdmOptionItemInfo(fnames->fileNameWoPath(), fnames, false, fnames->uiCapability()->uiIcon())); } } - optionList.push_front(caf::PdmOptionItemInfo("None", QVariant::fromValue(caf::PdmPointer(NULL)))); + optionList.push_front(caf::PdmOptionItemInfo("None", nullptr)); } return optionList; diff --git a/ApplicationCode/ProjectDataModel/RimIntersection.cpp b/ApplicationCode/ProjectDataModel/RimIntersection.cpp index 793043f292..e9469c2e52 100644 --- a/ApplicationCode/ProjectDataModel/RimIntersection.cpp +++ b/ApplicationCode/ProjectDataModel/RimIntersection.cpp @@ -29,6 +29,7 @@ #include "RimEclipseWellCollection.h" #include "RimOilField.h" #include "RimProject.h" +#include "RimTools.h" #include "RimView.h" #include "RimWellPath.h" @@ -235,21 +236,11 @@ QList RimIntersection::calculateValueOptions(const caf:: if (fieldNeedingOptions == &wellPath) { - RimProject* proj = RiaApplication::instance()->project(); - if (proj->activeOilField()->wellPathCollection()) - { - caf::PdmChildArrayField& wellPaths = proj->activeOilField()->wellPathCollection()->wellPaths; - - QIcon wellIcon(":/Well.png"); - for (size_t i = 0; i < wellPaths.size(); i++) - { - options.push_back(caf::PdmOptionItemInfo(wellPaths[i]->name(), QVariant::fromValue(caf::PdmPointer(wellPaths[i])), false, wellIcon)); - } - } + RimTools::wellPathOptionItems(&options); - if (options.size() == 0) + if (options.size() > 0) { - options.push_front(caf::PdmOptionItemInfo("None", QVariant::fromValue(caf::PdmPointer(NULL)))); + options.push_front(caf::PdmOptionItemInfo("None", nullptr)); } } else if (fieldNeedingOptions == &simulationWell) @@ -260,15 +251,15 @@ QList RimIntersection::calculateValueOptions(const caf:: caf::PdmChildArrayField& eclWells = coll->wells; QIcon simWellIcon(":/Well.png"); - for (size_t i = 0; i < eclWells.size(); i++) + for (RimEclipseWell* eclWell : eclWells) { - options.push_back(caf::PdmOptionItemInfo(eclWells[i]->name(), QVariant::fromValue(caf::PdmPointer(eclWells[i])), false, simWellIcon)); + options.push_back(caf::PdmOptionItemInfo(eclWell->name(), eclWell, false, simWellIcon)); } } if (options.size() == 0) { - options.push_front(caf::PdmOptionItemInfo("None", QVariant::fromValue(caf::PdmPointer(NULL)))); + options.push_front(caf::PdmOptionItemInfo("None", nullptr)); } } else if (fieldNeedingOptions == &m_branchIndex) diff --git a/ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp b/ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp index 15fa2bffd5..2568928d84 100644 --- a/ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp @@ -28,6 +28,7 @@ #include "RimEclipseView.h" #include "RimProject.h" #include "RimReservoirCellResultsStorage.h" +#include "RimTools.h" #include "RimView.h" #include "cafPdmPointer.h" @@ -137,15 +138,7 @@ QList RimMultiSnapshotDefinition::calculateValueOptions( } else if (fieldNeedingOptions == &additionalCases) { - RimProject* proj = RiaApplication::instance()->project(); - std::vector cases; - proj->allCases(cases); - - for (RimCase* rimCase : cases) - { - options.push_back(caf::PdmOptionItemInfo(rimCase->caseUserDescription(), rimCase)); - } - + RimTools::caseOptionItems(&options); } if (useOptionsOnly) *useOptionsOnly = true; diff --git a/ApplicationCode/ProjectDataModel/RimTools.cpp b/ApplicationCode/ProjectDataModel/RimTools.cpp index 7c982956ab..e9dc626ea2 100644 --- a/ApplicationCode/ProjectDataModel/RimTools.cpp +++ b/ApplicationCode/ProjectDataModel/RimTools.cpp @@ -21,7 +21,15 @@ #include "RimTools.h" #include "RiaApplication.h" + +#include "RimCase.h" +#include "RimOilField.h" #include "RimProject.h" +#include "RimWellLogFile.h" +#include "RimWellPath.h" +#include "RimWellPathCollection.h" + +#include "cafPdmUiItem.h" #include #include @@ -200,3 +208,45 @@ QString RimTools::relocateFile(const QString& orgFileName, const QString& orgNew return fileName; } + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimTools::wellPathOptionItems(QList* options) +{ + CVF_ASSERT(options); + if (!options) return; + + RimProject* proj = RiaApplication::instance()->project(); + if (proj && proj->activeOilField() && proj->activeOilField()->wellPathCollection()) + { + caf::PdmChildArrayField& wellPaths = proj->activeOilField()->wellPathCollection()->wellPaths; + + QIcon wellIcon(":/Well.png"); + for (RimWellPath* wellPath : wellPaths) + { + options->push_back(caf::PdmOptionItemInfo(wellPath->name(), wellPath, false, wellIcon)); + } + } +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimTools::caseOptionItems(QList* options) +{ + CVF_ASSERT(options); + if (!options) return; + + RimProject* proj = RiaApplication::instance()->project(); + if (proj) + { + std::vector cases; + proj->allCases(cases); + + for (RimCase* c : cases) + { + options->push_back(caf::PdmOptionItemInfo(c->caseUserDescription(), c, false, c->uiIcon())); + } + } +} diff --git a/ApplicationCode/ProjectDataModel/RimTools.h b/ApplicationCode/ProjectDataModel/RimTools.h index e2f39a0eb3..8078c44f39 100644 --- a/ApplicationCode/ProjectDataModel/RimTools.h +++ b/ApplicationCode/ProjectDataModel/RimTools.h @@ -20,14 +20,22 @@ #pragma once +#include #include #include +namespace caf { + class PdmOptionItemInfo; +} + class RimTools { public: static QString getCacheRootDirectoryPathFromProject(); static QString relocateFile(const QString& fileName, const QString& newProjectPath, const QString& oldProjectPath, bool* foundFile, std::vector* searchedPaths); + + static void wellPathOptionItems(QList* options); + static void caseOptionItems(QList* options); }; diff --git a/ApplicationCode/ProjectDataModel/RimViewController.cpp b/ApplicationCode/ProjectDataModel/RimViewController.cpp index 3081fc57f0..a76fc50352 100644 --- a/ApplicationCode/ProjectDataModel/RimViewController.cpp +++ b/ApplicationCode/ProjectDataModel/RimViewController.cpp @@ -109,31 +109,29 @@ QList RimViewController::calculateValueOptions(const caf views.push_back(this->managedView()); } - RimViewLinker* linkedViews = NULL; - this->firstAncestorOrThisOfType(linkedViews); + RimViewLinker* viewLinker = nullptr; + this->firstAncestorOrThisOfType(viewLinker); + CVF_ASSERT(viewLinker); - for (size_t i = 0; i< views.size(); i++) + for (RimView* view : views) { - if (views[i] != linkedViews->masterView()) + if (view != viewLinker->masterView()) { - RimCase* rimCase = NULL; - views[i]->firstAncestorOrThisOfType(rimCase); + RimCase* rimCase = nullptr; + view->firstAncestorOrThisOfType(rimCase); QIcon icon; if (rimCase) { icon = rimCase->uiCapability()->uiIcon(); } - optionList.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(views[i]), - QVariant::fromValue(caf::PdmPointer(views[i])), - false, - icon)); + optionList.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(view), view, false, icon)); } } if (optionList.size() > 0) { - optionList.push_front(caf::PdmOptionItemInfo("None", QVariant::fromValue(caf::PdmPointer(NULL)))); + optionList.push_front(caf::PdmOptionItemInfo("None", nullptr)); } } diff --git a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp index 461aca615d..7c05d222ed 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp @@ -38,6 +38,7 @@ #include "RimGeoMechView.h" #include "RimOilField.h" #include "RimProject.h" +#include "RimTools.h" #include "RimWellLogCurve.h" #include "RimWellLogPlot.h" #include "RimWellLogPlotCollection.h" @@ -49,9 +50,9 @@ #include "RiuWellLogTrack.h" #include "cafPdmUiTreeOrdering.h" +#include "cafUtils.h" #include -#include "cafUtils.h" //================================================================================================== /// @@ -323,44 +324,27 @@ void RimWellLogExtractionCurve::onLoadDataAndUpdate() //-------------------------------------------------------------------------------------------------- QList RimWellLogExtractionCurve::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) { - QList optionList; + QList options; - optionList = RimWellLogCurve::calculateValueOptions(fieldNeedingOptions, useOptionsOnly); - if (optionList.size() > 0) return optionList; + options = RimWellLogCurve::calculateValueOptions(fieldNeedingOptions, useOptionsOnly); + if (options.size() > 0) return options; if (fieldNeedingOptions == &m_wellPath) { - RimProject* proj = RiaApplication::instance()->project(); - if (proj->activeOilField()->wellPathCollection()) + RimTools::wellPathOptionItems(&options); + + if (options.size() > 0) { - caf::PdmChildArrayField& wellPaths = proj->activeOilField()->wellPathCollection()->wellPaths; - - for (size_t i = 0; i< wellPaths.size(); i++) - { - optionList.push_back(caf::PdmOptionItemInfo(wellPaths[i]->name(), QVariant::fromValue(caf::PdmPointer(wellPaths[i])))); - } - - if (optionList.size() > 0) - { - optionList.push_front(caf::PdmOptionItemInfo("None", QVariant::fromValue(caf::PdmPointer(NULL)))); - } + options.push_front(caf::PdmOptionItemInfo("None", nullptr)); } } else if (fieldNeedingOptions == &m_case) { - RimProject* proj = RiaApplication::instance()->project(); - std::vector cases; + RimTools::caseOptionItems(&options); - proj->allCases(cases); - - for (size_t i = 0; i< cases.size(); i++) + if (options.size() > 0) { - optionList.push_back(caf::PdmOptionItemInfo(cases[i]->caseUserDescription(), QVariant::fromValue(caf::PdmPointer(cases[i])))); - } - - if (optionList.size() > 0) - { - optionList.push_front(caf::PdmOptionItemInfo("None", QVariant::fromValue(caf::PdmPointer(NULL)))); + options.push_front(caf::PdmOptionItemInfo("None", nullptr)); } } else if (fieldNeedingOptions == &m_timeStep) @@ -374,11 +358,11 @@ QList RimWellLogExtractionCurve::calculateValueOptions(c for (int i = 0; i < timeStepNames.size(); i++) { - optionList.push_back(caf::PdmOptionItemInfo(timeStepNames[i], i)); + options.push_back(caf::PdmOptionItemInfo(timeStepNames[i], i)); } } - return optionList; + return options; } diff --git a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp index 5a575cf94d..1f461461b0 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp @@ -210,15 +210,16 @@ QList RimWellLogFileCurve::calculateValueOptions(const c for (size_t i = 0; i < wellPaths.size(); i++) { + // Only include well paths coming from a well log file if (wellPaths[i]->m_wellLogFile()) { - optionList.push_back(caf::PdmOptionItemInfo(wellPaths[i]->name(), QVariant::fromValue(caf::PdmPointer(wellPaths[i])))); + optionList.push_back(caf::PdmOptionItemInfo(wellPaths[i]->name(), wellPaths[i])); } } if (optionList.size() > 0) { - optionList.push_front(caf::PdmOptionItemInfo("None", QVariant::fromValue(caf::PdmPointer(NULL)))); + optionList.push_front(caf::PdmOptionItemInfo("None", nullptr)); } } } diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index c964234cc7..2546367169 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -306,16 +306,14 @@ QList RimSummaryCurve::calculateValueOptions(const caf:: proj->allSummaryCases(cases); - for (size_t i = 0; i < cases.size(); i++) + for (RimSummaryCase* rimCase : cases) { - RimSummaryCase* rimCase = cases[i]; - - optionList.push_back(caf::PdmOptionItemInfo(rimCase->caseName(), QVariant::fromValue(caf::PdmPointer(rimCase)))); + optionList.push_back(caf::PdmOptionItemInfo(rimCase->caseName(), rimCase)); } if (optionList.size() > 0) { - optionList.push_front(caf::PdmOptionItemInfo("None", QVariant::fromValue(caf::PdmPointer(NULL)))); + optionList.push_front(caf::PdmOptionItemInfo("None", nullptr)); } } else if(fieldNeedingOptions == &m_uiFilterResultSelection) diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp index acb5f9a86a..5722309306 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp @@ -164,11 +164,9 @@ QList RimSummaryCurveFilter::calculateValueOptions(const proj->allSummaryCases(cases); - for (size_t i = 0; i < cases.size(); i++) + for (RimSummaryCase* rimCase : cases) { - RimSummaryCase* rimCase = cases[i]; - - optionList.push_back(caf::PdmOptionItemInfo(rimCase->caseName(), QVariant::fromValue(caf::PdmPointer(rimCase)))); + optionList.push_back(caf::PdmOptionItemInfo(rimCase->caseName(), rimCase)); } } else if(fieldNeedingOptions == &m_uiFilterResultMultiSelection) From a61b3ad5f62562aa98f2d4f30b64b851d355dd6b Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 5 Jan 2017 07:57:37 +0100 Subject: [PATCH 07/27] #1059 Rename --- .../ViewLink/RicLinkVisibleViewsFeatureUi.cpp | 6 +++--- ApplicationCode/ProjectDataModel/RimCase.cpp | 8 ++++---- .../ProjectDataModel/RimCellEdgeColors.cpp | 8 ++++---- .../ProjectDataModel/RimCellFilter.cpp | 8 ++++---- .../RimEclipseResultDefinition.cpp | 18 ++++++++--------- .../ProjectDataModel/RimLegendConfig.cpp | 14 ++++++------- .../ProjectDataModel/RimViewController.cpp | 10 +++++----- .../ProjectDataModel/RimWellLogFileCurve.cpp | 20 +++++++++---------- .../Summary/RimSummaryCurve.cpp | 16 +++++++-------- .../Summary/RimSummaryCurveFilter.cpp | 8 ++++---- 10 files changed, 58 insertions(+), 58 deletions(-) diff --git a/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp b/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp index 1305bdf65d..048e55811f 100644 --- a/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp +++ b/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp @@ -75,7 +75,7 @@ RimView* RicLinkVisibleViewsFeatureUi::masterView() //-------------------------------------------------------------------------------------------------- QList RicLinkVisibleViewsFeatureUi::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) { - QList optionList; + QList options; if (fieldNeedingOptions == &m_masterView) { @@ -90,9 +90,9 @@ QList RicLinkVisibleViewsFeatureUi::calculateValueOption icon = rimCase->uiCapability()->uiIcon(); } - optionList.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(v), v, false, icon)); + options.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(v), v, false, icon)); } } - return optionList; + return options; } diff --git a/ApplicationCode/ProjectDataModel/RimCase.cpp b/ApplicationCode/ProjectDataModel/RimCase.cpp index eb0076beec..e6ffa0a35b 100644 --- a/ApplicationCode/ProjectDataModel/RimCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimCase.cpp @@ -69,7 +69,7 @@ cvf::Vec3d RimCase::displayModelOffset() const //-------------------------------------------------------------------------------------------------- QList RimCase::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) { - QList optionList; + QList options; if(fieldNeedingOptions == &activeFormationNames) { @@ -78,12 +78,12 @@ QList RimCase::calculateValueOptions(const caf::PdmField { for(RimFormationNames* fnames : proj->activeOilField()->formationNamesCollection()->formationNamesList()) { - optionList.push_back(caf::PdmOptionItemInfo(fnames->fileNameWoPath(), fnames, false, fnames->uiCapability()->uiIcon())); + options.push_back(caf::PdmOptionItemInfo(fnames->fileNameWoPath(), fnames, false, fnames->uiCapability()->uiIcon())); } } - optionList.push_front(caf::PdmOptionItemInfo("None", nullptr)); + options.push_front(caf::PdmOptionItemInfo("None", nullptr)); } - return optionList; + return options; } diff --git a/ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp b/ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp index 83e7b5882a..fa1281a4b5 100644 --- a/ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp +++ b/ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp @@ -190,7 +190,7 @@ QList RimCellEdgeColors::calculateValueOptions(const caf //TODO: Must also handle input properties //varList += m_reservoirView->gridCellResults()->resultNames(RimDefines::INPUT_PROPERTY); - QList optionList; + QList options; std::map > varBaseNameToVarsMap; @@ -237,15 +237,15 @@ QList RimCellEdgeColors::calculateValueOptions(const caf } optionUiName += ")"; - optionList.push_back(caf::PdmOptionItemInfo( optionUiName, QVariant(it->first))); + options.push_back(caf::PdmOptionItemInfo( optionUiName, QVariant(it->first))); } - optionList.push_front(caf::PdmOptionItemInfo(RimDefines::undefinedResultName(), "")); + options.push_front(caf::PdmOptionItemInfo(RimDefines::undefinedResultName(), "")); if (useOptionsOnly) *useOptionsOnly = true; - return optionList; + return options; } } diff --git a/ApplicationCode/ProjectDataModel/RimCellFilter.cpp b/ApplicationCode/ProjectDataModel/RimCellFilter.cpp index 411d869b83..bc2bfb32c6 100644 --- a/ApplicationCode/ProjectDataModel/RimCellFilter.cpp +++ b/ApplicationCode/ProjectDataModel/RimCellFilter.cpp @@ -128,7 +128,7 @@ caf::PdmFieldHandle* RimCellFilter::objectToggleField() //-------------------------------------------------------------------------------------------------- QList RimCellFilter::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) { - QList optionList; + QList options; if (&m_selectedCategoryValues == fieldNeedingOptions) { @@ -141,7 +141,7 @@ QList RimCellFilter::calculateValueOptions(const caf::Pd int categoryValue = m_categoryValues[i]; QString categoryName = m_categoryNames[i]; - optionList.push_back(caf::PdmOptionItemInfo(categoryName, categoryValue)); + options.push_back(caf::PdmOptionItemInfo(categoryName, categoryValue)); } } else @@ -149,12 +149,12 @@ QList RimCellFilter::calculateValueOptions(const caf::Pd for (auto it : m_categoryValues) { QString str = QString::number(it); - optionList.push_back(caf::PdmOptionItemInfo(str, it)); + options.push_back(caf::PdmOptionItemInfo(str, it)); } } } - return optionList; + return options; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 985670e728..2c4aa21004 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -298,23 +298,23 @@ void RimEclipseResultDefinition::updateResultNameHasChanged() //-------------------------------------------------------------------------------------------------- QList RimEclipseResultDefinition::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) { - QList optionItems; + QList options; if ( m_resultTypeUiField() != RimDefines::FLOW_DIAGNOSTICS ) { if ( fieldNeedingOptions == &m_resultVariableUiField ) { - optionItems = calcOptionsForVariableUiFieldStandard(); + options = calcOptionsForVariableUiFieldStandard(); } } else { if ( fieldNeedingOptions == &m_resultVariableUiField ) { - optionItems.push_back(caf::PdmOptionItemInfo("Time Of Flight (Average)", RIG_FLD_TOF_RESNAME)); - optionItems.push_back(caf::PdmOptionItemInfo("Tracer Cell Fraction (Sum)", RIG_FLD_CELL_FRACTION_RESNAME)); - optionItems.push_back(caf::PdmOptionItemInfo("Max Fraction Tracer", RIG_FLD_MAX_FRACTION_TRACER_RESNAME)); - optionItems.push_back(caf::PdmOptionItemInfo("Injector Producer Communication", RIG_FLD_COMMUNICATION_RESNAME)); + options.push_back(caf::PdmOptionItemInfo("Time Of Flight (Average)", RIG_FLD_TOF_RESNAME)); + options.push_back(caf::PdmOptionItemInfo("Tracer Cell Fraction (Sum)", RIG_FLD_CELL_FRACTION_RESNAME)); + options.push_back(caf::PdmOptionItemInfo("Max Fraction Tracer", RIG_FLD_MAX_FRACTION_TRACER_RESNAME)); + options.push_back(caf::PdmOptionItemInfo("Injector Producer Communication", RIG_FLD_COMMUNICATION_RESNAME)); } else if (fieldNeedingOptions == &m_flowSolutionUiField) { @@ -325,7 +325,7 @@ QList RimEclipseResultDefinition::calculateValueOptions( std::vector flowSols = eclCase->flowDiagSolutions(); for (RimFlowDiagSolution* flowSol : flowSols) { - optionItems.push_back(caf::PdmOptionItemInfo(flowSol->userDescription(), flowSol)); + options.push_back(caf::PdmOptionItemInfo(flowSol->userDescription(), flowSol)); } } } @@ -351,7 +351,7 @@ QList RimEclipseResultDefinition::calculateValueOptions( for (auto nameIt: prefixedTracerNamesMap) { - optionItems.push_back(caf::PdmOptionItemInfo(nameIt.first, QVariant(nameIt.second))); + options.push_back(caf::PdmOptionItemInfo(nameIt.first, QVariant(nameIt.second))); } } } @@ -359,7 +359,7 @@ QList RimEclipseResultDefinition::calculateValueOptions( (*useOptionsOnly) = true; - return optionItems; + return options; } diff --git a/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp b/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp index 15649e4d53..a11403ee8c 100644 --- a/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp +++ b/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp @@ -861,7 +861,7 @@ QList RimLegendConfig::calculateValueOptions(const caf:: } } - QList optionList; + QList options; if (fieldNeedingOptions == &m_mappingMode) { @@ -879,7 +879,7 @@ QList RimLegendConfig::calculateValueOptions(const caf:: for(MappingType mapType: mappingTypes) { - optionList.push_back(caf::PdmOptionItemInfo(MappingEnum::uiText(mapType), mapType)); + options.push_back(caf::PdmOptionItemInfo(MappingEnum::uiText(mapType), mapType)); } } else if (fieldNeedingOptions == &m_colorRangeMode) @@ -903,18 +903,18 @@ QList RimLegendConfig::calculateValueOptions(const caf:: for(ColorRangesType colType: rangeTypes) { - optionList.push_back(caf::PdmOptionItemInfo(ColorRangeEnum::uiText(colType), colType)); + options.push_back(caf::PdmOptionItemInfo(ColorRangeEnum::uiText(colType), colType)); } } else if (fieldNeedingOptions == &m_rangeMode) { if (!m_isAllTimeStepsRangeDisabled) { - optionList.push_back(caf::PdmOptionItemInfo(RangeModeEnum::uiText(RimLegendConfig::AUTOMATIC_ALLTIMESTEPS), RimLegendConfig::AUTOMATIC_ALLTIMESTEPS)); + options.push_back(caf::PdmOptionItemInfo(RangeModeEnum::uiText(RimLegendConfig::AUTOMATIC_ALLTIMESTEPS), RimLegendConfig::AUTOMATIC_ALLTIMESTEPS)); } - optionList.push_back(caf::PdmOptionItemInfo(RangeModeEnum::uiText(RimLegendConfig::AUTOMATIC_CURRENT_TIMESTEP), RimLegendConfig::AUTOMATIC_CURRENT_TIMESTEP)); - optionList.push_back(caf::PdmOptionItemInfo(RangeModeEnum::uiText(RimLegendConfig::USER_DEFINED), RimLegendConfig::USER_DEFINED)); + options.push_back(caf::PdmOptionItemInfo(RangeModeEnum::uiText(RimLegendConfig::AUTOMATIC_CURRENT_TIMESTEP), RimLegendConfig::AUTOMATIC_CURRENT_TIMESTEP)); + options.push_back(caf::PdmOptionItemInfo(RangeModeEnum::uiText(RimLegendConfig::USER_DEFINED), RimLegendConfig::USER_DEFINED)); } - return optionList; + return options; } diff --git a/ApplicationCode/ProjectDataModel/RimViewController.cpp b/ApplicationCode/ProjectDataModel/RimViewController.cpp index a76fc50352..560c91366f 100644 --- a/ApplicationCode/ProjectDataModel/RimViewController.cpp +++ b/ApplicationCode/ProjectDataModel/RimViewController.cpp @@ -95,7 +95,7 @@ RimViewController::~RimViewController(void) //-------------------------------------------------------------------------------------------------- QList RimViewController::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) { - QList optionList; + QList options; if (fieldNeedingOptions == &m_managedView) { @@ -125,17 +125,17 @@ QList RimViewController::calculateValueOptions(const caf icon = rimCase->uiCapability()->uiIcon(); } - optionList.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(view), view, false, icon)); + options.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(view), view, false, icon)); } } - if (optionList.size() > 0) + if (options.size() > 0) { - optionList.push_front(caf::PdmOptionItemInfo("None", nullptr)); + options.push_front(caf::PdmOptionItemInfo("None", nullptr)); } } - return optionList; + return options; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp index 1f461461b0..93135dd956 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp @@ -196,10 +196,10 @@ void RimWellLogFileCurve::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrd //-------------------------------------------------------------------------------------------------- QList RimWellLogFileCurve::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) { - QList optionList; + QList options; - optionList = RimWellLogCurve::calculateValueOptions(fieldNeedingOptions, useOptionsOnly); - if (optionList.size() > 0) return optionList; + options = RimWellLogCurve::calculateValueOptions(fieldNeedingOptions, useOptionsOnly); + if (options.size() > 0) return options; if (fieldNeedingOptions == &m_wellPath) { @@ -213,13 +213,13 @@ QList RimWellLogFileCurve::calculateValueOptions(const c // Only include well paths coming from a well log file if (wellPaths[i]->m_wellLogFile()) { - optionList.push_back(caf::PdmOptionItemInfo(wellPaths[i]->name(), wellPaths[i])); + options.push_back(caf::PdmOptionItemInfo(wellPaths[i]->name(), wellPaths[i])); } } - if (optionList.size() > 0) + if (options.size() > 0) { - optionList.push_front(caf::PdmOptionItemInfo("None", nullptr)); + options.push_front(caf::PdmOptionItemInfo("None", nullptr)); } } } @@ -236,18 +236,18 @@ QList RimWellLogFileCurve::calculateValueOptions(const c for (size_t i = 0; i < fileLogs->size(); i++) { QString wellLogChannelName = (*fileLogs)[i]->name(); - optionList.push_back(caf::PdmOptionItemInfo(wellLogChannelName, wellLogChannelName)); + options.push_back(caf::PdmOptionItemInfo(wellLogChannelName, wellLogChannelName)); } } } - if (optionList.size() == 0) + if (options.size() == 0) { - optionList.push_back(caf::PdmOptionItemInfo("None", "None")); + options.push_back(caf::PdmOptionItemInfo("None", "None")); } } - return optionList; + return options; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index 2546367169..a990d27cc1 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -295,8 +295,8 @@ RimDefines::PlotAxis RimSummaryCurve::yAxis() const //-------------------------------------------------------------------------------------------------- QList RimSummaryCurve::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) { - QList optionList = this->RimPlotCurve::calculateValueOptions(fieldNeedingOptions,useOptionsOnly); - if (!optionList.isEmpty()) return optionList; + QList options = this->RimPlotCurve::calculateValueOptions(fieldNeedingOptions,useOptionsOnly); + if (!options.isEmpty()) return options; if (fieldNeedingOptions == &m_summaryCase) @@ -308,12 +308,12 @@ QList RimSummaryCurve::calculateValueOptions(const caf:: for (RimSummaryCase* rimCase : cases) { - optionList.push_back(caf::PdmOptionItemInfo(rimCase->caseName(), rimCase)); + options.push_back(caf::PdmOptionItemInfo(rimCase->caseName(), rimCase)); } - if (optionList.size() > 0) + if (options.size() > 0) { - optionList.push_front(caf::PdmOptionItemInfo("None", nullptr)); + options.push_front(caf::PdmOptionItemInfo("None", nullptr)); } } else if(fieldNeedingOptions == &m_uiFilterResultSelection) @@ -337,16 +337,16 @@ QList RimSummaryCurve::calculateValueOptions(const caf:: { std::string name = addrIntPair.first.uiText(); QString s = QString::fromStdString(name); - optionList.push_back(caf::PdmOptionItemInfo(s, addrIntPair.second)); + options.push_back(caf::PdmOptionItemInfo(s, addrIntPair.second)); } } - optionList.push_front(caf::PdmOptionItemInfo(RimDefines::undefinedResultName(), addressCount)); + options.push_front(caf::PdmOptionItemInfo(RimDefines::undefinedResultName(), addressCount)); if(useOptionsOnly) *useOptionsOnly = true; } } - return optionList; + return options; } diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp index 5722309306..04efa85b94 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp @@ -155,7 +155,7 @@ void RimSummaryCurveFilter::createCurves(RimSummaryCase* summaryCase, const QStr //-------------------------------------------------------------------------------------------------- QList RimSummaryCurveFilter::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) { - QList optionList; + QList options; if (fieldNeedingOptions == &m_selectedSummaryCases) { @@ -166,7 +166,7 @@ QList RimSummaryCurveFilter::calculateValueOptions(const for (RimSummaryCase* rimCase : cases) { - optionList.push_back(caf::PdmOptionItemInfo(rimCase->caseName(), rimCase)); + options.push_back(caf::PdmOptionItemInfo(rimCase->caseName(), rimCase)); } } else if(fieldNeedingOptions == &m_uiFilterResultMultiSelection) @@ -177,13 +177,13 @@ QList RimSummaryCurveFilter::calculateValueOptions(const { std::string name = address.uiText(); QString s = QString::fromStdString(name); - optionList.push_back(caf::PdmOptionItemInfo(s, QVariant::fromValue(address))); + options.push_back(caf::PdmOptionItemInfo(s, QVariant::fromValue(address))); } } if(useOptionsOnly) *useOptionsOnly = true; - return optionList; + return options; } //-------------------------------------------------------------------------------------------------- From 95206315fac77db98c34dd81a9461a27ab4c2321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Thu, 5 Jan 2017 14:57:25 +0100 Subject: [PATCH 08/27] opm-flowdiagnostics updated to 80190c28ae0fd4a82cfe88c827559029982db83b opm-flowdiagnostics-applications updated to 01ecb8fc22cb70d883edaad398bffc49878859c3 Which fixes error in TOF calculations. --- ResInsightVersion.cmake | 3 + .../CMakeLists_files.cmake | 2 + .../examples/computeLocalSolutions.cpp | 69 ++++++ .../examples/computeToFandTracers.cpp | 3 +- .../examples/computeTracers.cpp | 47 +++++ .../examples/exampleSetup.hpp | 72 ++++--- .../opm/utility/ECLWellSolution.cpp | 3 +- .../opm/flowdiagnostics/Toolbox.cpp | 6 +- .../opm/flowdiagnostics/TracerTofSolver.cpp | 26 ++- .../opm/flowdiagnostics/TracerTofSolver.hpp | 4 +- .../tests/test_flowdiagnosticstool.cpp | 198 +++++++++++++++++- 11 files changed, 391 insertions(+), 42 deletions(-) create mode 100644 ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/computeLocalSolutions.cpp create mode 100644 ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/computeTracers.cpp diff --git a/ResInsightVersion.cmake b/ResInsightVersion.cmake index 0ca68c457e..c0a9263322 100644 --- a/ResInsightVersion.cmake +++ b/ResInsightVersion.cmake @@ -13,5 +13,8 @@ set(ERT_GITHUB_SHA "236164870f011305aed2eca85c45944b021e4107") set(OPM_COMMON_GITHUB_SHA "1216bc052542f24ec6fcfbe1947d52e6300ff754") set(OPM_PARSER_GITHUB_SHA "a3496df501a4369fd827fbf0ff893d03deff425f") +set(OPM_FLOWDIAGNOSTICS_SHA "80190c28ae0fd4a82cfe88c827559029982db83b") +set(OPM_FLOWDIAGNOSTICS_APPLICATIONS_SHA "01ecb8fc22cb70d883edaad398bffc49878859c3") + set(STRPRODUCTVER ${RESINSIGHT_MAJOR_VERSION}.${RESINSIGHT_MINOR_VERSION}.${RESINSIGHT_INCREMENT_VERSION}) diff --git a/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/CMakeLists_files.cmake b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/CMakeLists_files.cmake index 34bb45daa4..525d6de6b4 100644 --- a/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/CMakeLists_files.cmake +++ b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/CMakeLists_files.cmake @@ -30,7 +30,9 @@ list (APPEND TEST_SOURCE_FILES ) list (APPEND EXAMPLE_SOURCE_FILES + examples/computeLocalSolutions.cpp examples/computeToFandTracers.cpp + examples/computeTracers.cpp ) list (APPEND PUBLIC_HEADER_FILES diff --git a/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/computeLocalSolutions.cpp b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/computeLocalSolutions.cpp new file mode 100644 index 0000000000..729a8e9dcb --- /dev/null +++ b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/computeLocalSolutions.cpp @@ -0,0 +1,69 @@ +/* + Copyright 2017 SINTEF ICT, Applied Mathematics. + Copyright 2017 Statoil ASA. + + This file is part of the Open Porous Media project (OPM). + + OPM 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. + + OPM 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 for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ + +#if HAVE_CONFIG_H +#include +#endif + +#include "exampleSetup.hpp" +#include + +// Syntax (typical): +// computeToFandTracers case= step= +int main(int argc, char* argv[]) +try { + example::Setup setup(argc, argv); + auto& fdTool = setup.toolbox; + + // Create start sets from injector wells. + std::vector start; + for (const auto& well : setup.well_fluxes) { + if (!well.is_injector_well) { + continue; + } + std::vector completion_cells; + completion_cells.reserve(well.completions.size()); + for (const auto& completion : well.completions) { + const int grid_index = completion.grid_index; + const auto& ijk = completion.ijk; + const int cell_index = setup.graph.activeCell(ijk, grid_index); + if (cell_index >= 0) { + completion_cells.push_back(cell_index); + } + } + start.emplace_back(Opm::FlowDiagnostics::CellSetID(well.name), completion_cells); + } + + + // Solve for injection time of flight and tracers. + auto sol = fdTool.computeInjectionDiagnostics(start); + + // Get local tof for first injector. + const auto& tof = sol.fd.timeOfFlight(start.front().id()); + + // Write it to standard out. + std::cout.precision(16); + for (auto item : tof) { + std::cout << item.first << " " << item.second << '\n'; + } +} +catch (const std::exception& e) { + std::cerr << "Caught exception: " << e.what() << '\n'; +} diff --git a/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/computeToFandTracers.cpp b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/computeToFandTracers.cpp index d052dc111e..fee7bbce0b 100644 --- a/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/computeToFandTracers.cpp +++ b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/computeToFandTracers.cpp @@ -29,7 +29,8 @@ // computeToFandTracers case= step= int main(int argc, char* argv[]) try { - auto fdTool = example::setup(argc, argv); + example::Setup setup(argc, argv); + auto& fdTool = setup.toolbox; // Solve for time of flight. std::vector start; diff --git a/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/computeTracers.cpp b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/computeTracers.cpp new file mode 100644 index 0000000000..85d3d48bf3 --- /dev/null +++ b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/computeTracers.cpp @@ -0,0 +1,47 @@ +/* + Copyright 2016 SINTEF ICT, Applied Mathematics. + Copyright 2016 Statoil ASA. + + This file is part of the Open Porous Media Project (OPM). + + OPM 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. + + OPM 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 for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ + +#if HAVE_CONFIG_H +#include +#endif + +#include "exampleSetup.hpp" + + +int main(int argc, char** argv) +try { + example::Setup setup(argc, argv); + auto& fdTool = setup.toolbox; + + // Solve for tracers. + Opm::FlowDiagnostics::CellSetID id("Example start set ID"); + Opm::FlowDiagnostics::CellSet start(id, {123}); + auto sol = fdTool.computeInjectionDiagnostics({start}); + const auto& conc_sol = sol.fd.concentration(id); + + // Write it to standard out. + std::cout.precision(16); + for (auto item : conc_sol) { + std::cout << item.first << " " << item.second << '\n'; + } +} +catch (const std::exception& e) { + std::cerr << "Caught exception: " << e.what() << '\n'; +} diff --git a/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/exampleSetup.hpp b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/exampleSetup.hpp index bdd2444b5c..389a4f2b4f 100644 --- a/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/exampleSetup.hpp +++ b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/exampleSetup.hpp @@ -158,32 +158,8 @@ namespace example { } } - inline Opm::FlowDiagnostics::Toolbox - initialiseFlowDiagnostics(const Opm::ECLGraph& G) - { - const auto connGraph = Opm::FlowDiagnostics:: - ConnectivityGraph{ static_cast(G.numCells()), - G.neighbours() }; - - // Create the Toolbox. - auto tool = Opm::FlowDiagnostics::Toolbox{ connGraph }; - - tool.assignPoreVolume(G.poreVolume()); - tool.assignConnectionFlux(Hack::convert_flux_to_SI(extractFluxField(G))); - - auto wsol = Opm::ECLWellSolution{}; - - const auto well_fluxes = - wsol.solution(G.rawResultData(), G.numGrids()); - - tool.assignInflowFlux(extractWellFlows(G, well_fluxes)); - - return tool; - } - - - inline auto setup(int argc, char* argv[]) - -> decltype(initialiseFlowDiagnostics(std::declval())) + inline Opm::ECLGraph + initGraph(int argc, char* argv[]) { // Obtain parameters from command line (possibly specifying a parameter file). const bool verify_commandline_syntax = true; @@ -216,9 +192,51 @@ namespace example { throw std::domain_error(os.str()); } - return initialiseFlowDiagnostics(graph); + return graph; } + inline std::vector + initWellFluxes(const Opm::ECLGraph& G) + { + auto wsol = Opm::ECLWellSolution{}; + return wsol.solution(G.rawResultData(), G.numGrids()); + } + + inline Opm::FlowDiagnostics::Toolbox + initToolbox(const Opm::ECLGraph& G, const std::vector& well_fluxes) + { + const auto connGraph = Opm::FlowDiagnostics:: + ConnectivityGraph{ static_cast(G.numCells()), + G.neighbours() }; + + // Create the Toolbox. + auto tool = Opm::FlowDiagnostics::Toolbox{ connGraph }; + + tool.assignPoreVolume(G.poreVolume()); + tool.assignConnectionFlux(Hack::convert_flux_to_SI(extractFluxField(G))); + + tool.assignInflowFlux(extractWellFlows(G, well_fluxes)); + + return tool; + } + + + + + struct Setup + { + Setup(int argc, char** argv) + : graph(initGraph(argc, argv)) + , well_fluxes(initWellFluxes(graph)) + , toolbox(initToolbox(graph, well_fluxes)) + { + } + + Opm::ECLGraph graph; + std::vector well_fluxes; + Opm::FlowDiagnostics::Toolbox toolbox; + }; + } // namespace example diff --git a/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLWellSolution.cpp b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLWellSolution.cpp index 5774f4e4ab..630f17ca89 100644 --- a/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLWellSolution.cpp +++ b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLWellSolution.cpp @@ -202,8 +202,9 @@ namespace Opm // Otherwise: add data for this well. WellData wd; wd.name = trimSpacesRight(zwel[well * ih.nzwel]); - const int ncon = iwel[well * ih.niwel + IWEL_CONNECTIONS_INDEX]; const bool is_producer = (iwel[well * ih.niwel + IWEL_TYPE_INDEX] == IWEL_TYPE_PRODUCER); + wd.is_injector_well = !is_producer; + const int ncon = iwel[well * ih.niwel + IWEL_CONNECTIONS_INDEX]; wd.completions.reserve(ncon); for (int comp_index = 0; comp_index < ncon; ++comp_index) { const int icon_offset = (well*ih.ncwma + comp_index) * ih.nicon; diff --git a/ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/opm/flowdiagnostics/Toolbox.cpp b/ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/opm/flowdiagnostics/Toolbox.cpp index 211f6c4e8d..ad27e56d02 100644 --- a/ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/opm/flowdiagnostics/Toolbox.cpp +++ b/ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/opm/flowdiagnostics/Toolbox.cpp @@ -139,7 +139,7 @@ Toolbox::Impl::injDiag(const std::vector& start_sets) using Conc = Solution::TracerConcentration; TracerTofSolver solver(downstream_conn_, upstream_conn_, pvol_, only_inflow_flux_); - sol.assignGlobalToF(solver.solveGlobal(start_sets)); + sol.assignGlobalToF(solver.solveGlobal()); for (const auto& start : start_sets) { auto solution = solver.solveLocal(start); @@ -167,7 +167,7 @@ Toolbox::Impl::prodDiag(const std::vector& start_sets) using Conc = Solution::TracerConcentration; TracerTofSolver solver(upstream_conn_, downstream_conn_, pvol_, only_outflow_flux_); - sol.assignGlobalToF(solver.solveGlobal(start_sets)); + sol.assignGlobalToF(solver.solveGlobal()); for (const auto& start : start_sets) { auto solution = solver.solveLocal(start); @@ -198,7 +198,7 @@ Toolbox::Impl::buildAssembledConnections() if (connection_flux > 0.0) { downstream_conn_.addConnection(cells.first, cells.second, connection_flux); upstream_conn_.addConnection(cells.second, cells.first, connection_flux); - } else { + } else if (connection_flux < 0.0) { downstream_conn_.addConnection(cells.second, cells.first, -connection_flux); upstream_conn_.addConnection(cells.first, cells.second, -connection_flux); } diff --git a/ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/opm/flowdiagnostics/TracerTofSolver.cpp b/ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/opm/flowdiagnostics/TracerTofSolver.cpp index 2cdf383bbd..2448fcd480 100644 --- a/ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/opm/flowdiagnostics/TracerTofSolver.cpp +++ b/ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/opm/flowdiagnostics/TracerTofSolver.cpp @@ -107,13 +107,11 @@ namespace FlowDiagnostics - std::vector TracerTofSolver::solveGlobal(const std::vector& all_startsets) + std::vector TracerTofSolver::solveGlobal() { // Reset solver variables and set source terms. prepareForSolve(); - for (const CellSet& startset : all_startsets) { - setupStartArray(startset); - } + setupStartArrayFromSource(); // Compute topological ordering and solve. computeOrdering(); @@ -183,6 +181,20 @@ namespace FlowDiagnostics + void TracerTofSolver::setupStartArrayFromSource() + { + const int num_cells = pv_.size(); + for (int cell = 0; cell < num_cells; ++cell) { + if (source_term_[cell] > 0.0) { + is_start_[cell] = 1; + } + } + } + + + + + void TracerTofSolver::computeOrdering() { // Compute reverse topological ordering. @@ -239,7 +251,7 @@ namespace FlowDiagnostics } // Extract data from solution. - sequence_.resize(num_cells); + sequence_.resize(num_cells); // For local solutions this is the upper limit of the size. TODO: use exact size. const int num_comp = tarjan_get_numcomponents(result.get()); component_starts_.resize(num_comp + 1); component_starts_[0] = 0; @@ -305,13 +317,13 @@ namespace FlowDiagnostics for (const auto& conn : g_reverse_.cellNeighbourhood(cell)) { const int upwind_cell = conn.neighbour; const double flux = conn.weight; - upwind_tof_contrib += tof_[upwind_cell] * flux; + upwind_tof_contrib += tof_[upwind_cell] * tracer_[upwind_cell] * flux; upwind_tracer_contrib += tracer_[upwind_cell] * flux; } // Compute time-of-flight and tracer. - tof_[cell] = (pv_[cell] + upwind_tof_contrib) / total_influx; tracer_[cell] = is_start_[cell] ? 1.0 : upwind_tracer_contrib / total_influx; + tof_[cell] = (pv_[cell]*tracer_[cell] + upwind_tof_contrib) / (total_influx*tracer_[cell]); } diff --git a/ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/opm/flowdiagnostics/TracerTofSolver.hpp b/ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/opm/flowdiagnostics/TracerTofSolver.hpp index 984a18daf9..b97410176a 100644 --- a/ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/opm/flowdiagnostics/TracerTofSolver.hpp +++ b/ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/opm/flowdiagnostics/TracerTofSolver.hpp @@ -59,7 +59,7 @@ namespace FlowDiagnostics /// Compute the global (combining all sources) time-of-flight of each cell. /// /// TODO: also compute tracer solution. - std::vector solveGlobal(const std::vector& all_startsets); + std::vector solveGlobal(); /// Output data struct for solveLocal(). struct LocalSolution { @@ -111,6 +111,8 @@ namespace FlowDiagnostics void setupStartArray(const CellSet& startset); + void setupStartArrayFromSource(); + void computeOrdering(); void computeLocalOrdering(const CellSet& startset); diff --git a/ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/tests/test_flowdiagnosticstool.cpp b/ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/tests/test_flowdiagnosticstool.cpp index 46aa3626b1..ff082e808a 100644 --- a/ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/tests/test_flowdiagnosticstool.cpp +++ b/ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/tests/test_flowdiagnosticstool.cpp @@ -298,7 +298,7 @@ BOOST_AUTO_TEST_CASE (OneDimCase) const auto tof = fwd.fd.timeOfFlight(); BOOST_REQUIRE_EQUAL(tof.size(), cas.connectivity().numCells()); - std::vector expected = { 1.0, 2.0, 3.0, 4.0, 0.0 }; + std::vector expected = { 1.0, 2.0, 3.0, 4.0, 5.0 }; check_is_close(tof, expected); } @@ -307,7 +307,7 @@ BOOST_AUTO_TEST_CASE (OneDimCase) const auto tof = rev.fd.timeOfFlight(); BOOST_REQUIRE_EQUAL(tof.size(), cas.connectivity().numCells()); - std::vector expected = { 0.0, 4.0, 3.0, 2.0, 1.0 }; + std::vector expected = { 5.0, 4.0, 3.0, 2.0, 1.0 }; check_is_close(tof, expected); } @@ -439,4 +439,198 @@ BOOST_AUTO_TEST_CASE (OneDimCase) } +// Arrows indicate a flux of 0.3, O is a source of 0.3 +// and X is a sink of 0.3 (each cell has a pore volume of 0.3). +// ---------------------------- +// | | | | +// | O -> -> | +// | | -> | +// | | | || | +// -------------^--------VV---- +// | | | | | +// | | | | +// | O -> | XX | +// | | | | +// ---------------------------- +// Cell indices: +// ---------------------------- +// | | | | +// | | | | +// | 3 | 4 | 5 | +// | | | | +// ---------------------------- +// | | | | +// | | | | +// | 0 | 1 | 2 | +// | | | | +// ---------------------------- +// Expected global injection TOF: +// ---------------------------- +// | | | | +// | | | | +// | 1.0 | 2.0 | 2.5 | +// | | | | +// ---------------------------- +// | | | | +// | | | | +// | 1.0 | 2.0 | 3.0 | +// | | | | +// ---------------------------- +// Expected global production TOF: +// ---------------------------- +// | | | | +// | | | | +// | 2.5 | 1.5 | 1.0 | +// | | | | +// ---------------------------- +// | | | | +// | | | | +// | 3.5 | 2.5 | 0.5 | +// | | | | +// ---------------------------- +BOOST_AUTO_TEST_CASE (LocalSolutions) +{ + using namespace Opm::FlowDiagnostics; + + const auto cas = Setup(3, 2); + const auto& graph = cas.connectivity(); + + // Create fluxes. + ConnectionValues flux(ConnectionValues::NumConnections{ graph.numConnections() }, + ConnectionValues::NumPhases { 1 }); + const size_t nconn = cas.connectivity().numConnections(); + for (size_t conn = 0; conn < nconn; ++conn) { + BOOST_TEST_MESSAGE("Connection " << conn << " connects cells " + << graph.connection(conn).first << " and " + << graph.connection(conn).second); + } + + using C = ConnectionValues::ConnID; + using P = ConnectionValues::PhaseID; + flux(C{0}, P{0}) = 0.3; + flux(C{1}, P{0}) = 0.0; + flux(C{2}, P{0}) = 0.3; + flux(C{3}, P{0}) = 0.6; + flux(C{4}, P{0}) = 0.0; + flux(C{5}, P{0}) = 0.3; + flux(C{6}, P{0}) = -0.6; + + // Create well in/out flows. + CellSetValues wellflow = { {0, 0.3}, {3, 0.3}, {2, -0.6} }; + + Toolbox diagTool(graph); + diagTool.assignPoreVolume(cas.poreVolume()); + diagTool.assignConnectionFlux(flux); + diagTool.assignInflowFlux(wellflow); + + auto injstart = std::vector{ CellSet(CellSetID("I-1"), {0}), + CellSet(CellSetID("I-2"), {3}) }; + auto prdstart = std::vector{ CellSet(CellSetID("P-1"), {2}) }; + + const auto fwd = diagTool.computeInjectionDiagnostics(injstart); + const auto rev = diagTool.computeProductionDiagnostics(prdstart); + + // Global ToF field (accumulated from all injectors) + { + const auto tof = fwd.fd.timeOfFlight(); + + BOOST_REQUIRE_EQUAL(tof.size(), cas.connectivity().numCells()); + std::vector expected = { 1.0, 2.0, 3.0, 1.0, 2.0, 2.5 }; + check_is_close(tof, expected); + } + + // Global ToF field (accumulated from all producers) + { + const auto tof = rev.fd.timeOfFlight(); + + BOOST_REQUIRE_EQUAL(tof.size(), cas.connectivity().numCells()); + std::vector expected = { 3.5, 2.5, 0.5, 2.5, 1.5, 1.0 }; + check_is_close(tof, expected); + } + + // Verify set of start points. + { + using VCS = std::vector; + using VCSI = std::vector; + using P = std::pair; + std::vector

pairs { P{ injstart, fwd.fd.startPoints() }, P{ prdstart, rev.fd.startPoints() } }; + for (const auto& p : pairs) { + const auto& s1 = p.first; + const auto& s2 = p.second; + BOOST_CHECK_EQUAL(s1.size(), s2.size()); + for (const auto& pt : s2) { + // ID of 'pt' *MUST* be in set of identified start points. + auto pos = std::find_if(s1.begin(), s1.end(), + [&pt](const CellSet& s) + { + return s.id().to_string() == pt.to_string(); + }); + BOOST_CHECK(pos != s1.end()); + } + } + } + + // Local I-1 tracer concentration. + { + const auto conc = fwd.fd.concentration(CellSetID("I-1")); + std::vector> expected = { {0, 1.0}, {1, 1.0}, {2, 0.5}, {4, 0.5}, {5, 0.5} }; + BOOST_REQUIRE_EQUAL(conc.size(), expected.size()); + + int i = 0; + for (const auto& v : conc) { + BOOST_TEST_MESSAGE("Conc[" << v.first << "] = " << v.second); + BOOST_CHECK_EQUAL(v.first, expected[i].first); + BOOST_CHECK_CLOSE(v.second, expected[i].second, 1.0e-10); + ++i; + } + } + + // Local I-1 tof. + { + const auto tof = fwd.fd.timeOfFlight(CellSetID("I-1")); + std::vector> expected = { {0, 1.0}, {1, 2.0}, {2, 3.5}, {4, 2.5}, {5, 3.0} }; + BOOST_REQUIRE_EQUAL(tof.size(), expected.size()); + + int i = 0; + for (const auto& v : tof) { + BOOST_TEST_MESSAGE("ToF[" << v.first << "] = " << v.second); + BOOST_CHECK_EQUAL(v.first, expected[i].first); + BOOST_CHECK_CLOSE(v.second, expected[i].second, 1.0e-10); + ++i; + } + } + + // Local I-2 tracer concentration. + { + const auto conc = fwd.fd.concentration(CellSetID("I-2")); + std::vector> expected = { {2, 0.5}, {3, 1.0}, {4, 0.5}, {5, 0.5} }; + BOOST_REQUIRE_EQUAL(conc.size(), expected.size()); + + int i = 0; + for (const auto& v : conc) { + BOOST_TEST_MESSAGE("Conc[" << v.first << "] = " << v.second); + BOOST_CHECK_EQUAL(v.first, expected[i].first); + BOOST_CHECK_CLOSE(v.second, expected[i].second, 1.0e-10); + ++i; + } + } + + // Local I-2 tof. + { + const auto tof = fwd.fd.timeOfFlight(CellSetID("I-2")); + std::vector> expected = { {2, 2.5}, {3, 1.0}, {4, 1.5}, {5, 2.0} }; + BOOST_REQUIRE_EQUAL(tof.size(), expected.size()); + + int i = 0; + for (const auto& v : tof) { + BOOST_TEST_MESSAGE("ToF[" << v.first << "] = " << v.second); + BOOST_CHECK_EQUAL(v.first, expected[i].first); + BOOST_CHECK_CLOSE(v.second, expected[i].second, 1.0e-10); + ++i; + } + } + +} + + BOOST_AUTO_TEST_SUITE_END() From c19fc232c8ff580dcbe0c6a65f72c10cafdc0aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Fri, 6 Jan 2017 14:41:00 +0100 Subject: [PATCH 09/27] #1049 Reuse Opm::ECLGraph and Opm::Flowdiagnostics::Toolbox for each timestep. --- .../ReservoirDataModel/RigFlowDiagResults.cpp | 330 ++++++++++-------- .../ReservoirDataModel/RigFlowDiagResults.h | 8 + .../RigFlowDiagSolverInterface.cpp | 166 ++++++--- .../RigFlowDiagSolverInterface.h | 3 + 4 files changed, 305 insertions(+), 202 deletions(-) diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp index b2a1f3eeb6..c5a58951b7 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp @@ -160,167 +160,209 @@ std::vector* RigFlowDiagResults::calculateDerivedResult(const RigFlowDia { if (resVarAddr.isNativeResult()) return nullptr; - size_t activeCellCount = this->activeCellInfo(resVarAddr)->reservoirActiveCellCount(); - if (resVarAddr.variableName == RIG_FLD_TOF_RESNAME) { - std::vector* > injectorTOFs = findResultsForSelectedTracers(resVarAddr, frameIndex, - RIG_FLD_TOF_RESNAME, RimFlowDiagSolution::INJECTOR); - std::vector* > injectorFractions = findResultsForSelectedTracers(resVarAddr, frameIndex, - RIG_FLD_CELL_FRACTION_RESNAME, RimFlowDiagSolution::INJECTOR); - - std::vector* > producerTOFs = findResultsForSelectedTracers(resVarAddr, frameIndex, - RIG_FLD_TOF_RESNAME, RimFlowDiagSolution::PRODUCER); - std::vector* > producerFractions = findResultsForSelectedTracers(resVarAddr, frameIndex, - RIG_FLD_CELL_FRACTION_RESNAME, RimFlowDiagSolution::PRODUCER); - - std::vector injectorTotalFractions; - std::vector injectorFractMultTof; - calculateSumOfFractionAndFractionMultTOF(activeCellCount, injectorFractions, injectorTOFs, &injectorTotalFractions, &injectorFractMultTof); - - std::vector producerTotalFractions; - std::vector producerFractMultTof; - calculateSumOfFractionAndFractionMultTOF(activeCellCount, producerFractions, producerTOFs, &producerTotalFractions, &producerFractMultTof); - - RigFlowDiagResultFrames* averageTofFrames = this->createScalarResult(resVarAddr); - std::vector& averageTof = averageTofFrames->frameData(frameIndex); - averageTof.resize(activeCellCount, HUGE_VAL); - - for (size_t acIdx = 0 ; acIdx < activeCellCount; ++acIdx) - { - if ( injectorTotalFractions[acIdx] == 0.0 && producerTotalFractions[acIdx] == 0.0 ) - { - averageTof[acIdx] = HUGE_VAL; - } - else - { - double retVal = 0.0; - if (injectorTotalFractions[acIdx] != 0.0) retVal += (1.0/injectorTotalFractions[acIdx]) * injectorFractMultTof[acIdx]; - if (producerTotalFractions[acIdx] != 0.0) retVal += (1.0/producerTotalFractions[acIdx]) * producerFractMultTof[acIdx]; - averageTof[acIdx] = retVal; - } - } - - /// Test to remove all averaging - // if (injectorTOFs.size()) averageTof = (*injectorTOFs[0]); - - return &averageTof; + return calculateAverageTOFResult(resVarAddr, frameIndex); } else if (resVarAddr.variableName == RIG_FLD_CELL_FRACTION_RESNAME) { - std::vector* > fractions = findResultsForSelectedTracers(resVarAddr, - frameIndex, - RIG_FLD_CELL_FRACTION_RESNAME, - RimFlowDiagSolution::UNDEFINED); - - RigFlowDiagResultFrames* sumOfFractionsFrames = this->createScalarResult(resVarAddr); - std::vector& sumOfFractions = sumOfFractionsFrames->frameData(frameIndex); - - calculateSumOfFractions(fractions, activeCellCount, &sumOfFractions); - - return &sumOfFractions; + return calculateSumOfFractionsResult(resVarAddr, frameIndex); } else if ( resVarAddr.variableName == RIG_FLD_COMMUNICATION_RESNAME ) { - std::vector* > injectorFractions = findResultsForSelectedTracers(resVarAddr, - frameIndex, - RIG_FLD_CELL_FRACTION_RESNAME, - RimFlowDiagSolution::INJECTOR); - std::vector* > producerFractions = findResultsForSelectedTracers(resVarAddr, - frameIndex, - RIG_FLD_CELL_FRACTION_RESNAME, - RimFlowDiagSolution::PRODUCER); - - std::vector sumOfInjectorFractions; - calculateSumOfFractions(injectorFractions, activeCellCount, &sumOfInjectorFractions); - - std::vector sumOfProducerFractions; - calculateSumOfFractions(producerFractions, activeCellCount, &sumOfProducerFractions); - - RigFlowDiagResultFrames* commFrames = this->createScalarResult(resVarAddr); - std::vector& commPI = commFrames->frameData(frameIndex); - commPI.resize(activeCellCount, HUGE_VAL); - - for ( size_t acIdx = 0 ; acIdx < activeCellCount; ++acIdx ) - { - if ( (sumOfInjectorFractions)[acIdx] == HUGE_VAL ) continue; - if ( (sumOfProducerFractions)[acIdx] == HUGE_VAL ) continue; - - (commPI)[acIdx] = (sumOfInjectorFractions)[acIdx] * (sumOfProducerFractions)[acIdx]; - } - - return &commPI; + return calculateCommunicationResult(resVarAddr, frameIndex); } else if ( resVarAddr.variableName == RIG_FLD_MAX_FRACTION_TRACER_RESNAME ) { - std::vector selectedTracerIdxToGlobalTracerIdx; - { - selectedTracerIdxToGlobalTracerIdx.resize(resVarAddr.selectedTracerNames.size(), -1); - - std::vector allTracerNames = m_flowDiagSolution->tracerNames(); - int selTracerIdx = 0; - for ( const std::string& tracerName: resVarAddr.selectedTracerNames ) - { - for ( int globIdx = 0; globIdx < allTracerNames.size(); ++globIdx ) - { - if ( allTracerNames[globIdx].toStdString() == tracerName ) - { - selectedTracerIdxToGlobalTracerIdx[selTracerIdx] = globIdx; - break; - } - } - - ++selTracerIdx; - } - } - - - RigFlowDiagResultFrames* maxFractionTracerIdxFrames = this->createScalarResult(resVarAddr); - std::vector& maxFractionTracerIdx = maxFractionTracerIdxFrames->frameData(frameIndex); - { - - std::vector* > fractions = findResultsForSelectedTracers(resVarAddr, - frameIndex, - RIG_FLD_CELL_FRACTION_RESNAME, - RimFlowDiagSolution::UNDEFINED); - maxFractionTracerIdx.resize(activeCellCount, HUGE_VAL); - - std::vector maxFraction; - maxFraction.resize(activeCellCount, -HUGE_VAL); - - for ( size_t frIdx = 0; frIdx < fractions.size(); ++frIdx ) - { - const std::vector * fr = fractions[frIdx]; - - for ( size_t acIdx = 0 ; acIdx < activeCellCount; ++acIdx ) - { - if ( (*fr)[acIdx] == HUGE_VAL) continue; - - if ( maxFraction[acIdx] < (*fr)[acIdx] ) - { - maxFraction[acIdx] = (*fr)[acIdx]; - maxFractionTracerIdx[acIdx] = frIdx; - } - } - } - } - - for ( size_t acIdx = 0 ; acIdx < activeCellCount; ++acIdx ) - { - if (maxFractionTracerIdx[acIdx] == HUGE_VAL) continue; - - double selectedTracerIdx = static_cast( maxFractionTracerIdx[acIdx]); - maxFractionTracerIdx[acIdx] = selectedTracerIdxToGlobalTracerIdx[selectedTracerIdx]; - } - - return &maxFractionTracerIdx; + return calculateTracerWithMaxFractionResult(resVarAddr, frameIndex); } return nullptr; } -std::vector* > RigFlowDiagResults::findResultsForSelectedTracers(const RigFlowDiagResultAddress& resVarAddr, +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +std::vector* RigFlowDiagResults::calculateAverageTOFResult(const RigFlowDiagResultAddress& resVarAddr, size_t frameIndex) +{ + std::vector* > injectorTOFs = findResultsForSelectedTracers(resVarAddr, frameIndex, + RIG_FLD_TOF_RESNAME, RimFlowDiagSolution::INJECTOR); + std::vector* > injectorFractions = findResultsForSelectedTracers(resVarAddr, frameIndex, + RIG_FLD_CELL_FRACTION_RESNAME, RimFlowDiagSolution::INJECTOR); + + std::vector* > producerTOFs = findResultsForSelectedTracers(resVarAddr, frameIndex, + RIG_FLD_TOF_RESNAME, RimFlowDiagSolution::PRODUCER); + std::vector* > producerFractions = findResultsForSelectedTracers(resVarAddr, frameIndex, + RIG_FLD_CELL_FRACTION_RESNAME, RimFlowDiagSolution::PRODUCER); + size_t activeCellCount = this->activeCellInfo(resVarAddr)->reservoirActiveCellCount(); + + std::vector injectorTotalFractions; + std::vector injectorFractMultTof; + calculateSumOfFractionAndFractionMultTOF(activeCellCount, injectorFractions, injectorTOFs, &injectorTotalFractions, &injectorFractMultTof); + + std::vector producerTotalFractions; + std::vector producerFractMultTof; + calculateSumOfFractionAndFractionMultTOF(activeCellCount, producerFractions, producerTOFs, &producerTotalFractions, &producerFractMultTof); + + RigFlowDiagResultFrames* averageTofFrames = this->createScalarResult(resVarAddr); + std::vector& averageTof = averageTofFrames->frameData(frameIndex); + averageTof.resize(activeCellCount, HUGE_VAL); + + for ( size_t acIdx = 0 ; acIdx < activeCellCount; ++acIdx ) + { + if ( injectorTotalFractions[acIdx] == 0.0 && producerTotalFractions[acIdx] == 0.0 ) + { + averageTof[acIdx] = HUGE_VAL; + } + else + { + double retVal = 0.0; + if ( injectorTotalFractions[acIdx] != 0.0 ) retVal += (1.0/injectorTotalFractions[acIdx]) * injectorFractMultTof[acIdx]; + if ( producerTotalFractions[acIdx] != 0.0 ) retVal += (1.0/producerTotalFractions[acIdx]) * producerFractMultTof[acIdx]; + averageTof[acIdx] = retVal; + } + } + + /// Test to remove all averaging + // if (injectorTOFs.size()) averageTof = (*injectorTOFs[0]); + + return &averageTof; +} + + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +std::vector* RigFlowDiagResults::calculateSumOfFractionsResult(const RigFlowDiagResultAddress& resVarAddr, size_t frameIndex) +{ + std::vector* > fractions = findResultsForSelectedTracers(resVarAddr, + frameIndex, + RIG_FLD_CELL_FRACTION_RESNAME, + RimFlowDiagSolution::UNDEFINED); + + RigFlowDiagResultFrames* sumOfFractionsFrames = this->createScalarResult(resVarAddr); + std::vector& sumOfFractions = sumOfFractionsFrames->frameData(frameIndex); + + size_t activeCellCount = this->activeCellInfo(resVarAddr)->reservoirActiveCellCount(); + + calculateSumOfFractions(fractions, activeCellCount, &sumOfFractions); + + return &sumOfFractions; +} + + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +std::vector* RigFlowDiagResults::calculateTracerWithMaxFractionResult(const RigFlowDiagResultAddress &resVarAddr, size_t frameIndex) +{ + std::vector selectedTracerIdxToGlobalTracerIdx; + { + selectedTracerIdxToGlobalTracerIdx.resize(resVarAddr.selectedTracerNames.size(), -1); + + std::vector allTracerNames = m_flowDiagSolution->tracerNames(); + int selTracerIdx = 0; + for ( const std::string& tracerName: resVarAddr.selectedTracerNames ) + { + for ( int globIdx = 0; globIdx < allTracerNames.size(); ++globIdx ) + { + if ( allTracerNames[globIdx].toStdString() == tracerName ) + { + selectedTracerIdxToGlobalTracerIdx[selTracerIdx] = globIdx; + break; + } + } + + ++selTracerIdx; + } + } + + size_t activeCellCount = this->activeCellInfo(resVarAddr)->reservoirActiveCellCount(); + + RigFlowDiagResultFrames* maxFractionTracerIdxFrames = this->createScalarResult(resVarAddr); + std::vector& maxFractionTracerIdx = maxFractionTracerIdxFrames->frameData(frameIndex); + { + + std::vector* > fractions = findResultsForSelectedTracers(resVarAddr, + frameIndex, + RIG_FLD_CELL_FRACTION_RESNAME, + RimFlowDiagSolution::UNDEFINED); + maxFractionTracerIdx.resize(activeCellCount, HUGE_VAL); + + std::vector maxFraction; + maxFraction.resize(activeCellCount, -HUGE_VAL); + + for ( size_t frIdx = 0; frIdx < fractions.size(); ++frIdx ) + { + const std::vector * fr = fractions[frIdx]; + + for ( size_t acIdx = 0 ; acIdx < activeCellCount; ++acIdx ) + { + if ( (*fr)[acIdx] == HUGE_VAL ) continue; + + if ( maxFraction[acIdx] < (*fr)[acIdx] ) + { + maxFraction[acIdx] = (*fr)[acIdx]; + maxFractionTracerIdx[acIdx] = frIdx; + } + } + } + } + + for ( size_t acIdx = 0 ; acIdx < activeCellCount; ++acIdx ) + { + if ( maxFractionTracerIdx[acIdx] == HUGE_VAL ) continue; + + double selectedTracerIdx = static_cast(maxFractionTracerIdx[acIdx]); + maxFractionTracerIdx[acIdx] = selectedTracerIdxToGlobalTracerIdx[selectedTracerIdx]; + } + + return &maxFractionTracerIdx; +} + + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +std::vector* RigFlowDiagResults::calculateCommunicationResult(const RigFlowDiagResultAddress& resVarAddr, size_t frameIndex) +{ + std::vector* > injectorFractions = findResultsForSelectedTracers(resVarAddr, + frameIndex, + RIG_FLD_CELL_FRACTION_RESNAME, + RimFlowDiagSolution::INJECTOR); + std::vector* > producerFractions = findResultsForSelectedTracers(resVarAddr, + frameIndex, + RIG_FLD_CELL_FRACTION_RESNAME, + RimFlowDiagSolution::PRODUCER); + size_t activeCellCount = this->activeCellInfo(resVarAddr)->reservoirActiveCellCount(); + + std::vector sumOfInjectorFractions; + calculateSumOfFractions(injectorFractions, activeCellCount, &sumOfInjectorFractions); + + std::vector sumOfProducerFractions; + calculateSumOfFractions(producerFractions, activeCellCount, &sumOfProducerFractions); + + RigFlowDiagResultFrames* commFrames = this->createScalarResult(resVarAddr); + std::vector& commPI = commFrames->frameData(frameIndex); + commPI.resize(activeCellCount, HUGE_VAL); + + for ( size_t acIdx = 0 ; acIdx < activeCellCount; ++acIdx ) + { + if ( (sumOfInjectorFractions)[acIdx] == HUGE_VAL ) continue; + if ( (sumOfProducerFractions)[acIdx] == HUGE_VAL ) continue; + + (commPI)[acIdx] = (sumOfInjectorFractions)[acIdx] * (sumOfProducerFractions)[acIdx]; + } + + return &commPI; +} + + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +std::vector* > RigFlowDiagResults::findResultsForSelectedTracers(const RigFlowDiagResultAddress& resVarAddr, size_t frameIndex, const std::string& nativeResultName, RimFlowDiagSolution::TracerStatusType wantedTracerType) diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h index e22ef0efb7..87ed2426de 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h @@ -64,6 +64,14 @@ private: std::vector* calculateDerivedResult(const RigFlowDiagResultAddress& resVarAddr, size_t frameIndex); + + + std::vector* calculateAverageTOFResult(const RigFlowDiagResultAddress& resVarAddr, size_t frameIndex); + std::vector* calculateSumOfFractionsResult(const RigFlowDiagResultAddress& resVarAddr, size_t frameIndex); + std::vector* calculateTracerWithMaxFractionResult(const RigFlowDiagResultAddress &resVarAddr, size_t frameIndex); + std::vector* calculateCommunicationResult(const RigFlowDiagResultAddress& resVarAddr, size_t frameIndex); + + std::vector* > findResultsForSelectedTracers(const RigFlowDiagResultAddress& resVarAddr, size_t frameIndex, const std::string& nativeResultName, diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp index f6e6863efd..a3f9ce28af 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp @@ -98,13 +98,26 @@ void RigFlowDiagTimeStepResult::addResult(const RigFlowDiagResultAddress& resAdd } } + +class RigOpmFldStaticData : public cvf::Object +{ +public: + RigOpmFldStaticData(const std::string& grid, const std::string& init) : eclGraph(Opm::ECLGraph::load(grid, init)), m_hasUnifiedRestartFile(false) {} + + Opm::ECLGraph eclGraph; + std::unique_ptr fldToolbox; + bool m_hasUnifiedRestartFile; + QStringList restartFileNames; +}; + + + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- RigFlowDiagSolverInterface::RigFlowDiagSolverInterface(RimEclipseResultCase * eclipseCase) : m_eclipseCase(eclipseCase) { - } //-------------------------------------------------------------------------------------------------- @@ -115,6 +128,7 @@ RigFlowDiagSolverInterface::~RigFlowDiagSolverInterface() } + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -126,86 +140,122 @@ RigFlowDiagTimeStepResult RigFlowDiagSolverInterface::calculate(size_t timeStepI RigFlowDiagTimeStepResult result(m_eclipseCase->reservoirData()->activeCellInfo(RifReaderInterface::MATRIX_RESULTS)->reservoirActiveCellCount()); - // Get set of files - QString gridFileName = m_eclipseCase->gridFileName(); - - QStringList m_filesWithSameBaseName; - - if ( !RifEclipseOutputFileTools::findSiblingFilesWithSameBaseName(gridFileName, &m_filesWithSameBaseName) ) return result; - - QString initFileName = RifEclipseOutputFileTools::firstFileNameOfType(m_filesWithSameBaseName, ECL_INIT_FILE); - - Opm::ECLGraph graph = Opm::ECLGraph::load(gridFileName.toStdString(), - initFileName.toStdString()); - - // Look for unified restart file - QString restartFileName = RifEclipseOutputFileTools::firstFileNameOfType(m_filesWithSameBaseName, ECL_UNIFIED_RESTART_FILE); - - if ( restartFileName.isEmpty() ) + if ( m_opmFldData.isNull() ) { - // Look for set of restart files (one file per time step) + // Get set of files + QString gridFileName = m_eclipseCase->gridFileName(); - QStringList restartFileNames; - restartFileNames = RifEclipseOutputFileTools::filterFileNamesOfType(m_filesWithSameBaseName, ECL_RESTART_FILE); + QStringList m_filesWithSameBaseName; - size_t restartFileCount = static_cast(restartFileNames.size()); - size_t maxTimeStepCount = m_eclipseCase->reservoirData()->results(RifReaderInterface::MATRIX_RESULTS)->maxTimeStepCount(); + if ( !RifEclipseOutputFileTools::findSiblingFilesWithSameBaseName(gridFileName, &m_filesWithSameBaseName) ) return result; - if (restartFileCount <= timeStepIndex && restartFileCount != maxTimeStepCount ) + QString initFileName = RifEclipseOutputFileTools::firstFileNameOfType(m_filesWithSameBaseName, ECL_INIT_FILE); + + m_opmFldData = new RigOpmFldStaticData(gridFileName.toStdString(), + initFileName.toStdString()); + + const Opm::FlowDiagnostics::ConnectivityGraph connGraph = + Opm::FlowDiagnostics::ConnectivityGraph{ static_cast(m_opmFldData->eclGraph.numCells()), + m_opmFldData->eclGraph.neighbours() }; + + // Create the Toolbox. + + m_opmFldData->fldToolbox.reset(new Opm::FlowDiagnostics::Toolbox{ connGraph }); + m_opmFldData->fldToolbox->assignPoreVolume( m_opmFldData->eclGraph.poreVolume()); + + // Look for unified restart file + + QString restartFileName = RifEclipseOutputFileTools::firstFileNameOfType(m_filesWithSameBaseName, ECL_UNIFIED_RESTART_FILE); + if ( !restartFileName.isEmpty() ) { - QMessageBox::critical(nullptr, "ResInsight", "Flow Diagnostics: Could not find all the restart files. Results will not be loaded."); - return result; + m_opmFldData->eclGraph.assignFluxDataSource(restartFileName.toStdString()); + m_opmFldData->m_hasUnifiedRestartFile = true; } + else + { - restartFileNames.sort(); // To make sure they are sorted in increasing *.X000N order. Hack. Should probably be actual time stored on file. - restartFileName = restartFileNames[static_cast(timeStepIndex)]; + m_opmFldData->restartFileNames = RifEclipseOutputFileTools::filterFileNamesOfType(m_filesWithSameBaseName, ECL_RESTART_FILE); + + size_t restartFileCount = static_cast(m_opmFldData->restartFileNames.size()); + size_t maxTimeStepCount = m_eclipseCase->reservoirData()->results(RifReaderInterface::MATRIX_RESULTS)->maxTimeStepCount(); + + if (restartFileCount <= timeStepIndex && restartFileCount != maxTimeStepCount ) + { + QMessageBox::critical(nullptr, "ResInsight", "Flow Diagnostics: Could not find all the restart files. Results will not be loaded."); + return result; + } + + m_opmFldData->restartFileNames.sort(); // To make sure they are sorted in increasing *.X000N order. Hack. Should probably be actual time stored on file. + m_opmFldData->m_hasUnifiedRestartFile = false; + } } - graph.assignFluxDataSource(restartFileName.toStdString()); - if ( ! graph.selectReportStep(static_cast(timeStepIndex)) ) + if ( ! m_opmFldData->m_hasUnifiedRestartFile ) + { + QString restartFileName = m_opmFldData->restartFileNames[static_cast(timeStepIndex)]; + m_opmFldData->eclGraph.assignFluxDataSource(restartFileName.toStdString()); + } + + + if ( ! m_opmFldData->eclGraph.selectReportStep(static_cast(timeStepIndex)) ) { QMessageBox::critical(nullptr, "ResInsight", "Flow Diagnostics: Could not find the requested timestep in the result file. Results will not be loaded."); return result; } + + // Set up flow Toolbox with timestep data { - Toolbox fdTool = RigFlowDiagInterfaceTools::initialiseFlowDiagnostics(graph); + Opm::FlowDiagnostics::ConnectionValues connectionsVals = RigFlowDiagInterfaceTools::Hack::convert_flux_to_SI( RigFlowDiagInterfaceTools::extractFluxField(m_opmFldData->eclGraph)); + + m_opmFldData->fldToolbox->assignConnectionFlux(connectionsVals); + + Opm::ECLWellSolution wsol = Opm::ECLWellSolution{}; + + const std::vector well_fluxes = + wsol.solution(m_opmFldData->eclGraph.rawResultData(), m_opmFldData->eclGraph.numGrids()); + + m_opmFldData->fldToolbox->assignInflowFlux(RigFlowDiagInterfaceTools::extractWellFlows(m_opmFldData->eclGraph, well_fluxes)); + } + + // Injection Solution + { + std::vector injectorCellSet; + for ( const auto& tIt: injectorTracers ) { - std::vector injectorCellSet; - for ( const auto& tIt: injectorTracers ) - { - injectorCellSet.push_back(CellSet(CellSetID(tIt.first), tIt.second)); - } - - Solution injSol = fdTool.computeInjectionDiagnostics(injectorCellSet).fd; - - for ( const CellSetID& tracerId: injSol.startPoints() ) - { - CellSetValues tofVals = injSol.timeOfFlight(tracerId); - result.setInjectorTracerTOF(tracerId.to_string(), tofVals); - CellSetValues fracVals = injSol.concentration(tracerId); - result.setInjectorTracerFraction(tracerId.to_string(), fracVals); - } + injectorCellSet.push_back(CellSet(CellSetID(tIt.first), tIt.second)); } + Solution injSol = m_opmFldData->fldToolbox->computeInjectionDiagnostics(injectorCellSet).fd; + + for ( const CellSetID& tracerId: injSol.startPoints() ) { - std::vector prodjCellSet; - for ( const auto& tIt: producerTracers ) - { - prodjCellSet.push_back(CellSet(CellSetID(tIt.first), tIt.second)); - } - Solution prodSol = fdTool.computeProductionDiagnostics(prodjCellSet).fd; - for ( const CellSetID& tracerId: prodSol.startPoints() ) - { - CellSetValues tofVals = prodSol.timeOfFlight(tracerId); - result.setProducerTracerTOF(tracerId.to_string(), tofVals); - CellSetValues fracVals = prodSol.concentration(tracerId); - result.setInjectorTracerFraction(tracerId.to_string(), fracVals); - } + CellSetValues tofVals = injSol.timeOfFlight(tracerId); + result.setInjectorTracerTOF(tracerId.to_string(), tofVals); + CellSetValues fracVals = injSol.concentration(tracerId); + result.setInjectorTracerFraction(tracerId.to_string(), fracVals); } } + // Producer Solution + { + std::vector prodjCellSet; + for ( const auto& tIt: producerTracers ) + { + prodjCellSet.push_back(CellSet(CellSetID(tIt.first), tIt.second)); + } + + Solution prodSol = m_opmFldData->fldToolbox->computeProductionDiagnostics(prodjCellSet).fd; + + for ( const CellSetID& tracerId: prodSol.startPoints() ) + { + CellSetValues tofVals = prodSol.timeOfFlight(tracerId); + result.setProducerTracerTOF(tracerId.to_string(), tofVals); + CellSetValues fracVals = prodSol.concentration(tracerId); + result.setInjectorTracerFraction(tracerId.to_string(), fracVals); + } + } return result; // Relying on implicit move constructor } diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h index 7149a969fc..9a449a8e82 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h @@ -52,6 +52,7 @@ private: class RigCaseData; +class RigOpmFldStaticData; class RigFlowDiagSolverInterface : public cvf::Object { @@ -66,6 +67,8 @@ public: private: RimEclipseResultCase * m_eclipseCase; + cvf::ref m_opmFldData; + }; From c65c9b1c58166ed1aaffc6d5fa17832f44da6b7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Fri, 6 Jan 2017 15:12:13 +0100 Subject: [PATCH 10/27] #1058 Convert time of flight to days --- .../RigFlowDiagSolverInterface.cpp | 43 ++++++------------- .../RigFlowDiagSolverInterface.h | 6 +-- 2 files changed, 16 insertions(+), 33 deletions(-) diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp index a3f9ce28af..01396b3dbb 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp @@ -38,45 +38,30 @@ RigFlowDiagTimeStepResult::RigFlowDiagTimeStepResult(size_t activeCellCount) } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RigFlowDiagTimeStepResult::setInjectorTracerTOF(const std::string& tracerName, const std::map& cellValues) -{ - std::set tracers; - tracers.insert(tracerName); - - this->addResult(RigFlowDiagResultAddress(RIG_FLD_TOF_RESNAME, tracers), cellValues); -} //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigFlowDiagTimeStepResult::setInjectorTracerFraction(const std::string& tracerName, const std::map& cellValues) +void RigFlowDiagTimeStepResult::setTracerTOF(const std::string& tracerName, const std::map& cellValues) { std::set tracers; tracers.insert(tracerName); + + RigFlowDiagResultAddress resAddr(RIG_FLD_TOF_RESNAME, tracers); - this->addResult(RigFlowDiagResultAddress(RIG_FLD_CELL_FRACTION_RESNAME, tracers), cellValues); + this->addResult(resAddr, cellValues); + std::vector& activeCellValues = m_nativeResults[resAddr]; + for (double & val: activeCellValues) + { + val = val * 1.15741e-5; // days pr second. Converting to days + } } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigFlowDiagTimeStepResult::setProducerTracerTOF(const std::string& tracerName, const std::map& cellValues) -{ - std::set tracers; - tracers.insert(tracerName); - - this->addResult(RigFlowDiagResultAddress(RIG_FLD_TOF_RESNAME, tracers), cellValues); - -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RigFlowDiagTimeStepResult::setProducerTracerFraction(const std::string& tracerName, const std::map& cellValues) +void RigFlowDiagTimeStepResult::setTracerFraction(const std::string& tracerName, const std::map& cellValues) { std::set tracers; tracers.insert(tracerName); @@ -232,9 +217,9 @@ RigFlowDiagTimeStepResult RigFlowDiagSolverInterface::calculate(size_t timeStepI for ( const CellSetID& tracerId: injSol.startPoints() ) { CellSetValues tofVals = injSol.timeOfFlight(tracerId); - result.setInjectorTracerTOF(tracerId.to_string(), tofVals); + result.setTracerTOF(tracerId.to_string(), tofVals); CellSetValues fracVals = injSol.concentration(tracerId); - result.setInjectorTracerFraction(tracerId.to_string(), fracVals); + result.setTracerFraction(tracerId.to_string(), fracVals); } } @@ -251,9 +236,9 @@ RigFlowDiagTimeStepResult RigFlowDiagSolverInterface::calculate(size_t timeStepI for ( const CellSetID& tracerId: prodSol.startPoints() ) { CellSetValues tofVals = prodSol.timeOfFlight(tracerId); - result.setProducerTracerTOF(tracerId.to_string(), tofVals); + result.setTracerTOF(tracerId.to_string(), tofVals); CellSetValues fracVals = prodSol.concentration(tracerId); - result.setInjectorTracerFraction(tracerId.to_string(), fracVals); + result.setTracerFraction(tracerId.to_string(), fracVals); } } diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h index 9a449a8e82..e1d5bdac32 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h @@ -35,10 +35,8 @@ class RigFlowDiagTimeStepResult public: RigFlowDiagTimeStepResult(size_t activeCellCount); - void setInjectorTracerTOF (const std::string& tracerName, const std::map& cellValues); - void setInjectorTracerFraction(const std::string& tracerName, const std::map& cellValues); - void setProducerTracerTOF (const std::string& tracerName, const std::map& cellValues); - void setProducerTracerFraction(const std::string& tracerName, const std::map& cellValues); + void setTracerTOF (const std::string& tracerName, const std::map& cellValues); + void setTracerFraction(const std::string& tracerName, const std::map& cellValues); // Use to "steal" the data from this one using swap std::map >& nativeResults() { return m_nativeResults; } From 5d9fd5ddeb874d7405ee4e79b0ab618e58a6bb53 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Sat, 7 Jan 2017 08:57:49 +0100 Subject: [PATCH 11/27] #1064 Use constexpr to verify keywords for pdmObject and pdmFields --- Fwk/AppFwk/cafProjectDataModel/cafPdmObject.h | 4 ++ .../cafPdmXml/CMakeLists.txt | 2 + .../cafPdmXml/cafPdmXmlObjectHandleMacros.h | 19 +++++++- .../cafPdmXml/cafPdmXmlStringValidation.h | 48 +++++++++++++++++++ 4 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlStringValidation.h diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.h index 6aff3e09df..3251f23bad 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.h @@ -97,6 +97,8 @@ class PdmObjectCapability; #define CAF_PDM_InitField(field, keyword, default, uiName, iconResourceName, toolTip, whatsThis) \ { \ + CAF_PDM_VERIFY_XML_KEYWORD(keyword) \ + \ static bool chekingThePresenceOfHeaderAndSourceInitMacros = \ Error_You_forgot_to_add_the_macro_CAF_PDM_XML_HEADER_INIT_and_or_CAF_PDM_XML_SOURCE_INIT_to_your_cpp_file_for_this_class(); \ this->isInheritedFromPdmUiObject(); \ @@ -113,6 +115,8 @@ class PdmObjectCapability; #define CAF_PDM_InitFieldNoDefault(field, keyword, uiName, iconResourceName, toolTip, whatsThis) \ { \ + CAF_PDM_VERIFY_XML_KEYWORD(keyword) \ + \ static bool chekingThePresenceOfHeaderAndSourceInitMacros = \ Error_You_forgot_to_add_the_macro_CAF_PDM_XML_HEADER_INIT_and_or_CAF_PDM_XML_SOURCE_INIT_to_your_cpp_file_for_this_class(); \ this->isInheritedFromPdmUiObject(); \ diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt index c42cab52c4..c5a8585247 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt @@ -33,6 +33,8 @@ set( PROJECT_FILES cafPdmSettings.h cafPdmSettings.cpp + + cafPdmXmlStringValidation.h ) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandleMacros.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandleMacros.h index ecdcd13808..65130635ec 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandleMacros.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandleMacros.h @@ -1,6 +1,7 @@ #pragma once #include "cafPdmDefaultObjectFactory.h" +#include "cafPdmXmlStringValidation.h" // Taken from gtest.h // @@ -15,6 +16,11 @@ #define PDM_OBJECT_STRING_CONCATENATE(foo, bar) PDM_OBJECT_STRING_CONCATENATE_IMPL_(foo, bar) #define PDM_OBJECT_STRING_CONCATENATE_IMPL_(foo, bar) foo ## bar +#define CAF_PDM_VERIFY_XML_KEYWORD(keyword) \ + static_assert(isFirstCharacterValidInXmlKeyword(keyword), "First character in keyword is invalid"); \ + static_assert(!isFirstThreeCharactersXml(keyword), "Keyword starts with invalid sequence xml"); \ + static_assert(isValidXmlKeyword(keyword), "Detected invalid character in keyword"); + /// CAF_PDM_HEADER_INIT assists the factory used when reading objects from file /// Place this in the header file inside the class definition of your PdmObject @@ -35,16 +41,25 @@ public: \ #define CAF_PDM_XML_SOURCE_INIT(ClassName, keyword) \ bool ClassName::Error_You_forgot_to_add_the_macro_CAF_PDM_XML_HEADER_INIT_and_or_CAF_PDM_XML_SOURCE_INIT_to_your_cpp_file_for_this_class() { return false;} \ \ - QString ClassName::classKeywordStatic() { return keyword; } \ + QString ClassName::classKeywordStatic() \ + { \ + CAF_PDM_VERIFY_XML_KEYWORD(keyword) \ + return keyword; \ + } \ static bool PDM_OBJECT_STRING_CONCATENATE(my##ClassName, __LINE__) = caf::PdmDefaultObjectFactory::instance()->registerCreator() #define CAF_PDM_XML_ABSTRACT_SOURCE_INIT(ClassName, keyword) \ bool ClassName::Error_You_forgot_to_add_the_macro_CAF_PDM_XML_HEADER_INIT_and_or_CAF_PDM_XML_SOURCE_INIT_to_your_cpp_file_for_this_class() { return false;} \ \ - QString ClassName::classKeywordStatic() { return keyword; } \ + QString ClassName::classKeywordStatic() \ + { \ + CAF_PDM_VERIFY_XML_KEYWORD(keyword) \ + return keyword; \ + } \ #define CAF_PDM_XML_InitField(field, keyword) \ { \ + CAF_PDM_VERIFY_XML_KEYWORD(keyword) \ static bool chekingThePresenceOfHeaderAndSourceInitMacros = \ Error_You_forgot_to_add_the_macro_CAF_PDM_XML_HEADER_INIT_and_or_CAF_PDM_XML_SOURCE_INIT_to_your_cpp_file_for_this_class(); \ this->isInheritedFromPdmXmlSerializable(); \ diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlStringValidation.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlStringValidation.h new file mode 100644 index 0000000000..178f18fed3 --- /dev/null +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlStringValidation.h @@ -0,0 +1,48 @@ +#pragma once + +constexpr bool isLowerCase(char c) { + return (c >= 'a' && c <= 'z'); +} + +constexpr bool isUpperCase(char c) { + return (c >= 'A' && c <= 'Z'); +} + +constexpr bool isLetter(char c) { + return isLowerCase(c) || isUpperCase(c); +} + +constexpr bool isDigit(char c) { + return (c >= '0' && c <= '9'); +} + +constexpr bool isValidFirstCharacterInXmlKeyword(char c) { + return (c != '.') && !isDigit(c); +} + +constexpr bool isValidCharacterInXmlKeyword(char c) { + return isLetter(c) || isDigit(c) || (c == '_'); +} + +template< unsigned N > constexpr +bool isValidXmlKeyword(const char(&arr)[N], unsigned i = 0) +{ + return (!isValidCharacterInXmlKeyword(arr[i])) ? false : + i == N-2 ? true : + isValidXmlKeyword(arr, i + 1); +} + +template< unsigned N > constexpr +bool isFirstCharacterValidInXmlKeyword(const char(&arr)[N]) +{ + static_assert(N>0, "String literal is too small"); + + return isValidFirstCharacterInXmlKeyword(arr[0]); +} + +template< unsigned N > constexpr +bool isFirstThreeCharactersXml(const char(&arr)[N]) +{ + return (N < 3) ? false : arr[0] == 'x' && arr[1] == 'm' && arr[2] == 'l'; +} + From c197709e08cb0678902687516a11cf6315338616 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Sat, 7 Jan 2017 08:58:32 +0100 Subject: [PATCH 12/27] Fixed invalid keyword used only in UI --- .../ProjectDataModel/RimExportInputPropertySettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ApplicationCode/ProjectDataModel/RimExportInputPropertySettings.cpp b/ApplicationCode/ProjectDataModel/RimExportInputPropertySettings.cpp index d0a5ca98a8..72ac153ea7 100644 --- a/ApplicationCode/ProjectDataModel/RimExportInputPropertySettings.cpp +++ b/ApplicationCode/ProjectDataModel/RimExportInputPropertySettings.cpp @@ -31,7 +31,7 @@ RimExportInputSettings::RimExportInputSettings() CAF_PDM_InitFieldNoDefault(&fileName, "Filename", "Export filename", "", "", ""); fileName.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName()); - CAF_PDM_InitFieldNoDefault(&eclipseKeyword, "Eclipse Keyword", "Keyword", "", "", ""); + CAF_PDM_InitFieldNoDefault(&eclipseKeyword, "Keyword", "Eclipse Keyword", "", "", ""); } From 785a5e9ff8642d92ef9a472a8e8e400c8ee97167 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 9 Jan 2017 07:43:17 +0100 Subject: [PATCH 13/27] #1060 Use DisplayCoordTransform in ResultTextBuilder --- .../UserInterface/RiuResultTextBuilder.cpp | 18 ++++++----- .../cafDisplayCoordTransform.cpp | 31 ++++++++++++++----- .../cafDisplayCoordTransform.h | 4 +++ 3 files changed, 38 insertions(+), 15 deletions(-) diff --git a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp index e8f791b9ec..04068ef0ef 100644 --- a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp +++ b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp @@ -21,18 +21,20 @@ #include "RigCaseCellResultsData.h" #include "RigCaseData.h" +#include "RigFormationNames.h" #include "RigMainGrid.h" #include "RigResultAccessor.h" #include "RigResultAccessorFactory.h" -#include "RimEclipseCase.h" #include "RimCellEdgeColors.h" -#include "RimEclipseFaultColors.h" -#include "RimReservoirCellResultsStorage.h" -#include "RimEclipseView.h" +#include "RimEclipseCase.h" #include "RimEclipseCellColors.h" +#include "RimEclipseFaultColors.h" +#include "RimEclipseView.h" #include "RimFormationNames.h" -#include "RigFormationNames.h" +#include "RimReservoirCellResultsStorage.h" + +#include "cafDisplayCoordTransform.h" @@ -134,7 +136,7 @@ QString RiuResultTextBuilder::topologyText(QString itemSeparator) { QString text; - if (m_reservoirView->eclipseCase()) + if (m_reservoirView && m_reservoirView->eclipseCase()) { const RigCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); if (eclipseCase) @@ -161,7 +163,9 @@ QString RiuResultTextBuilder::topologyText(QString itemSeparator) } } - cvf::Vec3d domainCoord = m_intersectionPoint + eclipseCase->grid(0)->displayModelOffset(); + + cvf::ref transForm = m_reservoirView->displayCoordTransform(); + cvf::Vec3d domainCoord = transForm->translateToDomainCoord(m_intersectionPoint); QString formattedText; formattedText.sprintf("Intersection point : [E: %.2f, N: %.2f, Depth: %.2f]", domainCoord.x(), domainCoord.y(), -domainCoord.z()); diff --git a/Fwk/AppFwk/cafVizExtensions/cafDisplayCoordTransform.cpp b/Fwk/AppFwk/cafVizExtensions/cafDisplayCoordTransform.cpp index 413f99ebfd..fa85ed6994 100644 --- a/Fwk/AppFwk/cafVizExtensions/cafDisplayCoordTransform.cpp +++ b/Fwk/AppFwk/cafVizExtensions/cafDisplayCoordTransform.cpp @@ -27,12 +27,21 @@ void caf::DisplayCoordTransform::setTranslation(const cvf::Vec3d& translation) m_translation = translation; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +cvf::Vec3d caf::DisplayCoordTransform::translateToDisplayCoord(const cvf::Vec3d& domainCoord) const +{ + return domainCoord - m_translation; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- cvf::Vec3d caf::DisplayCoordTransform::transformToDisplayCoord(const cvf::Vec3d& domainCoord) const { - cvf::Vec3d coord = domainCoord - m_translation; + cvf::Vec3d coord = translateToDisplayCoord(domainCoord); + coord.x() *= m_scale.x(); coord.y() *= m_scale.y(); coord.z() *= m_scale.z(); @@ -53,19 +62,25 @@ cvf::Vec3d caf::DisplayCoordTransform::scaleToDisplaySize(const cvf::Vec3d& doma return coord; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +cvf::Vec3d caf::DisplayCoordTransform::translateToDomainCoord(const cvf::Vec3d& displayCoord) const +{ + return displayCoord + m_translation; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- cvf::Vec3d caf::DisplayCoordTransform::transformToDomainCoord(const cvf::Vec3d& displayCoord) const { - cvf::Vec3d coord = displayCoord; - coord.x() /= m_scale.x(); - coord.y() /= m_scale.y(); - coord.z() /= m_scale.z(); + cvf::Vec3d unScaledDisplayCoord = displayCoord; + unScaledDisplayCoord.x() /= m_scale.x(); + unScaledDisplayCoord.y() /= m_scale.y(); + unScaledDisplayCoord.z() /= m_scale.z(); - coord += m_translation; - - return coord; + return translateToDomainCoord(unScaledDisplayCoord); } //-------------------------------------------------------------------------------------------------- diff --git a/Fwk/AppFwk/cafVizExtensions/cafDisplayCoordTransform.h b/Fwk/AppFwk/cafVizExtensions/cafDisplayCoordTransform.h index 73eaf5d980..f4e73ceda7 100644 --- a/Fwk/AppFwk/cafVizExtensions/cafDisplayCoordTransform.h +++ b/Fwk/AppFwk/cafVizExtensions/cafDisplayCoordTransform.h @@ -22,9 +22,13 @@ public: cvf::Vec3d transformToDisplayCoord(const cvf::Vec3d& domainCoord) const; cvf::Vec3d scaleToDisplaySize(const cvf::Vec3d& domainSize) const; + cvf::Vec3d translateToDomainCoord(const cvf::Vec3d& displayCoord) const; cvf::Vec3d transformToDomainCoord(const cvf::Vec3d& displayCoord) const; cvf::Vec3d scaleToDomainSize(const cvf::Vec3d& displaySize) const; +private: + cvf::Vec3d translateToDisplayCoord(const cvf::Vec3d& domainCoord) const; + private: cvf::Vec3d m_scale; cvf::Vec3d m_translation; From 46bc8e80aae48871e230c69d8c49517165782a45 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 9 Jan 2017 07:43:31 +0100 Subject: [PATCH 14/27] Removed unused code --- .../WellPathCommands/RicWellPathViewerEventHandler.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/ApplicationCode/Commands/WellPathCommands/RicWellPathViewerEventHandler.cpp b/ApplicationCode/Commands/WellPathCommands/RicWellPathViewerEventHandler.cpp index 8201802b0e..6777903eae 100644 --- a/ApplicationCode/Commands/WellPathCommands/RicWellPathViewerEventHandler.cpp +++ b/ApplicationCode/Commands/WellPathCommands/RicWellPathViewerEventHandler.cpp @@ -21,7 +21,6 @@ #include "RiaApplication.h" -#include "RimCase.h" #include "RimView.h" #include "RimWellPath.h" @@ -57,8 +56,6 @@ bool RicWellPathViewerEventHandler::handleEvent(cvf::Object* eventObject) const RivWellPathSourceInfo* wellPathSourceInfo = dynamic_cast(uiEvent->firstHitPart->sourceInfo()); if (wellPathSourceInfo) { - cvf::Vec3d displayModelOffset = cvf::Vec3d::ZERO; - RimView* rimView = RiaApplication::instance()->activeReservoirView(); if (!rimView) return false; From 45b581dc74dd59a6154616164466d9648c200d93 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 9 Jan 2017 10:37:07 +0100 Subject: [PATCH 15/27] #1068 Added mainGrid() to RimEclipseView --- .../ProjectDataModel/RimEclipseView.cpp | 15 ++++++++++++++- ApplicationCode/ProjectDataModel/RimEclipseView.h | 5 ++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index f4369d56de..0a70e4f213 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -1157,7 +1157,7 @@ void RimEclipseView::setEclipseCase(RimEclipseCase* reservoir) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimEclipseCase* RimEclipseView::eclipseCase() +RimEclipseCase* RimEclipseView::eclipseCase() const { return m_reservoir; } @@ -1529,6 +1529,19 @@ RimCase* RimEclipseView::ownerCase() return eclipseCase(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RigMainGrid* RimEclipseView::mainGrid() const +{ + if (eclipseCase() && eclipseCase()->reservoirData()) + { + return eclipseCase()->reservoirData()->mainGrid(); + } + + return nullptr; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.h b/ApplicationCode/ProjectDataModel/RimEclipseView.h index 3c47423f2d..adc4ddc20b 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.h @@ -40,6 +40,7 @@ class RigActiveCellInfo; class RigCaseCellResultsData; class RigGridBase; class RigGridCellFaceVisibilityFilter; +class RigMainGrid; class Rim3dOverlayInfoConfig; class RimEclipseCase; class RimCellEdgeColors; @@ -112,9 +113,11 @@ public: RimEclipseCellColors* currentFaultResultColors(); void setEclipseCase(RimEclipseCase* reservoir); - RimEclipseCase* eclipseCase(); + RimEclipseCase* eclipseCase() const; virtual RimCase* ownerCase(); + RigMainGrid* mainGrid() const; + // Display model generation virtual void loadDataAndUpdate(); From 0fd3bc8865e65c252c7564e6226c7cfc4e05f3c2 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 9 Jan 2017 10:51:06 +0100 Subject: [PATCH 16/27] #1068 Access mainGrid directly from RimEclipseView --- .../Intersections/RivIntersectionBoxPartMgr.cpp | 6 +++--- .../Intersections/RivIntersectionPartMgr.cpp | 11 ++++++----- .../ModelVisualization/RivReservoirFaultsPartMgr.cpp | 3 +-- .../ModelVisualization/RivSimWellPipesPartMgr.cpp | 4 ++-- .../ModelVisualization/RivWellSpheresPartMgr.cpp | 5 ++--- .../ProjectDataModel/Rim3dOverlayInfoConfig.cpp | 10 +++++----- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp index 42e4af4976..33560880b9 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp @@ -19,7 +19,6 @@ #include "RivIntersectionBoxPartMgr.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" #include "RigFemPartCollection.h" #include "RigFemPartResultsCollection.h" #include "RigGeoMechCaseData.h" @@ -37,6 +36,7 @@ #include "RimTernaryLegendConfig.h" #include "RivIntersectionBoxSourceInfo.h" +#include "RivIntersectionPartMgr.h" #include "RivResultToTextureMapper.h" #include "RivScalarMapperUtils.h" #include "RivTernaryScalarMapper.h" @@ -49,7 +49,7 @@ #include "cvfRenderState_FF.h" #include "cvfRenderStateDepth.h" #include "cvfRenderStatePoint.h" -#include "RivIntersectionPartMgr.h" +#include "cvfStructGridGeometryGenerator.h" @@ -353,7 +353,7 @@ cvf::ref RivIntersectionBoxPartMgr::createHexGr if (eclipseView) { RigMainGrid* grid = NULL; - grid = eclipseView->eclipseCase()->reservoirData()->mainGrid(); + grid = eclipseView->mainGrid(); return new RivEclipseIntersectionGrid(grid, eclipseView->currentActiveCellInfo(), m_rimIntersectionBox->showInactiveCells()); } diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp index 25d984ca3b..9ec2fd79bc 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp @@ -20,7 +20,6 @@ #include "RivIntersectionPartMgr.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" #include "RigFemPartCollection.h" #include "RigFemPartResultsCollection.h" #include "RigGeoMechCaseData.h" @@ -43,16 +42,18 @@ #include "RivTernaryScalarMapper.h" #include "RivTernaryTextureCoordsCreator.h" +#include "RiuGeoMechXfTensorResultAccessor.h" + +#include "cafTensor3.h" #include "cvfDrawableGeo.h" +#include "cvfGeometryTools.h" #include "cvfModelBasicList.h" #include "cvfPart.h" #include "cvfPrimitiveSetDirect.h" #include "cvfRenderState_FF.h" #include "cvfRenderStateDepth.h" #include "cvfRenderStatePoint.h" -#include "cafTensor3.h" -#include "cvfGeometryTools.h" -#include "RiuGeoMechXfTensorResultAccessor.h" +#include "cvfStructGridGeometryGenerator.h" //-------------------------------------------------------------------------------------------------- @@ -737,7 +738,7 @@ cvf::ref RivIntersectionPartMgr::createHexGridI if (eclipseView) { RigMainGrid* grid = NULL; - grid = eclipseView->eclipseCase()->reservoirData()->mainGrid(); + grid = eclipseView->mainGrid(); return new RivEclipseIntersectionGrid(grid, eclipseView->currentActiveCellInfo(), m_rimCrossSection->showInactiveCells()); } diff --git a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp index 8ac5974b15..f733a964d0 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp @@ -19,7 +19,6 @@ #include "RivReservoirFaultsPartMgr.h" -#include "RigCaseData.h" #include "RigMainGrid.h" #include "RimEclipseCase.h" @@ -169,7 +168,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model) scalarResultIndex = cellResultColors->scalarResultIndex(); } - RigMainGrid* mainGrid = m_reservoirView->eclipseCase()->reservoirData()->mainGrid(); + RigMainGrid* mainGrid = m_reservoirView->mainGrid(); if (!(mainGrid && mainGrid->nncData()->hasScalarValues(scalarResultIndex))) { showNncs = false; diff --git a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp index 83dc8d9fa6..5e003d1bdb 100644 --- a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp @@ -104,7 +104,7 @@ void RivSimWellPipesPartMgr::buildWellPipeParts() RigSimulationWellCenterLineCalculator::calculateWellPipeCenterline(m_rimWell.p(), m_pipeBranchesCLCoords, pipeBranchesCellIds); - double characteristicCellSize = m_rimReservoirView->eclipseCase()->reservoirData()->mainGrid()->characteristicIJCellSize(); + double characteristicCellSize = m_rimReservoirView->mainGrid()->characteristicIJCellSize(); double pipeRadius = m_rimReservoirView->wellCollection()->pipeRadiusScaleFactor() *m_rimWell->pipeRadiusScaleFactor() * characteristicCellSize; @@ -127,7 +127,7 @@ void RivSimWellPipesPartMgr::buildWellPipeParts() cvfCoords->assign(m_pipeBranchesCLCoords[brIdx]); // Scale the centerline coordinates using the Z-scale transform of the grid and correct for the display offset. - const RigMainGrid* mainGrid = m_rimReservoirView->eclipseCase()->reservoirData()->mainGrid(); + const RigMainGrid* mainGrid = m_rimReservoirView->mainGrid(); for (size_t cIdx = 0; cIdx < cvfCoords->size(); ++cIdx) { diff --git a/ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.cpp index 71d94615ca..f26ef23b49 100644 --- a/ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.cpp @@ -20,7 +20,6 @@ #include "RiaApplication.h" -#include "RigCaseData.h" #include "RigMainGrid.h" #include "RimEclipseCase.h" @@ -73,7 +72,7 @@ void RivWellSpheresPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicLis if (!m_rimReservoirView->eclipseCase()) return; if (!m_rimReservoirView->eclipseCase()->reservoirData()) return; - const RigMainGrid* mainGrid = m_rimReservoirView->eclipseCase()->reservoirData()->mainGrid(); + const RigMainGrid* mainGrid = m_rimReservoirView->mainGrid(); CVF_ASSERT(mainGrid); RigSingleWellResultsData* rigWellResult = m_rimWell->wellResults(); @@ -152,7 +151,7 @@ cvf::ref RivWellSpheresPartMgr::createPart(std::vectorsetColors(colors.p()); cvf::GeometryBuilderTriangles builder; - double characteristicCellSize = m_rimReservoirView->eclipseCase()->reservoirData()->mainGrid()->characteristicIJCellSize(); + double characteristicCellSize = m_rimReservoirView->mainGrid()->characteristicIJCellSize(); double cellRadius = m_rimReservoirView->wellCollection()->cellCenterSpheresScaleFactor() * characteristicCellSize; cvf::GeometryUtils::createSphere(cellRadius, 15, 15, &builder); diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index d318791e0d..ba5e8b6b35 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -331,19 +331,19 @@ void Rim3dOverlayInfoConfig::updateEclipse3DInfo(RimEclipseView * eclipseView) QString iSize, jSize, kSize; QString zScale; - if (eclipseView->eclipseCase() && eclipseView->eclipseCase()->reservoirData() && eclipseView->eclipseCase()->reservoirData()->mainGrid()) + if (eclipseView->mainGrid()) { caseName = eclipseView->eclipseCase()->caseUserDescription(); - totCellCount = QString::number(eclipseView->eclipseCase()->reservoirData()->mainGrid()->globalCellArray().size()); + totCellCount = QString::number(eclipseView->mainGrid()->globalCellArray().size()); size_t mxActCellCount = eclipseView->eclipseCase()->reservoirData()->activeCellInfo(RifReaderInterface::MATRIX_RESULTS)->reservoirActiveCellCount(); size_t frActCellCount = eclipseView->eclipseCase()->reservoirData()->activeCellInfo(RifReaderInterface::FRACTURE_RESULTS)->reservoirActiveCellCount(); if (frActCellCount > 0) activeCellCountText += "Matrix : "; activeCellCountText += QString::number(mxActCellCount); if (frActCellCount > 0) activeCellCountText += " Fracture : " + QString::number(frActCellCount); - iSize = QString::number(eclipseView->eclipseCase()->reservoirData()->mainGrid()->cellCountI()); - jSize = QString::number(eclipseView->eclipseCase()->reservoirData()->mainGrid()->cellCountJ()); - kSize = QString::number(eclipseView->eclipseCase()->reservoirData()->mainGrid()->cellCountK()); + iSize = QString::number(eclipseView->mainGrid()->cellCountI()); + jSize = QString::number(eclipseView->mainGrid()->cellCountJ()); + kSize = QString::number(eclipseView->mainGrid()->cellCountK()); zScale = QString::number(eclipseView->scaleZ()); From 95b7ce73ee0a8ff071f66a7af41226bf0cdaff12 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 9 Jan 2017 14:14:06 +0100 Subject: [PATCH 17/27] #1075 Fixed toggle of single item when two items are selected --- Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp index 13eb61c3e1..82acc77eef 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp @@ -290,7 +290,10 @@ void PdmUiListEditor::slotSelectionChanged(const QItemSelection & selected, cons { QModelIndexList idxList = m_listView->selectionModel()->selectedIndexes(); - if (idxList.size() == 1) + QVariant fieldValue = field()->uiValue(); + QList valuesSelectedInField = fieldValue.toList(); + + if (idxList.size() == 1 && valuesSelectedInField.size() == 1) { // NOTE : Workaround for update issue seen on RHEL6 with Qt 4.6.2 // An invalid call to setSelection() from QAbstractItemView::keyPressEvent() causes the stepping using arrow keys From 396069ae283a0124fe3d7563ebecf4f8efb0030b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 10 Jan 2017 08:48:58 +0100 Subject: [PATCH 18/27] Fixed Linux comiler warnings --- ApplicationCode/ProjectDataModel/RimLegendConfig.cpp | 4 ++-- ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp b/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp index a11403ee8c..44c4d7edcf 100644 --- a/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp +++ b/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp @@ -771,9 +771,9 @@ void RimLegendConfig::setNamedCategories(const std::vector& categoryNam std::vector nameIndices; std::vector names; - for ( int i = 0; i < categoryNames.size(); ++i ) + for ( size_t i = 0; i < categoryNames.size(); ++i ) { - nameIndices.push_back(i); + nameIndices.push_back(static_cast(i)); names.push_back(cvfqt::Utils::toString(categoryNames[i])); } diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp index c5a58951b7..d8329781db 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp @@ -265,11 +265,11 @@ std::vector* RigFlowDiagResults::calculateTracerWithMaxFractionResult(co int selTracerIdx = 0; for ( const std::string& tracerName: resVarAddr.selectedTracerNames ) { - for ( int globIdx = 0; globIdx < allTracerNames.size(); ++globIdx ) + for ( size_t globIdx = 0; globIdx < allTracerNames.size(); ++globIdx ) { if ( allTracerNames[globIdx].toStdString() == tracerName ) { - selectedTracerIdxToGlobalTracerIdx[selTracerIdx] = globIdx; + selectedTracerIdxToGlobalTracerIdx[selTracerIdx] = static_cast(globIdx); break; } } From 5ffb1daeca9c8ba95a7f7e4393121f41e7cb8461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 10 Jan 2017 08:56:07 +0100 Subject: [PATCH 19/27] Upped to version 2016.11.flow.7 --- ResInsightVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ResInsightVersion.cmake b/ResInsightVersion.cmake index c0a9263322..5ee202d1fd 100644 --- a/ResInsightVersion.cmake +++ b/ResInsightVersion.cmake @@ -1,7 +1,7 @@ set(RESINSIGHT_MAJOR_VERSION 2016) set(RESINSIGHT_MINOR_VERSION 11) -set(RESINSIGHT_INCREMENT_VERSION "flow.1") +set(RESINSIGHT_INCREMENT_VERSION "flow.7") # https://github.com/CRAVA/crava/tree/master/libs/nrlib From 9cacf0db6cffbc17af5795a7adf3684c01489d6d Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 9 Jan 2017 15:15:08 +0100 Subject: [PATCH 20/27] #1068 Access mainGrid directly from RimEclipseView --- .../RimCellRangeFilterCollection.cpp | 9 +++------ .../ProjectDataModel/RimEclipseView.cpp | 4 ++-- .../ProjectDataModel/RimFaultCollection.cpp | 8 ++++---- .../ProjectDataModel/RimViewController.cpp | 18 +++++++++--------- .../ProjectDataModel/RimViewLinker.cpp | 16 +++++----------- .../UserInterface/RiuViewerCommands.cpp | 15 +++++++-------- 6 files changed, 30 insertions(+), 40 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp b/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp index 7707b14feb..418017b2ea 100644 --- a/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp @@ -107,16 +107,13 @@ void RimCellRangeFilterCollection::compoundCellRangeFilter(cvf::CellRangeFilter* RigMainGrid* RimCellRangeFilterCollection::mainGrid() const { RimEclipseView* eclipseView = this->eclipseView(); - if (eclipseView && - eclipseView->eclipseCase() && - eclipseView->eclipseCase()->reservoirData() && - eclipseView->eclipseCase()->reservoirData()->mainGrid()) + if (eclipseView && eclipseView->mainGrid()) { - return eclipseView->eclipseCase()->reservoirData()->mainGrid(); + return eclipseView->mainGrid(); } - return NULL; + return nullptr; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index 0a70e4f213..e120dd9508 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -465,7 +465,7 @@ void RimEclipseView::createDisplayModel() */ // Well path model - RigMainGrid* mainGrid = eclipseCase()->reservoirData()->mainGrid(); + RigMainGrid* mainGrid = this->mainGrid(); m_wellPathPipeVizModel->removeAllParts(); addWellPathsToModel(m_wellPathPipeVizModel.p(), @@ -1589,7 +1589,7 @@ void RimEclipseView::setOverridePropertyFilterCollection(RimEclipsePropertyFilte void RimEclipseView::calculateCurrentTotalCellVisibility(cvf::UByteArray* totalVisibility) { size_t gridCount = this->eclipseCase()->reservoirData()->gridCount(); - size_t cellCount = this->eclipseCase()->reservoirData()->mainGrid()->globalCellArray().size(); + size_t cellCount = this->mainGrid()->globalCellArray().size(); totalVisibility->resize(cellCount); totalVisibility->setAll(false); diff --git a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp index b2c7f1a127..a243b0d9e1 100644 --- a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp @@ -185,11 +185,11 @@ bool faultComparator(const cvf::ref& a, const cvf::ref& b) //-------------------------------------------------------------------------------------------------- void RimFaultCollection::syncronizeFaults() { - if (!(m_reservoirView && m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData() && m_reservoirView->eclipseCase()->reservoirData()->mainGrid()) ) return; + if (!(m_reservoirView && m_reservoirView->mainGrid()) ) return; cvf::ref partColors = RivColorTableArray::colorTableArray(); - const cvf::Collection constRigFaults = m_reservoirView->eclipseCase()->reservoirData()->mainGrid()->faults(); + const cvf::Collection constRigFaults = m_reservoirView->mainGrid()->faults(); cvf::Collection rigFaults; { @@ -270,7 +270,7 @@ void RimFaultCollection::syncronizeFaults() // NNCs this->noCommonAreaNnncCollection()->noCommonAreaNncs().deleteAllChildObjects(); - RigMainGrid* mainGrid = m_reservoirView->eclipseCase()->reservoirData()->mainGrid(); + RigMainGrid* mainGrid = m_reservoirView->mainGrid(); std::vector& nncConnections = mainGrid->nncData()->connections(); for (size_t i = 0; i < nncConnections.size(); i++) { @@ -397,7 +397,7 @@ void RimFaultCollection::setShowFaultsOutsideFilters(bool enableState) //-------------------------------------------------------------------------------------------------- void RimFaultCollection::addMockData() { - if (!(m_reservoirView && m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData() && m_reservoirView->eclipseCase()->reservoirData()->mainGrid())) return; + if (!(m_reservoirView && m_reservoirView->mainGrid())) return; } diff --git a/ApplicationCode/ProjectDataModel/RimViewController.cpp b/ApplicationCode/ProjectDataModel/RimViewController.cpp index 560c91366f..c6e2ff7867 100644 --- a/ApplicationCode/ProjectDataModel/RimViewController.cpp +++ b/ApplicationCode/ProjectDataModel/RimViewController.cpp @@ -21,7 +21,7 @@ #include "RiaApplication.h" -#include "RigCaseData.h" +//#include "RigCaseData.h" #include "RigCaseToCaseCellMapper.h" #include "RigCaseToCaseRangeFilterMapper.h" #include "RigFemPartCollection.h" @@ -570,14 +570,14 @@ const RigCaseToCaseCellMapper* RimViewController::cellMapper() RigFemPart* masterFemPart = NULL; RigFemPart* dependFemPart = NULL; - if (masterEclipseView && masterEclipseView->eclipseCase()->reservoirData()) + if (masterEclipseView) { - masterEclGrid = masterEclipseView->eclipseCase()->reservoirData()->mainGrid(); + masterEclGrid = masterEclipseView->mainGrid(); } - if (dependEclipseView && dependEclipseView->eclipseCase()->reservoirData()) + if (dependEclipseView) { - dependEclGrid = dependEclipseView->eclipseCase()->reservoirData()->mainGrid(); + dependEclGrid = dependEclipseView->mainGrid(); } if (masterGeomechView && masterGeomechView->geoMechCase()->geoMechData() @@ -971,9 +971,9 @@ void RimViewController::updateRangeFilterOverrides(RimCellRangeFilter* changedRa if (eclipseMasterView && depGeomView) { - if (eclipseMasterView->eclipseCase()->reservoirData()) + if (eclipseMasterView->mainGrid()) { - RigMainGrid* srcEclGrid = eclipseMasterView->eclipseCase()->reservoirData()->mainGrid(); + RigMainGrid* srcEclGrid = eclipseMasterView->mainGrid(); RigFemPart* dstFemPart = depGeomView->geoMechCase()->geoMechData()->femParts()->part(0); for (size_t rfIdx = 0; rfIdx < sourceFilterCollection->rangeFilters().size(); ++rfIdx) { @@ -986,10 +986,10 @@ void RimViewController::updateRangeFilterOverrides(RimCellRangeFilter* changedRa } else if (geoMasterView && depEclView) { - if (depEclView->eclipseCase()->reservoirData()) + if (depEclView->mainGrid()) { RigFemPart* srcFemPart = geoMasterView->geoMechCase()->geoMechData()->femParts()->part(0); - RigMainGrid* dstEclGrid = depEclView->eclipseCase()->reservoirData()->mainGrid(); + RigMainGrid* dstEclGrid = depEclView->mainGrid(); for (size_t rfIdx = 0; rfIdx < sourceFilterCollection->rangeFilters().size(); ++rfIdx) { RimCellRangeFilter* srcRFilter = sourceFilterCollection->rangeFilters[rfIdx]; diff --git a/ApplicationCode/ProjectDataModel/RimViewLinker.cpp b/ApplicationCode/ProjectDataModel/RimViewLinker.cpp index 3fa9b6111a..6798a85a16 100644 --- a/ApplicationCode/ProjectDataModel/RimViewLinker.cpp +++ b/ApplicationCode/ProjectDataModel/RimViewLinker.cpp @@ -21,7 +21,7 @@ #include "RiaApplication.h" -#include "RigCaseData.h" +#include "RigMainGrid.h" #include "RimCase.h" #include "RimEclipseCellColors.h" @@ -547,12 +547,9 @@ void RimViewLinker::updateCamera(RimView* sourceView) cvf::BoundingBox sourceSceneBB = sourceView->viewer()->currentScene()->boundingBox(); RimEclipseView* eclipseView = dynamic_cast(sourceView); - if (eclipseView - && eclipseView->eclipseCase() - && eclipseView->eclipseCase()->reservoirData() - && eclipseView->eclipseCase()->reservoirData()->mainGrid()) + if (eclipseView && eclipseView->mainGrid()) { - cvf::Vec3d offset = eclipseView->eclipseCase()->reservoirData()->mainGrid()->displayModelOffset(); + cvf::Vec3d offset = eclipseView->mainGrid()->displayModelOffset(); offset.z() *= eclipseView->scaleZ(); sourceCamGlobalEye += offset; @@ -578,12 +575,9 @@ void RimViewLinker::updateCamera(RimView* sourceView) cvf::BoundingBox destSceneBB = destinationViewer->currentScene()->boundingBox(); RimEclipseView* destEclipseView = dynamic_cast(destinationView); - if (destEclipseView - && destEclipseView->eclipseCase() - && destEclipseView->eclipseCase()->reservoirData() - && destEclipseView->eclipseCase()->reservoirData()->mainGrid()) + if (destEclipseView && destEclipseView->mainGrid()) { - cvf::Vec3d destOffset = destEclipseView->eclipseCase()->reservoirData()->mainGrid()->displayModelOffset(); + cvf::Vec3d destOffset = destEclipseView->mainGrid()->displayModelOffset(); destOffset.z() *= destEclipseView->scaleZ(); cvf::Vec3d destinationCamEye = sourceCamGlobalEye - destOffset; diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp index ac11722fd8..6a6f76af06 100644 --- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp +++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp @@ -32,6 +32,7 @@ #include "RigFemPartCollection.h" #include "RigFemPartGrid.h" #include "RigGeoMechCaseData.h" +#include "RigMainGrid.h" #include "RimCellEdgeColors.h" #include "RimContextCommandBuilder.h" @@ -254,8 +255,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event) } // Hide faults command - const RigCaseData* reservoir = eclipseView->eclipseCase()->reservoirData(); - const RigFault* fault = reservoir->mainGrid()->findFaultFromCellIndexAndCellFace(m_currentCellIndex, m_currentFaceIndex); + const RigFault* fault = eclipseView->mainGrid()->findFaultFromCellIndexAndCellFace(m_currentCellIndex, m_currentFaceIndex); if (fault) { menu.addSeparator(); @@ -400,8 +400,7 @@ void RiuViewerCommands::slotHideFault() RimEclipseView* eclipseView = dynamic_cast(m_reservoirView.p()); if(!eclipseView) return; - const RigCaseData* reservoir = eclipseView->eclipseCase()->reservoirData(); - const RigFault* fault = reservoir->mainGrid()->findFaultFromCellIndexAndCellFace(m_currentCellIndex, m_currentFaceIndex); + const RigFault* fault = eclipseView->mainGrid()->findFaultFromCellIndexAndCellFace(m_currentCellIndex, m_currentFaceIndex); if (fault) { QString faultName = fault->name(); @@ -641,7 +640,7 @@ void RiuViewerCommands::findCellAndGridIndex(const RivIntersectionSourceInfo* cr { size_t globalCellIndex = crossSectionSourceInfo->triangleToCellIndex()[firstPartTriangleIndex]; - const RigCell& cell = eclipseView->eclipseCase()->reservoirData()->mainGrid()->globalCellArray()[globalCellIndex]; + const RigCell& cell = eclipseView->mainGrid()->globalCellArray()[globalCellIndex]; *cellIndex = cell.gridLocalCellIndex(); *gridIndex = cell.hostGrid()->gridIndex(); } @@ -665,7 +664,7 @@ void RiuViewerCommands::findCellAndGridIndex(const RivIntersectionBoxSourceInfo* { size_t globalCellIndex = intersectionBoxSourceInfo->triangleToCellIndex()[firstPartTriangleIndex]; - const RigCell& cell = eclipseView->eclipseCase()->reservoirData()->mainGrid()->globalCellArray()[globalCellIndex]; + const RigCell& cell = eclipseView->mainGrid()->globalCellArray()[globalCellIndex]; *cellIndex = cell.gridLocalCellIndex(); *gridIndex = cell.hostGrid()->gridIndex(); } @@ -691,9 +690,9 @@ void RiuViewerCommands::extractIntersectionData(const cvf::HitItemCollection& hi { RimEclipseView* eclipseView = dynamic_cast(m_reservoirView.p()); - if (eclipseView && eclipseView->eclipseCase()) + if (eclipseView && eclipseView->mainGrid()) { - double characteristicCellSize = eclipseView->eclipseCase()->reservoirData()->mainGrid()->characteristicIJCellSize(); + double characteristicCellSize = eclipseView->mainGrid()->characteristicIJCellSize(); pickDepthThresholdSquared = characteristicCellSize / 100.0; pickDepthThresholdSquared = pickDepthThresholdSquared * pickDepthThresholdSquared; } From ccd4cb24c95d5c1e27e9776017e545bea10581d1 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 9 Jan 2017 19:04:45 +0100 Subject: [PATCH 21/27] #1068 Avoid include of RigMainGrid.h in RigCaseData.h --- .../RifEclipseInputFileTools.cpp | 1 + .../FileInterface/RifReaderEclipseInput.cpp | 2 ++ .../FileInterface/RifReaderOpmParserInput.cpp | 4 ++++ .../ModelVisualization/RivFaultPartMgr.cpp | 2 +- .../RivSimWellPipesPartMgr.cpp | 3 ++- .../ModelVisualization/RivWellHeadPartMgr.cpp | 1 + .../Rim3dOverlayInfoConfig.cpp | 1 + .../RimCellRangeFilterCollection.cpp | 2 +- .../ProjectDataModel/RimEclipseCase.cpp | 1 + .../RimEclipseCaseCollection.cpp | 7 +++++-- .../RimEclipseInputCaseOpm.cpp | 1 + .../RimEclipseStatisticsCaseEvaluator.cpp | 1 + .../ProjectDataModel/RimEclipseView.cpp | 11 +++++----- .../ProjectDataModel/RimFaultCollection.cpp | 1 + .../ProjectDataModel/RimFlowDiagSolution.cpp | 8 +++++--- .../RimIdenticalGridCaseGroup.cpp | 18 ++++++++++------- .../ProjectDataModel/RimViewController.cpp | 3 ++- .../ReservoirDataModel/RigCaseData.h | 13 ++++++------ .../RigReservoirBuilderMock.h | 1 + .../SocketInterface/RiaCaseInfoCommands.cpp | 20 ++++++++++--------- .../SocketInterface/RiaGeometryCommands.cpp | 20 ++++++++++--------- .../RiaPropertyDataCommands.cpp | 1 + 22 files changed, 77 insertions(+), 45 deletions(-) diff --git a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp index deb5de8404..e9270ea367 100644 --- a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp +++ b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp @@ -23,6 +23,7 @@ #include "RifReaderEclipseOutput.h" #include "RigCaseCellResultsData.h" #include "RigCaseData.h" +#include "RigMainGrid.h" #include "RigResultAccessorFactory.h" #include "cafProgressInfo.h" diff --git a/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp index ed8ced8a9e..2cc07aad74 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp @@ -21,7 +21,9 @@ #include "RifReaderEclipseInput.h" #include "RifEclipseInputFileTools.h" + #include "RigCaseData.h" +#include "RigMainGrid.h" //================================================================================================== // diff --git a/ApplicationCode/FileInterface/RifReaderOpmParserInput.cpp b/ApplicationCode/FileInterface/RifReaderOpmParserInput.cpp index 5e2553e665..226d5e5114 100644 --- a/ApplicationCode/FileInterface/RifReaderOpmParserInput.cpp +++ b/ApplicationCode/FileInterface/RifReaderOpmParserInput.cpp @@ -21,10 +21,14 @@ #include "RifReaderEclipseOutput.h" #include "RigCaseCellResultsData.h" #include "RigCaseData.h" +#include "RigMainGrid.h" + #include "RimEclipseInputCaseOpm.h" #include "RimEclipseInputProperty.h" #include "RimEclipseInputPropertyCollection.h" + #include "RiuMainWindow.h" + #include "RiuProcessMonitor.h" #include "cafProgressInfo.h" diff --git a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp index 968dcdfb8b..329b569532 100644 --- a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp @@ -23,7 +23,7 @@ #include "RiaPreferences.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigMainGrid.h" #include "RigResultAccessor.h" #include "RimEclipseCase.h" diff --git a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp index 5e003d1bdb..5eb5040f17 100644 --- a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp @@ -22,6 +22,8 @@ #include "RigCaseData.h" #include "RigCell.h" +#include "RigMainGrid.h" +#include "RigSimulationWellCenterLineCalculator.h" #include "Rim3dOverlayInfoConfig.h" #include "RimCellEdgeColors.h" @@ -49,7 +51,6 @@ #include "cvfRay.h" #include "cvfScalarMapperDiscreteLinear.h" #include "cvfTransform.h" -#include "RigSimulationWellCenterLineCalculator.h" //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp index 4f766d4d7e..b447c8c5a9 100644 --- a/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp @@ -26,6 +26,7 @@ #include "RigCaseData.h" #include "RigCell.h" +#include "RigMainGrid.h" #include "Rim3dOverlayInfoConfig.h" #include "RimCellEdgeColors.h" diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index ba5e8b6b35..d51a1998ac 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -28,6 +28,7 @@ #include "RigFemPartResultsCollection.h" #include "RigFemResultAddress.h" #include "RigGeoMechCaseData.h" +#include "RigMainGrid.h" #include "RigStatisticsDataCache.h" #include "RimCellEdgeColors.h" diff --git a/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp b/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp index 418017b2ea..0a27a1e325 100644 --- a/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp @@ -25,7 +25,7 @@ #include "RigFemPartCollection.h" #include "RigFemPartGrid.h" #include "RigGeoMechCaseData.h" -#include "RigGridBase.h" +#include "RigMainGrid.h" #include "RimEclipseCase.h" #include "RimEclipseView.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp index cf23013c0f..dc5c8f477e 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp @@ -25,6 +25,7 @@ #include "RigCaseCellResultsData.h" #include "RigCaseData.h" +#include "RigMainGrid.h" #include "RimCaseCollection.h" #include "RimCellEdgeColors.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp index 44e66bafc7..db52994995 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp @@ -21,13 +21,16 @@ #include "RimEclipseCaseCollection.h" #include "RiaApplication.h" + #include "RigCaseData.h" #include "RigGridManager.h" -#include "RimEclipseCase.h" +#include "RigMainGrid.h" + #include "RimCaseCollection.h" +#include "RimEclipseCase.h" +#include "RimEclipseStatisticsCase.h" #include "RimIdenticalGridCaseGroup.h" #include "RimProject.h" -#include "RimEclipseStatisticsCase.h" CAF_PDM_SOURCE_INIT(RimEclipseCaseCollection, "ResInsightAnalysisModels"); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp b/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp index 80ed512824..f5a5ec8b86 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp @@ -26,6 +26,7 @@ #include "RigCaseCellResultsData.h" #include "RigCaseData.h" +#include "RigMainGrid.h" #include "RimEclipseCase.h" #include "RimEclipseInputProperty.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp index 74eec71515..722a0cfe77 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp @@ -22,6 +22,7 @@ #include "RigCaseCellResultsData.h" #include "RigCaseData.h" +#include "RigMainGrid.h" #include "RigResultAccessorFactory.h" #include "RigResultModifier.h" #include "RigResultModifierFactory.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index e120dd9508..740be5ad08 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -25,23 +25,27 @@ #include "RigCaseCellResultsData.h" #include "RigCaseData.h" +#include "RigFlowDiagResults.h" #include "RigFormationNames.h" +#include "RigMainGrid.h" #include "RigResultAccessor.h" #include "RigResultAccessorFactory.h" #include "Rim3dOverlayInfoConfig.h" #include "RimCellEdgeColors.h" #include "RimCellRangeFilterCollection.h" -#include "RimIntersection.h" -#include "RimIntersectionCollection.h" #include "RimEclipseCase.h" #include "RimEclipseCellColors.h" #include "RimEclipseFaultColors.h" #include "RimEclipsePropertyFilterCollection.h" +#include "RimEclipseResultDefinition.h" #include "RimEclipseWell.h" #include "RimEclipseWellCollection.h" #include "RimFaultCollection.h" +#include "RimFlowDiagSolution.h" #include "RimGridCollection.h" +#include "RimIntersection.h" +#include "RimIntersectionCollection.h" #include "RimLegendConfig.h" #include "RimOilField.h" #include "RimProject.h" @@ -76,9 +80,6 @@ #include #include -#include "RimEclipseResultDefinition.h" -#include "RimFlowDiagSolution.h" -#include "RigFlowDiagResults.h" diff --git a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp index a243b0d9e1..d83557ee64 100644 --- a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp @@ -23,6 +23,7 @@ #include "RiaPreferences.h" #include "RigCaseData.h" +#include "RigMainGrid.h" #include "RimEclipseCase.h" #include "RimEclipseView.h" diff --git a/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp b/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp index 08f9fe657c..b9cd0d4f41 100644 --- a/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp +++ b/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp @@ -17,11 +17,13 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RimFlowDiagSolution.h" -#include "RimEclipseResultCase.h" -#include "RigCaseData.h" -#include "RigFlowDiagResults.h" +#include "RimEclipseResultCase.h" + #include "RigCaseCellResultsData.h" +#include "RigCaseData.h" +#include "RigFlowDiagResults.h" +#include "RigMainGrid.h" CAF_PDM_SOURCE_INIT(RimFlowDiagSolution, "FlowDiagSolution"); diff --git a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp index 671aadd93d..25137f34ac 100644 --- a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp +++ b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp @@ -22,22 +22,26 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" +#include "RigCaseCellResultsData.h" #include "RigCaseData.h" #include "RigGridManager.h" -#include "RimEclipseCase.h" +#include "RigMainGrid.h" + #include "RimCaseCollection.h" #include "RimCellEdgeColors.h" -#include "RimReservoirCellResultsStorage.h" -#include "RimEclipseView.h" -#include "RimEclipseResultCase.h" +#include "RimEclipseCase.h" #include "RimEclipseCellColors.h" +#include "RimEclipseResultCase.h" #include "RimEclipseStatisticsCase.h" -#include "RigCaseCellResultsData.h" +#include "RimEclipseView.h" +#include "RimReservoirCellResultsStorage.h" + +#include "RiuMainWindow.h" #include "cafProgressInfo.h" -#include "RiuMainWindow.h" -#include + #include +#include CAF_PDM_SOURCE_INIT(RimIdenticalGridCaseGroup, "RimIdenticalGridCaseGroup"); diff --git a/ApplicationCode/ProjectDataModel/RimViewController.cpp b/ApplicationCode/ProjectDataModel/RimViewController.cpp index c6e2ff7867..81ebeabe30 100644 --- a/ApplicationCode/ProjectDataModel/RimViewController.cpp +++ b/ApplicationCode/ProjectDataModel/RimViewController.cpp @@ -21,11 +21,12 @@ #include "RiaApplication.h" -//#include "RigCaseData.h" +#include "RigCaseData.h" #include "RigCaseToCaseCellMapper.h" #include "RigCaseToCaseRangeFilterMapper.h" #include "RigFemPartCollection.h" #include "RigGeoMechCaseData.h" +#include "RigMainGrid.h" #include "RimCase.h" #include "RimCellRangeFilterCollection.h" diff --git a/ApplicationCode/ReservoirDataModel/RigCaseData.h b/ApplicationCode/ReservoirDataModel/RigCaseData.h index c5c53ef753..0455c32003 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseData.h +++ b/ApplicationCode/ReservoirDataModel/RigCaseData.h @@ -20,14 +20,15 @@ #pragma once -#include +#include "RigActiveCellInfo.h" #include "RigCell.h" -#include "cvfVector3.h" +#include "RigSingleWellResultsData.h" + #include "cvfAssert.h" #include "cvfObject.h" -#include "RigMainGrid.h" -#include "RigSingleWellResultsData.h" -#include "RigActiveCellInfo.h" +#include "cvfVector3.h" + +#include class RigCaseCellResultsData; class RigFormationNames; @@ -84,6 +85,7 @@ private: void computeActiveCellIJKBBox(); void computeWellCellsPrGrid(); void computeActiveCellsGeometryBoundingBox(); + private: cvf::ref m_mainGrid; @@ -100,5 +102,4 @@ private: cvf::Collection m_gridCellToResultWellIndex; //< Array pr grid with index to well pr cell telling which well a cell is in UnitsType m_unitsType; - }; diff --git a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h index 3e5f5cc713..bf52a4f1f6 100644 --- a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h +++ b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h @@ -26,6 +26,7 @@ #include "cvfVector3.h" #include "RigCell.h" #include "RigCaseData.h" +#include "RigMainGrid.h" class LocalGridRefinement { diff --git a/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp b/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp index 768df7361e..7336f7810a 100644 --- a/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp @@ -19,23 +19,25 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RiaSocketCommand.h" + #include "RiaSocketServer.h" #include "RiaSocketTools.h" #include "RiaApplication.h" #include "RiaPreferences.h" -#include "RimEclipseView.h" -#include "RimEclipseCellColors.h" +#include "RigCaseCellResultsData.h" +#include "RigCaseData.h" +#include "RigMainGrid.h" + +#include "Rim3dOverlayInfoConfig.h" #include "RimCellEdgeColors.h" #include "RimCellRangeFilterCollection.h" -#include "RimEclipsePropertyFilterCollection.h" -#include "RimEclipseWellCollection.h" -#include "Rim3dOverlayInfoConfig.h" -#include "RimReservoirCellResultsStorage.h" #include "RimEclipseCase.h" - -#include "RigCaseData.h" -#include "RigCaseCellResultsData.h" +#include "RimEclipseCellColors.h" +#include "RimEclipsePropertyFilterCollection.h" +#include "RimEclipseView.h" +#include "RimEclipseWellCollection.h" +#include "RimReservoirCellResultsStorage.h" #include diff --git a/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp b/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp index 0d52a47e0a..b080bcd1a8 100644 --- a/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp @@ -19,25 +19,27 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RiaSocketCommand.h" + +#include "RiaApplication.h" +#include "RiaPreferences.h" #include "RiaSocketServer.h" #include "RiaSocketTools.h" -#include "RimEclipseView.h" -#include "RimEclipseCellColors.h" +#include "RigCaseCellResultsData.h" +#include "RigCaseData.h" +#include "RigMainGrid.h" + +#include "Rim3dOverlayInfoConfig.h" #include "RimCellEdgeColors.h" #include "RimCellRangeFilterCollection.h" +#include "RimEclipseCase.h" +#include "RimEclipseCellColors.h" #include "RimEclipsePropertyFilterCollection.h" +#include "RimEclipseView.h" #include "RimEclipseWellCollection.h" -#include "Rim3dOverlayInfoConfig.h" #include "RimReservoirCellResultsStorage.h" -#include "RimEclipseCase.h" -#include "RigCaseData.h" -#include "RigCaseCellResultsData.h" - #include -#include "RiaApplication.h" -#include "RiaPreferences.h" diff --git a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp index 1bbb800216..96eba45585 100644 --- a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp @@ -25,6 +25,7 @@ #include "RigCaseCellResultsData.h" #include "RigCaseData.h" +#include "RigMainGrid.h" #include "RigResultAccessor.h" #include "RigResultAccessorFactory.h" #include "RigResultModifier.h" From 93032a23ebde95811e4f8354e7fe81d110a318fd Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 9 Jan 2017 19:14:07 +0100 Subject: [PATCH 22/27] #1068 Avoid include of RigActiveCellInfo.h in RigCaseData.h --- .../FileInterface/RifEclipseInputFileTools.cpp | 2 ++ .../FileInterface/RifReaderEclipseOutput.cpp | 1 + .../RivReservoirViewPartMgr.cpp | 1 + .../ModelVisualization/RivWellHeadPartMgr.cpp | 1 + .../ProjectDataModel/RimEclipseCase.cpp | 1 + .../ProjectDataModel/RimEclipseInputCase.cpp | 3 ++- .../RimEclipseResultDefinition.cpp | 1 + .../ProjectDataModel/RimEclipseView.cpp | 1 + .../ProjectDataModel/RimFlowDiagSolution.cpp | 1 + .../ReservoirDataModel/RigCaseData.cpp | 1 + ApplicationCode/ReservoirDataModel/RigCaseData.h | 2 +- .../ReservoirDataModel/RigFlowDiagResults.cpp | 11 +++++++---- .../RigFlowDiagSolverInterface.cpp | 16 ++++++++++------ .../SocketInterface/RiaCaseInfoCommands.cpp | 1 + .../SocketInterface/RiaGeometryCommands.cpp | 1 + 15 files changed, 32 insertions(+), 12 deletions(-) diff --git a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp index e9270ea367..397cf72316 100644 --- a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp +++ b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp @@ -21,6 +21,8 @@ #include "RifEclipseInputFileTools.h" #include "RifReaderEclipseOutput.h" + +#include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" #include "RigCaseData.h" #include "RigMainGrid.h" diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp index b04c22dc6f..2ba175c576 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp @@ -20,6 +20,7 @@ #include "RifReaderEclipseOutput.h" +#include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" #include "RigCaseData.h" #include "RigMainGrid.h" diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp index c5d6d98803..6f4aa2dccb 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp @@ -20,6 +20,7 @@ #include "RivReservoirViewPartMgr.h" +#include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" #include "RigCaseData.h" #include "RigCaseToCaseCellMapper.h" diff --git a/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp index b447c8c5a9..092a50056b 100644 --- a/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp @@ -24,6 +24,7 @@ #include "RiaApplication.h" +#include "RigActiveCellInfo.h" #include "RigCaseData.h" #include "RigCell.h" #include "RigMainGrid.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp index dc5c8f477e..6229ef0dcb 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp @@ -23,6 +23,7 @@ #include "RiaApplication.h" #include "RiaPreferences.h" +#include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" #include "RigCaseData.h" #include "RigMainGrid.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp index 3159fe3e54..16c5614629 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp @@ -28,10 +28,11 @@ #include "RifReaderMockModel.h" #include "RifReaderSettings.h" +#include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" #include "RigCaseData.h" -#include "RimDefines.h" +#include "RimDefines.h" #include "RimEclipseInputProperty.h" #include "RimEclipseInputPropertyCollection.h" #include "RimReservoirCellResultsStorage.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 2c4aa21004..227122f604 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -20,6 +20,7 @@ #include "RimEclipseResultDefinition.h" +#include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" #include "RigCaseData.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index 740be5ad08..31a2cfbad2 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -23,6 +23,7 @@ #include "RiaApplication.h" #include "RiaPreferences.h" +#include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" #include "RigCaseData.h" #include "RigFlowDiagResults.h" diff --git a/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp b/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp index b9cd0d4f41..147e00a3b5 100644 --- a/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp +++ b/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp @@ -20,6 +20,7 @@ #include "RimEclipseResultCase.h" +#include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" #include "RigCaseData.h" #include "RigFlowDiagResults.h" diff --git a/ApplicationCode/ReservoirDataModel/RigCaseData.cpp b/ApplicationCode/ReservoirDataModel/RigCaseData.cpp index 04ca8067e8..764275b3c8 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCaseData.cpp @@ -20,6 +20,7 @@ #include "RigCaseData.h" +#include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" #include "RigFormationNames.h" #include "RigMainGrid.h" diff --git a/ApplicationCode/ReservoirDataModel/RigCaseData.h b/ApplicationCode/ReservoirDataModel/RigCaseData.h index 0455c32003..b8ff50baf0 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseData.h +++ b/ApplicationCode/ReservoirDataModel/RigCaseData.h @@ -20,7 +20,7 @@ #pragma once -#include "RigActiveCellInfo.h" +//#include "RigActiveCellInfo.h" #include "RigCell.h" #include "RigSingleWellResultsData.h" diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp index d8329781db..a1e9312c56 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp @@ -17,13 +17,16 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RigFlowDiagResults.h" -#include "RigFlowDiagSolverInterface.h" -#include "RimFlowDiagSolution.h" -#include "RimEclipseResultCase.h" -#include "RimEclipseCase.h" + +#include "RigActiveCellInfo.h" #include "RigCaseData.h" +#include "RigFlowDiagSolverInterface.h" #include "RigFlowDiagStatCalc.h" +#include "RimEclipseCase.h" +#include "RimEclipseResultCase.h" +#include "RimFlowDiagSolution.h" + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp index 01396b3dbb..81063c2a56 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp @@ -17,15 +17,19 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RigFlowDiagSolverInterface.h" -#include "RimFlowDiagSolution.h" -#include "RimEclipseResultCase.h" -#include "RigCaseCellResultsData.h" -#include "RigFlowDiagInterfaceTools.h" #include "RifEclipseOutputFileTools.h" -#include "RigCaseData.h" -#include "RimEclipseCase.h" #include "RifReaderInterface.h" + +#include "RigActiveCellInfo.h" +#include "RigCaseCellResultsData.h" +#include "RigCaseData.h" +#include "RigFlowDiagInterfaceTools.h" + +#include "RimEclipseCase.h" +#include "RimEclipseResultCase.h" +#include "RimFlowDiagSolution.h" + #include //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp b/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp index 7336f7810a..1b1b299c1e 100644 --- a/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp @@ -25,6 +25,7 @@ #include "RiaApplication.h" #include "RiaPreferences.h" +#include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" #include "RigCaseData.h" #include "RigMainGrid.h" diff --git a/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp b/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp index b080bcd1a8..3984a7b0c3 100644 --- a/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp @@ -25,6 +25,7 @@ #include "RiaSocketServer.h" #include "RiaSocketTools.h" +#include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" #include "RigCaseData.h" #include "RigMainGrid.h" From f70806e056a202afa1bc6546ecc782e0c2ccdcb1 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 9 Jan 2017 19:51:15 +0100 Subject: [PATCH 23/27] #1068 Avoid include of RigCell.h and RigSingleWellResultsData in RigCaseData.h --- .../Commands/RicExportFaultsFeature.cpp | 18 +++++++++------- .../RivReservoirViewPartMgr.cpp | 1 + .../RivSingleCellPartGenerator.cpp | 1 + .../RivTernaryTextureCoordsCreator.cpp | 2 ++ .../RivTextureCoordsCreator.cpp | 2 ++ .../RimEclipseStatisticsCase.cpp | 1 + .../ProjectDataModel/RimFlowDiagSolution.cpp | 1 + .../ProjectDataModel/RimProject.cpp | 3 +++ .../ReservoirDataModel/RigCaseData.cpp | 17 +++++++++++++++ .../ReservoirDataModel/RigCaseData.h | 21 ++++++++++++++----- .../RigReservoirBuilderMock.cpp | 5 +++-- .../RigSimulationWellCenterLineCalculator.cpp | 8 +++++-- .../RigTimeHistoryResultAccessor.cpp | 6 +++--- .../SocketInterface/RiaWellDataCommands.cpp | 1 + .../UserInterface/RiuResultTextBuilder.cpp | 1 + 15 files changed, 69 insertions(+), 19 deletions(-) diff --git a/ApplicationCode/Commands/RicExportFaultsFeature.cpp b/ApplicationCode/Commands/RicExportFaultsFeature.cpp index 29a0e30d8e..3d60b1c69f 100644 --- a/ApplicationCode/Commands/RicExportFaultsFeature.cpp +++ b/ApplicationCode/Commands/RicExportFaultsFeature.cpp @@ -20,17 +20,21 @@ #include "RicExportFaultsFeature.h" #include "RiaApplication.h" -#include "cafSelectionManager.h" + +#include "RigCaseData.h" +#include "RigFault.h" +#include "RigMainGrid.h" + +#include "RimDefines.h" +#include "RimEclipseCase.h" #include "RimFault.h" +#include "cafSelectionManager.h" +#include "cafUtils.h" + #include #include -#include "RimEclipseCase.h" -#include "RigFault.h" -#include "RigMainGrid.h" -#include "RigCaseData.h" -#include "QMessageBox" -#include "cafUtils.h" +#include CAF_CMD_SOURCE_INIT(RicExportFaultsFeature, "RicExportFaultsFeature"); diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp index 6f4aa2dccb..564c06cb03 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp @@ -24,6 +24,7 @@ #include "RigCaseCellResultsData.h" #include "RigCaseData.h" #include "RigCaseToCaseCellMapper.h" +#include "RigCell.h" #include "RigGridBase.h" #include "RigResultAccessorFactory.h" diff --git a/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.cpp b/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.cpp index 3e1f52435b..1c070503a4 100644 --- a/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.cpp +++ b/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.cpp @@ -22,6 +22,7 @@ #include "RigCaseData.h" #include "RigFemPartCollection.h" #include "RigGeoMechCaseData.h" +#include "RigGridBase.h" #include "RimGeoMechCase.h" diff --git a/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp b/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp index 90773ab638..d9772df78b 100644 --- a/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp +++ b/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp @@ -34,6 +34,8 @@ #include "RivTernaryResultToTextureMapper.h" #include "RivTernaryScalarMapper.h" +#include "cvfStructGridGeometryGenerator.h" + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp b/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp index 308e538f05..e97cb2bce0 100644 --- a/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp +++ b/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp @@ -32,6 +32,8 @@ #include "RivResultToTextureMapper.h" +#include "cvfStructGridGeometryGenerator.h" + //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp index 1d23259e85..3822fb9356 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp @@ -24,6 +24,7 @@ #include "RigCaseCellResultsData.h" #include "RigCaseData.h" +#include "RigSingleWellResultsData.h" #include "RimCaseCollection.h" #include "RimEclipseCellColors.h" diff --git a/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp b/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp index 147e00a3b5..1f4be83932 100644 --- a/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp +++ b/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp @@ -25,6 +25,7 @@ #include "RigCaseData.h" #include "RigFlowDiagResults.h" #include "RigMainGrid.h" +#include "RigSingleWellResultsData.h" CAF_PDM_SOURCE_INIT(RimFlowDiagSolution, "FlowDiagSolution"); diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index 4cf3d6df05..2ead2498ef 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -24,6 +24,7 @@ #include "RiaVersionInfo.h" #include "RigCaseData.h" +#include "RigGridBase.h" #include "RimCalcScript.h" #include "RimCase.h" @@ -59,6 +60,8 @@ #include "cafCmdFeatureManager.h" #include "cafPdmUiTreeOrdering.h" +#include "cvfBoundingBox.h" + #include #include diff --git a/ApplicationCode/ReservoirDataModel/RigCaseData.cpp b/ApplicationCode/ReservoirDataModel/RigCaseData.cpp index 764275b3c8..751c7a91ba 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCaseData.cpp @@ -25,6 +25,7 @@ #include "RigFormationNames.h" #include "RigMainGrid.h" #include "RigResultAccessorFactory.h" +#include "RigSingleWellResultsData.h" #include @@ -55,6 +56,22 @@ RigCaseData::~RigCaseData() } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RigMainGrid* RigCaseData::mainGrid() +{ + return m_mainGrid.p(); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +const RigMainGrid* RigCaseData::mainGrid() const +{ + return m_mainGrid.p(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ReservoirDataModel/RigCaseData.h b/ApplicationCode/ReservoirDataModel/RigCaseData.h index b8ff50baf0..f6503d132b 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseData.h +++ b/ApplicationCode/ReservoirDataModel/RigCaseData.h @@ -20,19 +20,30 @@ #pragma once -//#include "RigActiveCellInfo.h" -#include "RigCell.h" -#include "RigSingleWellResultsData.h" + +#include "RifReaderInterface.h" #include "cvfAssert.h" #include "cvfObject.h" #include "cvfVector3.h" +#include "cvfStructGrid.h" #include class RigCaseCellResultsData; class RigFormationNames; +class RigMainGrid; +class RigGridBase; +class RigCaseCellResultsData; +class RigActiveCellInfo; +class RigSingleWellResultsData; +class RigCell; +struct RigWellResultPoint; + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- class RigCaseData : public cvf::Object { public: @@ -47,8 +58,8 @@ public: RigCaseData(); ~RigCaseData(); - RigMainGrid* mainGrid() { return m_mainGrid.p(); } - const RigMainGrid* mainGrid() const { return m_mainGrid.p(); } + RigMainGrid* mainGrid(); + const RigMainGrid* mainGrid() const; void setMainGrid(RigMainGrid* mainGrid); void allGrids(std::vector* grids); // To be removed diff --git a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp index c18c58da66..85005c3ab6 100644 --- a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp +++ b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp @@ -19,9 +19,10 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RigReservoirBuilderMock.h" -#include "RigCaseData.h" -#include "RigActiveCellInfo.h" +#include "RigActiveCellInfo.h" +#include "RigCaseData.h" +#include "RigSingleWellResultsData.h" /* rand example: guess the number */ #include diff --git a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp index ae03466d2c..1bf3e2748d 100644 --- a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp +++ b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp @@ -18,11 +18,15 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RigSimulationWellCenterLineCalculator.h" + +#include "RigCaseData.h" +#include "RigCell.h" + +#include "RimEclipseCase.h" #include "RimEclipseView.h" #include "RimEclipseWell.h" #include "RimEclipseWellCollection.h" -#include "RimEclipseCase.h" -#include "RigCaseData.h" + #include "cvfRay.h" //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp b/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp index 05f98083a8..b07b4bed89 100644 --- a/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp +++ b/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp @@ -19,13 +19,13 @@ #include "RigTimeHistoryResultAccessor.h" -#include // Needed for HUGE_VAL on Linux - +#include "RigCaseCellResultsData.h" #include "RigCaseData.h" +#include "RigGridBase.h" #include "RigResultAccessor.h" #include "RigResultAccessorFactory.h" -#include "RigCaseCellResultsData.h" +#include // Needed for HUGE_VAL on Linux //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp b/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp index 527032e0f7..f51efc9b36 100644 --- a/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp @@ -22,6 +22,7 @@ #include "RiaSocketServer.h" #include "RiaSocketTools.h" +#include "RigGridBase.h" #include "RigCaseData.h" #include "RigSingleWellResultsData.h" diff --git a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp index 04068ef0ef..49d3ecfcd5 100644 --- a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp +++ b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp @@ -25,6 +25,7 @@ #include "RigMainGrid.h" #include "RigResultAccessor.h" #include "RigResultAccessorFactory.h" +#include "RigSingleWellResultsData.h" #include "RimCellEdgeColors.h" #include "RimEclipseCase.h" From 50b9fe0ecee212aed83a1742970cd38c340bb1d1 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 9 Jan 2017 20:27:46 +0100 Subject: [PATCH 24/27] #1068 Removed obsolete include of RigCaseData --- ...icSaveEclipseResultAsInputPropertyExec.cpp | 1 - .../FileInterface/RifReaderMockModel.cpp | 5 ++- .../ProjectDataModel/RimCellRangeFilter.cpp | 1 - .../RimCellRangeFilterCollection.cpp | 1 - .../RimEclipseFaultColors.cpp | 3 -- .../ProjectDataModel/RimEclipseInputCase.cpp | 1 + .../ProjectDataModel/RimEclipseResultCase.cpp | 1 + .../ProjectDataModel/RimFaultCollection.cpp | 1 - ApplicationCode/ProjectDataModel/RimView.cpp | 2 -- .../ProjectDataModel/RimViewController.cpp | 3 +- .../RimWellLogPlotCollection.cpp | 1 - .../RigReservoirBuilderMock.cpp | 2 ++ .../RigReservoirBuilderMock.h | 15 +++++++-- .../RiaProjectInfoCommands.cpp | 32 +++++++++---------- .../SocketInterface/RiaSocketServer.cpp | 18 +---------- 15 files changed, 38 insertions(+), 49 deletions(-) diff --git a/ApplicationCode/Commands/EclipseCommands/RicSaveEclipseResultAsInputPropertyExec.cpp b/ApplicationCode/Commands/EclipseCommands/RicSaveEclipseResultAsInputPropertyExec.cpp index aa8fef57e5..e1e372b3d9 100644 --- a/ApplicationCode/Commands/EclipseCommands/RicSaveEclipseResultAsInputPropertyExec.cpp +++ b/ApplicationCode/Commands/EclipseCommands/RicSaveEclipseResultAsInputPropertyExec.cpp @@ -24,7 +24,6 @@ #include "RimEclipseView.h" #include "RimEclipseCase.h" -#include "RigCaseData.h" #include "RigCaseCellResultsData.h" #include "RifEclipseInputFileTools.h" diff --git a/ApplicationCode/FileInterface/RifReaderMockModel.cpp b/ApplicationCode/FileInterface/RifReaderMockModel.cpp index c0da5973e2..4f5841c048 100644 --- a/ApplicationCode/FileInterface/RifReaderMockModel.cpp +++ b/ApplicationCode/FileInterface/RifReaderMockModel.cpp @@ -19,9 +19,12 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RifReaderMockModel.h" -#include "RigCaseCellResultsData.h" + #include "RifReaderInterface.h" +#include "RigCaseCellResultsData.h" +#include "RigCaseData.h" + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp b/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp index 812b78fc03..2688a09849 100644 --- a/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp +++ b/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp @@ -22,7 +22,6 @@ #include "RimCellRangeFilter.h" #include "RigActiveCellInfo.h" -#include "RigCaseData.h" #include "RigGridBase.h" #include "RigMainGrid.h" diff --git a/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp b/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp index 0a27a1e325..eb9d292eba 100644 --- a/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp @@ -20,7 +20,6 @@ #include "RimCellRangeFilterCollection.h" -#include "RigCaseData.h" #include "RigFemPart.h" #include "RigFemPartCollection.h" #include "RigFemPartGrid.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseFaultColors.cpp b/ApplicationCode/ProjectDataModel/RimEclipseFaultColors.cpp index 621aedc073..1c3b65c8ef 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseFaultColors.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseFaultColors.cpp @@ -19,9 +19,6 @@ #include "RimEclipseFaultColors.h" -#include "RigCaseData.h" -#include "RigMainGrid.h" - #include "RimEclipseCase.h" #include "RimEclipseCellColors.h" #include "RimEclipseView.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp index 16c5614629..142472a6b3 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp @@ -31,6 +31,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" #include "RigCaseData.h" +#include "RigMainGrid.h" #include "RimDefines.h" #include "RimEclipseInputProperty.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp index c32875a5f5..e463cc7209 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp @@ -29,6 +29,7 @@ #include "RigCaseCellResultsData.h" #include "RigCaseData.h" +#include "RigMainGrid.h" #include "RimMockModelSettings.h" #include "RimProject.h" diff --git a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp index d83557ee64..f30daa33ac 100644 --- a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp @@ -22,7 +22,6 @@ #include "RiaApplication.h" #include "RiaPreferences.h" -#include "RigCaseData.h" #include "RigMainGrid.h" #include "RimEclipseCase.h" diff --git a/ApplicationCode/ProjectDataModel/RimView.cpp b/ApplicationCode/ProjectDataModel/RimView.cpp index f689702dd0..35f523ee79 100644 --- a/ApplicationCode/ProjectDataModel/RimView.cpp +++ b/ApplicationCode/ProjectDataModel/RimView.cpp @@ -3,8 +3,6 @@ #include "RiaApplication.h" #include "RiaPreferences.h" -#include "RigCaseData.h" - #include "Rim3dOverlayInfoConfig.h" #include "RimCellRangeFilterCollection.h" #include "RimEclipseCase.h" diff --git a/ApplicationCode/ProjectDataModel/RimViewController.cpp b/ApplicationCode/ProjectDataModel/RimViewController.cpp index 81ebeabe30..156093d5d5 100644 --- a/ApplicationCode/ProjectDataModel/RimViewController.cpp +++ b/ApplicationCode/ProjectDataModel/RimViewController.cpp @@ -21,7 +21,6 @@ #include "RiaApplication.h" -#include "RigCaseData.h" #include "RigCaseToCaseCellMapper.h" #include "RigCaseToCaseRangeFilterMapper.h" #include "RigFemPartCollection.h" @@ -857,7 +856,7 @@ bool RimViewController::isRangeFilterMappingApliccable() const { if (eclipseView->eclipseCase()->reservoirData() && geomView->geoMechCase() && geomView->geoMechCase()->geoMechData()) { - RigMainGrid* eclGrid = eclipseView->eclipseCase()->reservoirData()->mainGrid(); + RigMainGrid* eclGrid = eclipseView->mainGrid(); RigFemPart* femPart = geomView->geoMechCase()->geoMechData()->femParts()->part(0); if (eclGrid && femPart) diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp index 95fda59b02..fed2b8043d 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp @@ -19,7 +19,6 @@ #include "RimWellLogPlotCollection.h" -#include "RigCaseData.h" #include "RigEclipseWellLogExtractor.h" #include "RigGeoMechCaseData.h" #include "RigGeoMechWellLogExtractor.h" diff --git a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp index 85005c3ab6..88529379ae 100644 --- a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp +++ b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp @@ -22,6 +22,8 @@ #include "RigActiveCellInfo.h" #include "RigCaseData.h" +#include "RigCell.h" +#include "RigMainGrid.h" #include "RigSingleWellResultsData.h" /* rand example: guess the number */ diff --git a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h index bf52a4f1f6..eb805b2077 100644 --- a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h +++ b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h @@ -24,9 +24,18 @@ #include "cvfObject.h" #include "cvfArray.h" #include "cvfVector3.h" -#include "RigCell.h" -#include "RigCaseData.h" -#include "RigMainGrid.h" + +//#include "RigCell.h" +//#include "RigCaseData.h" +//#include "RigMainGrid.h" + +class RigCaseData; +class RigMainGrid; +class RigConnection; +class RigGridBase; +class RigCell; + +class QString; class LocalGridRefinement { diff --git a/ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp b/ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp index c4ab077840..42e3cb62b1 100644 --- a/ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp @@ -19,29 +19,29 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RiaSocketCommand.h" + +#include "RiaApplication.h" #include "RiaSocketServer.h" #include "RiaSocketTools.h" -#include "RimEclipseView.h" -#include "RimEclipseCellColors.h" +#include "Rim3dOverlayInfoConfig.h" +#include "RimCaseCollection.h" #include "RimCellEdgeColors.h" #include "RimCellRangeFilterCollection.h" -#include "RimEclipsePropertyFilterCollection.h" -#include "RimEclipseWellCollection.h" -#include "Rim3dOverlayInfoConfig.h" -#include "RimReservoirCellResultsStorage.h" - #include "RimEclipseCase.h" -#include "RigCaseData.h" -#include "RigCaseCellResultsData.h" -#include "RiuMainWindow.h" -#include "RiaApplication.h" -#include "RimProject.h" -#include "RimIdenticalGridCaseGroup.h" -#include "RimCaseCollection.h" -#include "RimScriptCollection.h" -#include "RimOilField.h" #include "RimEclipseCaseCollection.h" +#include "RimEclipseCellColors.h" +#include "RimEclipsePropertyFilterCollection.h" +#include "RimEclipseView.h" +#include "RimEclipseWellCollection.h" +#include "RimIdenticalGridCaseGroup.h" +#include "RimOilField.h" +#include "RimProject.h" +#include "RimReservoirCellResultsStorage.h" +#include "RimScriptCollection.h" + +#include "RiuMainWindow.h" + #include "cafSelectionManager.h" diff --git a/ApplicationCode/SocketInterface/RiaSocketServer.cpp b/ApplicationCode/SocketInterface/RiaSocketServer.cpp index e27a4661e6..799acd25d0 100644 --- a/ApplicationCode/SocketInterface/RiaSocketServer.cpp +++ b/ApplicationCode/SocketInterface/RiaSocketServer.cpp @@ -20,29 +20,13 @@ #include "RiaSocketServer.h" #include "RiaSocketCommand.h" -#include "RiaSocketTools.h" #include "RiaApplication.h" -#include "RigCaseCellResultsData.h" -#include "RigCaseData.h" -#include "RigGridBase.h" - -#include "Rim3dOverlayInfoConfig.h" -#include "RimCaseCollection.h" -#include "RimCellEdgeColors.h" -#include "RimCellRangeFilterCollection.h" #include "RimEclipseCase.h" -#include "RimEclipseCaseCollection.h" -#include "RimEclipseCellColors.h" -#include "RimEclipsePropertyFilterCollection.h" #include "RimEclipseView.h" -#include "RimEclipseWellCollection.h" -#include "RimIdenticalGridCaseGroup.h" -#include "RimOilField.h" #include "RimProject.h" -#include "RimReservoirCellResultsStorage.h" -#include "RimScriptCollection.h" +#include "RimCase.h" #include "RiuMainWindow.h" #include "RiuViewer.h" From f22555c382857bfa95eee22eb0b416c31608a1b5 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 9 Jan 2017 20:46:56 +0100 Subject: [PATCH 25/27] #1068 Fixed missing include --- ApplicationCode/UnitTests/RigReservoir-Test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ApplicationCode/UnitTests/RigReservoir-Test.cpp b/ApplicationCode/UnitTests/RigReservoir-Test.cpp index 42df377a7f..ab85e79344 100644 --- a/ApplicationCode/UnitTests/RigReservoir-Test.cpp +++ b/ApplicationCode/UnitTests/RigReservoir-Test.cpp @@ -22,6 +22,7 @@ #include "RigCaseData.h" #include "RigGridManager.h" +#include "RigMainGrid.h" //-------------------------------------------------------------------------------------------------- From 36c008a12c6513200b6244a6ebea2cb36809afa6 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 9 Jan 2017 20:51:37 +0100 Subject: [PATCH 26/27] #1068 Removed obsolute include --- ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h index 73038a9089..d4fdf0591b 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h +++ b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h @@ -23,7 +23,6 @@ #include "RifReaderInterface.h" #include "RimDefines.h" -#include "RigStatisticsDataCache.h" #include @@ -33,6 +32,7 @@ class RifReaderInterface; class RigMainGrid; class RigActiveCellInfo; +class RigStatisticsDataCache; //================================================================================================== /// Class containing the results for the complete number of active cells. Both main grid and LGR's From 8970d93a4d3a8bb5b066b4912f5d0e3e4e8c19a3 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Tue, 10 Jan 2017 09:51:39 +0100 Subject: [PATCH 27/27] #1068 Renamed to RigEclipseCaseData --- ApplicationCode/Application/RiaApplication.h | 2 +- .../Commands/RicExportFaultsFeature.cpp | 2 +- .../RifEclipseInputFileTools.cpp | 16 +++--- .../FileInterface/RifEclipseInputFileTools.h | 16 +++--- .../FileInterface/RifReaderEclipseInput.cpp | 4 +- .../FileInterface/RifReaderEclipseInput.h | 2 +- .../FileInterface/RifReaderEclipseOutput.cpp | 14 ++--- .../FileInterface/RifReaderEclipseOutput.h | 8 +-- .../FileInterface/RifReaderInterface.h | 4 +- .../FileInterface/RifReaderMockModel.cpp | 6 +-- .../FileInterface/RifReaderMockModel.h | 6 +-- .../FileInterface/RifReaderOpmParserInput.cpp | 12 ++--- .../FileInterface/RifReaderOpmParserInput.h | 12 ++--- .../RivIntersectionBoxPartMgr.cpp | 2 +- .../Intersections/RivIntersectionPartMgr.cpp | 2 +- .../RivCellEdgeGeometryUtils.cpp | 10 ++-- .../RivCellEdgeGeometryUtils.h | 6 +-- .../ModelVisualization/RivFaultPartMgr.cpp | 2 +- .../ModelVisualization/RivGridPartMgr.cpp | 2 +- .../RivReservoirPartMgr.cpp | 4 +- .../ModelVisualization/RivReservoirPartMgr.h | 4 +- .../RivReservoirViewPartMgr.cpp | 14 ++--- .../RivSimWellPipesPartMgr.cpp | 2 +- .../RivSingleCellPartGenerator.cpp | 4 +- .../RivSingleCellPartGenerator.h | 6 +-- .../RivTernaryTextureCoordsCreator.cpp | 6 +-- .../RivTextureCoordsCreator.cpp | 4 +- .../ModelVisualization/RivWellHeadPartMgr.cpp | 4 +- .../Rim3dOverlayInfoConfig.cpp | 2 +- .../ProjectDataModel/RimEclipseCase.cpp | 14 ++--- .../ProjectDataModel/RimEclipseCase.h | 10 ++-- .../RimEclipseCaseCollection.cpp | 10 ++-- .../RimEclipseCaseCollection.h | 4 +- .../ProjectDataModel/RimEclipseInputCase.cpp | 8 +-- .../RimEclipseInputCaseOpm.cpp | 4 +- .../RimEclipseInputProperty.cpp | 2 +- .../RimEclipsePropertyFilter.cpp | 2 +- .../ProjectDataModel/RimEclipseResultCase.cpp | 10 ++-- .../ProjectDataModel/RimEclipseResultCase.h | 2 +- .../RimEclipseResultDefinition.cpp | 2 +- .../RimEclipseStatisticsCase.cpp | 10 ++-- .../RimEclipseStatisticsCaseEvaluator.cpp | 4 +- .../RimEclipseStatisticsCaseEvaluator.h | 6 +-- .../ProjectDataModel/RimEclipseView.cpp | 4 +- .../ProjectDataModel/RimFlowDiagSolution.cpp | 2 +- .../RimIdenticalGridCaseGroup.cpp | 4 +- .../ProjectDataModel/RimProject.cpp | 2 +- ApplicationCode/ProjectDataModel/RimProject.h | 2 +- .../RimReservoirCellResultsStorage.cpp | 10 ++-- .../RimWellLogExtractionCurve.cpp | 6 +-- .../RimWellLogPlotCollection.cpp | 4 +- .../RimWellLogPlotCollection.h | 4 +- .../ReservoirDataModel/CMakeLists_files.cmake | 4 +- ...RigCaseData.cpp => RigEclipseCaseData.cpp} | 54 +++++++++---------- .../{RigCaseData.h => RigEclipseCaseData.h} | 6 +-- .../RigEclipseWellLogExtractor.cpp | 4 +- .../RigEclipseWellLogExtractor.h | 8 +-- .../ReservoirDataModel/RigFlowDiagResults.cpp | 2 +- .../RigFlowDiagSolverInterface.cpp | 2 +- .../RigFlowDiagSolverInterface.h | 2 +- .../ReservoirDataModel/RigGridManager.cpp | 8 +-- .../ReservoirDataModel/RigGridManager.h | 10 ++-- .../RigReservoirBuilderMock.cpp | 14 ++--- .../RigReservoirBuilderMock.h | 18 +++---- .../RigResultAccessorFactory.cpp | 12 ++--- .../RigResultAccessorFactory.h | 10 ++-- .../RigResultModifierFactory.cpp | 6 +-- .../RigResultModifierFactory.h | 6 +-- .../RigSimulationWellCenterLineCalculator.cpp | 4 +- .../RigTimeHistoryResultAccessor.cpp | 4 +- .../RigTimeHistoryResultAccessor.h | 6 +-- .../SocketInterface/RiaCaseInfoCommands.cpp | 2 +- .../SocketInterface/RiaGeometryCommands.cpp | 2 +- .../RiaPropertyDataCommands.cpp | 2 +- .../SocketInterface/RiaWellDataCommands.cpp | 2 +- .../RifEclipseInputFileTools-Test.cpp | 2 +- .../UnitTests/RifReaderEclipseOutput-Test.cpp | 4 +- .../UnitTests/RigReservoir-Test.cpp | 6 +-- .../UnitTests/opm-parser-Performance-Test.cpp | 2 +- .../UserInterface/RiuResultTextBuilder.cpp | 20 +++---- .../UserInterface/RiuResultTextBuilder.h | 4 +- .../RiuSelectionChangedHandler.cpp | 2 +- .../UserInterface/RiuViewerCommands.cpp | 2 +- 83 files changed, 265 insertions(+), 269 deletions(-) rename ApplicationCode/ReservoirDataModel/{RigCaseData.cpp => RigEclipseCaseData.cpp} (90%) rename ApplicationCode/ReservoirDataModel/{RigCaseData.h => RigEclipseCaseData.h} (98%) diff --git a/ApplicationCode/Application/RiaApplication.h b/ApplicationCode/Application/RiaApplication.h index 3f5ec65924..f15298266a 100644 --- a/ApplicationCode/Application/RiaApplication.h +++ b/ApplicationCode/Application/RiaApplication.h @@ -43,7 +43,7 @@ class RiaPreferences; class RiaProjectModifier; class RiaSocketServer; -class RigCaseData; +class RigEclipseCaseData; class RimCommandObject; class RimEclipseCase; diff --git a/ApplicationCode/Commands/RicExportFaultsFeature.cpp b/ApplicationCode/Commands/RicExportFaultsFeature.cpp index 3d60b1c69f..22a22c59bc 100644 --- a/ApplicationCode/Commands/RicExportFaultsFeature.cpp +++ b/ApplicationCode/Commands/RicExportFaultsFeature.cpp @@ -21,7 +21,7 @@ #include "RiaApplication.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFault.h" #include "RigMainGrid.h" diff --git a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp index 397cf72316..2d282db937 100644 --- a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp +++ b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp @@ -24,7 +24,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RigResultAccessorFactory.h" @@ -73,7 +73,7 @@ RifEclipseInputFileTools::~RifEclipseInputFileTools() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigCaseData* eclipseCase, bool readFaultData) +bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigEclipseCaseData* eclipseCase, bool readFaultData) { CVF_ASSERT(eclipseCase); @@ -202,7 +202,7 @@ bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigCaseData //-------------------------------------------------------------------------------------------------- /// Read known properties from the input file //-------------------------------------------------------------------------------------------------- -std::map RifEclipseInputFileTools::readProperties(const QString& fileName, RigCaseData* caseData) +std::map RifEclipseInputFileTools::readProperties(const QString& fileName, RigEclipseCaseData* caseData) { CVF_ASSERT(caseData); @@ -252,7 +252,7 @@ std::map RifEclipseInputFileTools::readProperties(const QStrin /// Reads the property data requested into the \a reservoir, overwriting any previous /// properties with the same name. //-------------------------------------------------------------------------------------------------- -bool RifEclipseInputFileTools::readProperty(const QString& fileName, RigCaseData* caseData, const QString& eclipseKeyWord, const QString& resultName) +bool RifEclipseInputFileTools::readProperty(const QString& fileName, RigEclipseCaseData* caseData, const QString& eclipseKeyWord, const QString& resultName) { CVF_ASSERT(caseData); @@ -278,7 +278,7 @@ bool RifEclipseInputFileTools::readProperty(const QString& fileName, RigCaseData //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifEclipseInputFileTools::readDataFromKeyword(ecl_kw_type* eclipseKeywordData, RigCaseData* caseData, const QString& resultName) +bool RifEclipseInputFileTools::readDataFromKeyword(ecl_kw_type* eclipseKeywordData, RigEclipseCaseData* caseData, const QString& resultName) { CVF_ASSERT(caseData); CVF_ASSERT(eclipseKeywordData); @@ -443,7 +443,7 @@ const std::vector& RifEclipseInputFileTools::invalidPropertyDataKeyword //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifEclipseInputFileTools::writePropertyToTextFile(const QString& fileName, RigCaseData* eclipseCase, size_t timeStep, const QString& resultName, const QString& eclipseKeyWord) +bool RifEclipseInputFileTools::writePropertyToTextFile(const QString& fileName, RigEclipseCaseData* eclipseCase, size_t timeStep, const QString& resultName, const QString& eclipseKeyWord) { CVF_ASSERT(eclipseCase); @@ -476,7 +476,7 @@ bool RifEclipseInputFileTools::writePropertyToTextFile(const QString& fileName, /// undefinedValue is used for cells with no result //-------------------------------------------------------------------------------------------------- bool RifEclipseInputFileTools::writeBinaryResultToTextFile(const QString& fileName, - RigCaseData* eclipseCase, + RigEclipseCaseData* eclipseCase, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStep, const QString& resultName, @@ -723,7 +723,7 @@ qint64 RifEclipseInputFileTools::findKeyword(const QString& keyword, QFile& file //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -size_t RifEclipseInputFileTools::findOrCreateResult(const QString& newResultName, RigCaseData* reservoir) +size_t RifEclipseInputFileTools::findOrCreateResult(const QString& newResultName, RigEclipseCaseData* reservoir) { size_t resultIndex = reservoir->results(RifReaderInterface::MATRIX_RESULTS)->findScalarResultIndex(newResultName); if (resultIndex == cvf::UNDEFINED_SIZE_T) diff --git a/ApplicationCode/FileInterface/RifEclipseInputFileTools.h b/ApplicationCode/FileInterface/RifEclipseInputFileTools.h index 87de0bc5a1..5f2df60a1c 100644 --- a/ApplicationCode/FileInterface/RifEclipseInputFileTools.h +++ b/ApplicationCode/FileInterface/RifEclipseInputFileTools.h @@ -34,7 +34,7 @@ #include -class RigCaseData; +class RigEclipseCaseData; class QFile; @@ -59,11 +59,11 @@ public: RifEclipseInputFileTools(); virtual ~RifEclipseInputFileTools(); - static bool openGridFile(const QString& fileName, RigCaseData* eclipseCase, bool readFaultData); + static bool openGridFile(const QString& fileName, RigEclipseCaseData* eclipseCase, bool readFaultData); // Returns map of assigned resultName and Eclipse Keyword. - static std::map readProperties(const QString& fileName, RigCaseData* eclipseCase); - static bool readProperty (const QString& fileName, RigCaseData* eclipseCase, const QString& eclipseKeyWord, const QString& resultName ); + static std::map readProperties(const QString& fileName, RigEclipseCaseData* eclipseCase); + static bool readProperty (const QString& fileName, RigEclipseCaseData* eclipseCase, const QString& eclipseKeyWord, const QString& resultName ); static void readFaultsInGridSection(const QString& fileName, cvf::Collection* faults, std::vector* filenamesWithFaults); static void readFaults(const QString& fileName, const std::vector< RifKeywordAndFilePos >& fileKeywords, cvf::Collection* faults); @@ -75,8 +75,8 @@ public: static void parseAndReadPathAliasKeyword(const QString &fileName, std::vector< std::pair >* pathAliasDefinitions); - static bool writePropertyToTextFile(const QString& fileName, RigCaseData* eclipseCase, size_t timeStep, const QString& resultName, const QString& eclipseKeyWord); - static bool writeBinaryResultToTextFile(const QString& fileName, RigCaseData* eclipseCase, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStep, const QString& resultName, const QString& eclipseKeyWord, const double undefinedValue); + static bool writePropertyToTextFile(const QString& fileName, RigEclipseCaseData* eclipseCase, size_t timeStep, const QString& resultName, const QString& eclipseKeyWord); + static bool writeBinaryResultToTextFile(const QString& fileName, RigEclipseCaseData* eclipseCase, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStep, const QString& resultName, const QString& eclipseKeyWord, const double undefinedValue); static bool readFaultsAndParseIncludeStatementsRecursively( QFile& file, qint64 startPos, @@ -88,14 +88,14 @@ public: static cvf::StructGridInterface::FaceEnum faceEnumFromText(const QString& faceString); private: - static bool readDataFromKeyword(ecl_kw_type* eclipseKeywordData, RigCaseData* caseData, const QString& resultName); + static bool readDataFromKeyword(ecl_kw_type* eclipseKeywordData, RigEclipseCaseData* caseData, const QString& resultName); static void writeDataToTextFile(QFile* file, const QString& eclipseKeyWord, const std::vector& resultData); static void findGridKeywordPositions(const std::vector< RifKeywordAndFilePos >& keywords, qint64* coordPos, qint64* zcornPos, qint64* specgridPos, qint64* actnumPos, qint64* mapaxesPos); static size_t findFaultByName(const cvf::Collection& faults, const QString& name); static qint64 findKeyword(const QString& keyword, QFile& file, qint64 startPos); - static size_t findOrCreateResult(const QString& newResultName, RigCaseData* reservoir); + static size_t findOrCreateResult(const QString& newResultName, RigEclipseCaseData* reservoir); static bool isValidDataKeyword(const QString& keyword); private: diff --git a/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp index 2cc07aad74..d9b002fa9f 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp @@ -22,7 +22,7 @@ #include "RifEclipseInputFileTools.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" //================================================================================================== @@ -48,7 +48,7 @@ RifReaderEclipseInput::~RifReaderEclipseInput() //-------------------------------------------------------------------------------------------------- /// Open file and read geometry into given reservoir object //-------------------------------------------------------------------------------------------------- -bool RifReaderEclipseInput::open(const QString& fileName, RigCaseData* eclipseCase) +bool RifReaderEclipseInput::open(const QString& fileName, RigEclipseCaseData* eclipseCase) { CVF_ASSERT(eclipseCase); diff --git a/ApplicationCode/FileInterface/RifReaderEclipseInput.h b/ApplicationCode/FileInterface/RifReaderEclipseInput.h index 32499507e4..4a608885fb 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseInput.h +++ b/ApplicationCode/FileInterface/RifReaderEclipseInput.h @@ -32,7 +32,7 @@ public: virtual ~RifReaderEclipseInput(); // Virtual interface implementation - virtual bool open(const QString& fileName, RigCaseData* eclipseCase); + virtual bool open(const QString& fileName, RigEclipseCaseData* eclipseCase); diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp index 2ba175c576..125b40d198 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp @@ -22,7 +22,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RifEclipseOutputFileTools.h" @@ -231,7 +231,7 @@ void RifReaderEclipseOutput::close() //-------------------------------------------------------------------------------------------------- /// Read geometry from file given by name into given reservoir object //-------------------------------------------------------------------------------------------------- -bool RifReaderEclipseOutput::transferGeometry(const ecl_grid_type* mainEclGrid, RigCaseData* eclipseCase) +bool RifReaderEclipseOutput::transferGeometry(const ecl_grid_type* mainEclGrid, RigEclipseCaseData* eclipseCase) { CVF_ASSERT(eclipseCase); @@ -349,7 +349,7 @@ bool RifReaderEclipseOutput::transferGeometry(const ecl_grid_type* mainEclGrid, //-------------------------------------------------------------------------------------------------- /// Open file and read geometry into given reservoir object //-------------------------------------------------------------------------------------------------- -bool RifReaderEclipseOutput::open(const QString& fileName, RigCaseData* eclipseCase) +bool RifReaderEclipseOutput::open(const QString& fileName, RigEclipseCaseData* eclipseCase) { CVF_ASSERT(eclipseCase); caf::ProgressInfo progInfo(100, ""); @@ -523,7 +523,7 @@ void RifReaderEclipseOutput::transferNNCData( const ecl_grid_type * mainEclGrid //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifReaderEclipseOutput::openAndReadActiveCellData(const QString& fileName, const std::vector& mainCaseTimeSteps, RigCaseData* eclipseCase) +bool RifReaderEclipseOutput::openAndReadActiveCellData(const QString& fileName, const std::vector& mainCaseTimeSteps, RigEclipseCaseData* eclipseCase) { CVF_ASSERT(eclipseCase); @@ -704,16 +704,16 @@ void RifReaderEclipseOutput::buildMetaData() } // Default units type is METRIC - RigCaseData::UnitsType unitsType = RigCaseData::UNITS_METRIC; + RigEclipseCaseData::UnitsType unitsType = RigEclipseCaseData::UNITS_METRIC; { int unitsTypeValue = m_dynamicResultsAccess->readUnitsType(); if (unitsTypeValue == 2) { - unitsType = RigCaseData::UNITS_FIELD; + unitsType = RigEclipseCaseData::UNITS_FIELD; } else if (unitsTypeValue == 3) { - unitsType = RigCaseData::UNITS_LAB; + unitsType = RigEclipseCaseData::UNITS_LAB; } } diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.h b/ApplicationCode/FileInterface/RifReaderEclipseOutput.h index 431d4cc39b..7f32d2d532 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.h +++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.h @@ -49,15 +49,15 @@ public: RifReaderEclipseOutput(); virtual ~RifReaderEclipseOutput(); - bool open(const QString& fileName, RigCaseData* eclipseCase); + bool open(const QString& fileName, RigEclipseCaseData* eclipseCase); - virtual bool openAndReadActiveCellData(const QString& fileName, const std::vector& mainCaseTimeSteps, RigCaseData* eclipseCase); + virtual bool openAndReadActiveCellData(const QString& fileName, const std::vector& mainCaseTimeSteps, RigEclipseCaseData* eclipseCase); void close(); bool staticResult(const QString& result, PorosityModelResultType matrixOrFracture, std::vector* values); bool dynamicResult(const QString& result, PorosityModelResultType matrixOrFracture, size_t stepIndex, std::vector* values); - static bool transferGeometry(const ecl_grid_type* mainEclGrid, RigCaseData* eclipseCase); + static bool transferGeometry(const ecl_grid_type* mainEclGrid, RigEclipseCaseData* eclipseCase); static void transferCoarseningInfo(const ecl_grid_type* eclGrid, RigGridBase* grid); private: @@ -89,7 +89,7 @@ private: QString m_fileName; // Name of file used to start accessing Eclipse output files QStringList m_filesWithSameBaseName; // Set of files in filename's path with same base name as filename - RigCaseData* m_eclipseCase; + RigEclipseCaseData* m_eclipseCase; std::vector m_timeSteps; diff --git a/ApplicationCode/FileInterface/RifReaderInterface.h b/ApplicationCode/FileInterface/RifReaderInterface.h index abf9160268..240c2b36f3 100644 --- a/ApplicationCode/FileInterface/RifReaderInterface.h +++ b/ApplicationCode/FileInterface/RifReaderInterface.h @@ -31,7 +31,7 @@ #include -class RigCaseData; +class RigEclipseCaseData; class RifReaderSettings; @@ -59,7 +59,7 @@ public: bool isImportOfCompleteMswDataEnabled(); bool isNNCsEnabled(); - virtual bool open(const QString& fileName, RigCaseData* eclipseCase) = 0; + virtual bool open(const QString& fileName, RigEclipseCaseData* eclipseCase) = 0; virtual void close() = 0; virtual bool staticResult(const QString& result, PorosityModelResultType matrixOrFracture, std::vector* values) = 0; diff --git a/ApplicationCode/FileInterface/RifReaderMockModel.cpp b/ApplicationCode/FileInterface/RifReaderMockModel.cpp index 4f5841c048..a158dc0c60 100644 --- a/ApplicationCode/FileInterface/RifReaderMockModel.cpp +++ b/ApplicationCode/FileInterface/RifReaderMockModel.cpp @@ -23,12 +23,12 @@ #include "RifReaderInterface.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifReaderMockModel::open(const QString& fileName, RigCaseData* eclipseCase) +bool RifReaderMockModel::open(const QString& fileName, RigEclipseCaseData* eclipseCase) { m_reservoirBuilder.populateReservoir(eclipseCase); @@ -173,7 +173,7 @@ void RifReaderMockModel::addLocalGridRefinement(const cvf::Vec3st& minCellPositi //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifReaderMockModel::populateReservoir(RigCaseData* eclipseCase) +void RifReaderMockModel::populateReservoir(RigEclipseCaseData* eclipseCase) { m_reservoirBuilder.populateReservoir(eclipseCase); } diff --git a/ApplicationCode/FileInterface/RifReaderMockModel.h b/ApplicationCode/FileInterface/RifReaderMockModel.h index dbe4a083ee..33f5204f5b 100644 --- a/ApplicationCode/FileInterface/RifReaderMockModel.h +++ b/ApplicationCode/FileInterface/RifReaderMockModel.h @@ -36,17 +36,17 @@ public: void addLocalGridRefinement(const cvf::Vec3st& minCellPosition, const cvf::Vec3st& maxCellPosition, const cvf::Vec3st& singleCellRefinementFactors); - virtual bool open( const QString& fileName, RigCaseData* eclipseCase ); + virtual bool open( const QString& fileName, RigEclipseCaseData* eclipseCase ); virtual void close(); virtual bool staticResult( const QString& result, RifReaderInterface::PorosityModelResultType matrixOrFracture, std::vector* values ); virtual bool dynamicResult( const QString& result, RifReaderInterface::PorosityModelResultType matrixOrFracture, size_t stepIndex, std::vector* values ); private: - void populateReservoir(RigCaseData* eclipseCase); + void populateReservoir(RigEclipseCaseData* eclipseCase); bool inputProperty( const QString& propertyName, std::vector* values ); RigReservoirBuilderMock m_reservoirBuilder; - RigCaseData* m_reservoir; + RigEclipseCaseData* m_reservoir; }; diff --git a/ApplicationCode/FileInterface/RifReaderOpmParserInput.cpp b/ApplicationCode/FileInterface/RifReaderOpmParserInput.cpp index 226d5e5114..ec254ed2bd 100644 --- a/ApplicationCode/FileInterface/RifReaderOpmParserInput.cpp +++ b/ApplicationCode/FileInterface/RifReaderOpmParserInput.cpp @@ -20,7 +20,7 @@ #include "RifReaderEclipseOutput.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RimEclipseInputCaseOpm.h" @@ -45,7 +45,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifReaderOpmParserInput::importGridPropertiesFaults(const QString& fileName, RigCaseData* caseData) +void RifReaderOpmParserInput::importGridPropertiesFaults(const QString& fileName, RigEclipseCaseData* caseData) { RiuMainWindow::instance()->processMonitor()->addStringToLog(QString("\nStarted reading of grid and properties from file : " + fileName + "\n")); @@ -432,7 +432,7 @@ void RifReaderOpmParserInput::initUsingWarnings(Opm::ParseContext* parseContext) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -size_t RifReaderOpmParserPropertyReader::findOrCreateResult(const QString& newResultName, RigCaseData* reservoir) +size_t RifReaderOpmParserPropertyReader::findOrCreateResult(const QString& newResultName, RigEclipseCaseData* reservoir) { size_t resultIndex = reservoir->results(RifReaderInterface::MATRIX_RESULTS)->findScalarResultIndex(newResultName); if (resultIndex == cvf::UNDEFINED_SIZE_T) @@ -446,7 +446,7 @@ size_t RifReaderOpmParserPropertyReader::findOrCreateResult(const QString& newRe //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifReaderOpmParserPropertyReader::readAllProperties(std::shared_ptr< Opm::Deck > deck, RigCaseData* caseData, std::map* newResults) +void RifReaderOpmParserPropertyReader::readAllProperties(std::shared_ptr< Opm::Deck > deck, RigEclipseCaseData* caseData, std::map* newResults) { std::set uniqueKeywords; for (auto it = deck->begin(); it != deck->end(); it++) @@ -549,7 +549,7 @@ std::set RifReaderOpmParserPropertyReader::keywords() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifReaderOpmParserPropertyReader::copyPropertyToCaseData(const std::string& keywordName, RigCaseData* caseData, const QString& resultName) +bool RifReaderOpmParserPropertyReader::copyPropertyToCaseData(const std::string& keywordName, RigEclipseCaseData* caseData, const QString& resultName) { { std::string errorMessage; @@ -629,7 +629,7 @@ void RifReaderOpmParserPropertyReader::getAllValuesForKeyword(std::shared_ptr< O //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifReaderOpmParserPropertyReader::isDataItemCountIdenticalToMainGridCellCount(std::shared_ptr< Opm::Deck > deck, const std::string& keyword, RigCaseData* caseData) +bool RifReaderOpmParserPropertyReader::isDataItemCountIdenticalToMainGridCellCount(std::shared_ptr< Opm::Deck > deck, const std::string& keyword, RigEclipseCaseData* caseData) { bool isEqual = false; { diff --git a/ApplicationCode/FileInterface/RifReaderOpmParserInput.h b/ApplicationCode/FileInterface/RifReaderOpmParserInput.h index 4949929d87..8701094262 100644 --- a/ApplicationCode/FileInterface/RifReaderOpmParserInput.h +++ b/ApplicationCode/FileInterface/RifReaderOpmParserInput.h @@ -30,7 +30,7 @@ #include -class RigCaseData; +class RigEclipseCaseData; namespace Opm { class Deck; @@ -46,7 +46,7 @@ namespace Opm { class RifReaderOpmParserInput { public: - static void importGridPropertiesFaults(const QString& fileName, RigCaseData* eclipseCase); + static void importGridPropertiesFaults(const QString& fileName, RigEclipseCaseData* eclipseCase); static void readFaults(const QString& fileName, cvf::Collection* faults); @@ -75,14 +75,14 @@ public: std::set keywords() const; - bool copyPropertyToCaseData(const std::string& keywordName, RigCaseData* eclipseCase, const QString& resultName); + bool copyPropertyToCaseData(const std::string& keywordName, RigEclipseCaseData* eclipseCase, const QString& resultName); - static size_t findOrCreateResult(const QString& newResultName, RigCaseData* reservoir); + static size_t findOrCreateResult(const QString& newResultName, RigEclipseCaseData* reservoir); private: - static void readAllProperties(std::shared_ptr< Opm::Deck > deck, RigCaseData* caseData, std::map* newResults); + static void readAllProperties(std::shared_ptr< Opm::Deck > deck, RigEclipseCaseData* caseData, std::map* newResults); static void getAllValuesForKeyword(std::shared_ptr< Opm::Deck > deck, const std::string& keyword, std::vector& allValues); - static bool isDataItemCountIdenticalToMainGridCellCount(std::shared_ptr< Opm::Deck > deck, const std::string& keyword, RigCaseData* caseData); + static bool isDataItemCountIdenticalToMainGridCellCount(std::shared_ptr< Opm::Deck > deck, const std::string& keyword, RigEclipseCaseData* caseData); bool open(const QString& fileName); private: diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp index 33560880b9..7d3c8cc9bf 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp @@ -94,7 +94,7 @@ void RivIntersectionBoxPartMgr::updateCellResultColor(size_t timeStepIndex) CVF_ASSERT(cellResultColors); RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(cellResultColors->porosityModel()); - RigCaseData* eclipseCase = eclipseView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = eclipseView->eclipseCase()->reservoirData(); // CrossSections if (m_intersectionBoxFaces.notNull()) diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp index 9ec2fd79bc..fd39efd9c8 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp @@ -99,7 +99,7 @@ void RivIntersectionPartMgr::updateCellResultColor(size_t timeStepIndex) CVF_ASSERT(cellResultColors); RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(cellResultColors->porosityModel()); - RigCaseData* eclipseCase = eclipseView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = eclipseView->eclipseCase()->reservoirData(); // CrossSections if (m_crossSectionFaces.notNull()) diff --git a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp index 7ef9d0aa1b..5b3306d5d9 100644 --- a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp +++ b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp @@ -21,7 +21,7 @@ #include "RivCellEdgeGeometryUtils.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigCellEdgeResultAccessor.h" #include "RigGridBase.h" #include "RigResultAccessor.h" @@ -55,7 +55,7 @@ void RivCellEdgeGeometryUtils::addCellEdgeResultsToDrawableGeo( bool useDefaultValueForHugeVals, float opacityLevel) { - RigCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); CVF_ASSERT(eclipseCase != NULL); // Create result access objects @@ -199,7 +199,7 @@ void RivCellEdgeGeometryUtils::addTernaryCellEdgeResultsToDrawableGeo(size_t tim const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper, cvf::DrawableGeo* geo, size_t gridIndex, float opacityLevel) { - RigCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); CVF_ASSERT(eclipseCase != NULL); cvf::ref cellEdgeResultAccessor = createCellEdgeResultAccessor(cellResultColors, cellEdgeResultColors, timeStepIndex, eclipseCase, eclipseCase->grid(gridIndex)); @@ -294,7 +294,7 @@ cvf::ref RivCellEdgeGeometryUtils::createCellEdgeResultAccess RimEclipseCellColors* cellResultColors, RimCellEdgeColors* cellEdgeResultColors, size_t timeStepIndex, - RigCaseData* eclipseCase, + RigEclipseCaseData* eclipseCase, const RigGridBase* grid) { cvf::ref cellEdgeResultAccessor = new RigCellEdgeResultAccessor(); @@ -326,7 +326,7 @@ cvf::ref RivCellEdgeGeometryUtils::createCellEdgeResultAccess //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RivCellEdgeGeometryUtils::createCellCenterResultAccessor(RimEclipseCellColors* cellResultColors, size_t timeStepIndex, RigCaseData* eclipseCase, const RigGridBase* grid) +cvf::ref RivCellEdgeGeometryUtils::createCellCenterResultAccessor(RimEclipseCellColors* cellResultColors, size_t timeStepIndex, RigEclipseCaseData* eclipseCase, const RigGridBase* grid) { cvf::ref resultAccessor = NULL; diff --git a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h index 6dbdc7f7f7..4a8a313736 100644 --- a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h +++ b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h @@ -32,7 +32,7 @@ class RimCellEdgeColors; class RimEclipseCellColors; class RigGridBase; class RigResultAccessor; -class RigCaseData; +class RigEclipseCaseData; class RivCellEdgeGeometryUtils @@ -60,14 +60,14 @@ private: static cvf::ref createCellCenterResultAccessor( RimEclipseCellColors* cellResultColors, size_t timeStepIndex, - RigCaseData* eclipseCase, + RigEclipseCaseData* eclipseCase, const RigGridBase* grid); static cvf::ref createCellEdgeResultAccessor( RimEclipseCellColors* cellResultColors, RimCellEdgeColors* cellEdgeResultColors, size_t timeStepIndex, - RigCaseData* eclipseCase, + RigEclipseCaseData* eclipseCase, const RigGridBase* grid); static bool hideScalarValue(double scalarValue, double scalarValueToHide, double tolerance); diff --git a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp index 329b569532..e6d3088633 100644 --- a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp @@ -103,7 +103,7 @@ void RivFaultPartMgr::updateCellResultColor(size_t timeStepIndex, RimEclipseCell RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(cellResultColors->porosityModel()); RimEclipseView* eclipseView = cellResultColors->reservoirView(); - RigCaseData* eclipseCase = eclipseView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = eclipseView->eclipseCase()->reservoirData(); // Faults if (m_nativeFaultFaces.notNull()) diff --git a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp index 0b2d4d620a..10a630be8c 100644 --- a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp @@ -24,7 +24,7 @@ #include "RiaPreferences.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigResultAccessorFactory.h" #include "RimCellEdgeColors.h" diff --git a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp index fbe87a2c21..4cfe9b7d80 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp @@ -20,7 +20,7 @@ #include "RivReservoirPartMgr.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RivGridPartMgr.h" #include "RivReservoirFaultsPartMgr.h" @@ -30,7 +30,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RivReservoirPartMgr::clearAndSetReservoir(const RigCaseData* eclipseCase, RimEclipseView* reservoirView) +void RivReservoirPartMgr::clearAndSetReservoir(const RigEclipseCaseData* eclipseCase, RimEclipseView* reservoirView) { m_allGrids.clear(); diff --git a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h index 005817b625..a99b5e150b 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h @@ -32,7 +32,7 @@ namespace cvf class RimEclipseCellColors; class RimCellEdgeColors; -class RigCaseData; +class RigEclipseCaseData; class RimEclipseView; class RivReservoirFaultsPartMgr; class RivGridPartMgr; @@ -47,7 +47,7 @@ class RivGridPartMgr; class RivReservoirPartMgr: public cvf::Object { public: - void clearAndSetReservoir(const RigCaseData* eclipseCase, RimEclipseView* reservoirView); + void clearAndSetReservoir(const RigEclipseCaseData* eclipseCase, RimEclipseView* reservoirView); void setTransform(cvf::Transform* scaleTransform); void setCellVisibility(size_t gridIndex, cvf::UByteArray* cellVisibilities ); diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp index 564c06cb03..0a970889a9 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp @@ -22,7 +22,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigCaseToCaseCellMapper.h" #include "RigCell.h" #include "RigGridBase.h" @@ -149,7 +149,7 @@ void RivReservoirViewPartMgr::scheduleGeometryRegen(RivCellSetEnum geometryType) //-------------------------------------------------------------------------------------------------- void RivReservoirViewPartMgr::clearGeometryCache(RivCellSetEnum geomType) { - RigCaseData* eclipseCase = NULL; + RigEclipseCaseData* eclipseCase = NULL; if (m_reservoirView != NULL && m_reservoirView->eclipseCase()) { eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); @@ -249,7 +249,7 @@ void RivReservoirViewPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicL //-------------------------------------------------------------------------------------------------- void RivReservoirViewPartMgr::createGeometry(RivCellSetEnum geometryType) { - RigCaseData* res = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* res = m_reservoirView->eclipseCase()->reservoirData(); m_geometries[geometryType].clearAndSetReservoir(res, m_reservoirView); m_geometries[geometryType].setTransform(m_scaleTransform.p()); @@ -272,7 +272,7 @@ void RivReservoirViewPartMgr::createGeometry(RivCellSetEnum geometryType) //-------------------------------------------------------------------------------------------------- void RivReservoirViewPartMgr::computeVisibility(cvf::UByteArray* cellVisibility, RivCellSetEnum geometryType, RigGridBase* grid, size_t gridIdx) { - RigCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); RigActiveCellInfo* activeCellInfo = m_reservoirView->currentActiveCellInfo(); switch (geometryType) @@ -399,7 +399,7 @@ void RivReservoirViewPartMgr::computeVisibility(cvf::UByteArray* cellVisibility, //-------------------------------------------------------------------------------------------------- void RivReservoirViewPartMgr::createPropertyFilteredNoneWellCellGeometry(size_t frameIndex) { - RigCaseData* res = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* res = m_reservoirView->eclipseCase()->reservoirData(); if ( frameIndex >= m_propFilteredGeometryFrames.size()) { @@ -476,7 +476,7 @@ void RivReservoirViewPartMgr::createPropertyFilteredNoneWellCellGeometry(size_t //-------------------------------------------------------------------------------------------------- void RivReservoirViewPartMgr::createPropertyFilteredWellGeometry(size_t frameIndex) { - RigCaseData* res = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* res = m_reservoirView->eclipseCase()->reservoirData(); if ( frameIndex >= m_propFilteredWellGeometryFrames.size()) { @@ -789,7 +789,7 @@ void RivReservoirViewPartMgr::computePropertyVisibility(cvf::UByteArray* cellVis { const RimCellFilter::FilterModeType filterType = propertyFilter->filterMode(); - RigCaseData* eclipseCase = propFilterColl->reservoirView()->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = propFilterColl->reservoirView()->eclipseCase()->reservoirData(); cvf::ref resultAccessor = RigResultAccessorFactory::createFromResultDefinition(eclipseCase, grid->gridIndex(), timeStepIndex, propertyFilter->resultDefinition); diff --git a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp index 5eb5040f17..b3942b69bc 100644 --- a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp @@ -20,7 +20,7 @@ #include "RivSimWellPipesPartMgr.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigCell.h" #include "RigMainGrid.h" #include "RigSimulationWellCenterLineCalculator.h" diff --git a/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.cpp b/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.cpp index 1c070503a4..6001c9f4d0 100644 --- a/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.cpp +++ b/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.cpp @@ -19,7 +19,7 @@ #include "RivSingleCellPartGenerator.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFemPartCollection.h" #include "RigGeoMechCaseData.h" #include "RigGridBase.h" @@ -37,7 +37,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RivSingleCellPartGenerator::RivSingleCellPartGenerator(RigCaseData* rigCaseData, size_t gridIndex, size_t cellIndex) +RivSingleCellPartGenerator::RivSingleCellPartGenerator(RigEclipseCaseData* rigCaseData, size_t gridIndex, size_t cellIndex) : m_rigCaseData(rigCaseData), m_gridIndex(gridIndex), m_cellIndex(cellIndex), diff --git a/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.h b/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.h index 93a2fa370b..665acd59ce 100644 --- a/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.h +++ b/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.h @@ -27,7 +27,7 @@ namespace cvf class Part; } -class RigCaseData; +class RigEclipseCaseData; class RimGeoMechCase; //================================================================================================== @@ -37,7 +37,7 @@ class RimGeoMechCase; class RivSingleCellPartGenerator { public: - RivSingleCellPartGenerator(RigCaseData* rigCaseData, size_t gridIndex, size_t cellIndex); + RivSingleCellPartGenerator(RigEclipseCaseData* rigCaseData, size_t gridIndex, size_t cellIndex); RivSingleCellPartGenerator(RimGeoMechCase* rimGeoMechCase, size_t gridIndex, size_t cellIndex); cvf::ref createPart(const cvf::Color3f color); @@ -46,7 +46,7 @@ private: cvf::ref createMeshDrawable(); private: - RigCaseData* m_rigCaseData; + RigEclipseCaseData* m_rigCaseData; RimGeoMechCase* m_geoMechCase; size_t m_gridIndex; size_t m_cellIndex; diff --git a/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp b/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp index d9772df78b..1974525c37 100644 --- a/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp +++ b/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp @@ -20,7 +20,7 @@ #include "RivTernaryTextureCoordsCreator.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigPipeInCellEvaluator.h" #include "RigResultAccessorFactory.h" #include "RigTernaryResultAccessor2d.h" @@ -49,7 +49,7 @@ RivTernaryTextureCoordsCreator::RivTernaryTextureCoordsCreator( CVF_ASSERT(quadMapper); m_quadMapper = quadMapper; - RigCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); size_t resTimeStepIdx = timeStepIndex; @@ -83,7 +83,7 @@ RivTernaryTextureCoordsCreator::RivTernaryTextureCoordsCreator( size_t timeStepIndex) : m_quadMapper(NULL) { - RigCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); size_t resTimeStepIdx = timeStepIndex; diff --git a/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp b/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp index e97cb2bce0..c75de10969 100644 --- a/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp +++ b/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp @@ -20,7 +20,7 @@ #include "RivTextureCoordsCreator.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigPipeInCellEvaluator.h" #include "RigResultAccessorFactory.h" @@ -40,7 +40,7 @@ //-------------------------------------------------------------------------------------------------- RivTextureCoordsCreator::RivTextureCoordsCreator(RimEclipseCellColors* cellResultColors, size_t timeStepIndex, size_t gridIndex, const cvf::StructGridQuadToCellFaceMapper* quadMapper) { - RigCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); m_quadMapper = quadMapper; CVF_ASSERT(quadMapper && eclipseCase ); diff --git a/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp index 092a50056b..2f801be906 100644 --- a/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp @@ -25,7 +25,7 @@ #include "RiaApplication.h" #include "RigActiveCellInfo.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigCell.h" #include "RigMainGrid.h" @@ -87,7 +87,7 @@ void RivWellHeadPartMgr::buildWellHeadParts(size_t frameIndex) if (m_rimReservoirView.isNull()) return; - RigCaseData* rigReservoir = m_rimReservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* rigReservoir = m_rimReservoirView->eclipseCase()->reservoirData(); RimEclipseWell* well = m_rimWell; diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index d51a1998ac..a9d6db3ed5 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -21,7 +21,7 @@ #include "Rim3dOverlayInfoConfig.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigEclipseNativeVisibleCellsStatCalc.h" #include "RigFemNativeVisibleCellsStatCalc.h" #include "RigFemPartCollection.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp index 6229ef0dcb..4f8bf2f9fb 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp @@ -25,7 +25,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RimCaseCollection.h" @@ -120,7 +120,7 @@ RimEclipseCase::~RimEclipseCase() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigCaseData* RimEclipseCase::reservoirData() +RigEclipseCaseData* RimEclipseCase::reservoirData() { return m_rigEclipseCase.p(); } @@ -128,7 +128,7 @@ RigCaseData* RimEclipseCase::reservoirData() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const RigCaseData* RimEclipseCase::reservoirData() const +const RigEclipseCaseData* RimEclipseCase::reservoirData() const { return m_rigEclipseCase.p(); } @@ -294,7 +294,7 @@ void RimEclipseCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c } else if (changedField == &flipXAxis || changedField == &flipYAxis) { - RigCaseData* rigEclipseCase = reservoirData(); + RigEclipseCaseData* rigEclipseCase = reservoirData(); if (rigEclipseCase) { rigEclipseCase->mainGrid()->setFlipAxis(flipXAxis, flipYAxis); @@ -323,7 +323,7 @@ void RimEclipseCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c //-------------------------------------------------------------------------------------------------- void RimEclipseCase::updateFormationNamesData() { - RigCaseData* rigEclipseCase = reservoirData(); + RigEclipseCaseData* rigEclipseCase = reservoirData(); if(rigEclipseCase) { if(activeFormationNames()) @@ -381,7 +381,7 @@ void RimEclipseCase::updateFormationNamesData() //-------------------------------------------------------------------------------------------------- void RimEclipseCase::computeCachedData() { - RigCaseData* rigEclipseCase = reservoirData(); + RigEclipseCaseData* rigEclipseCase = reservoirData(); if (rigEclipseCase) { caf::ProgressInfo pInf(30, ""); @@ -425,7 +425,7 @@ RimCaseCollection* RimEclipseCase::parentCaseCollection() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimEclipseCase::setReservoirData(RigCaseData* eclipseCase) +void RimEclipseCase::setReservoirData(RigEclipseCaseData* eclipseCase) { m_rigEclipseCase = eclipseCase; if (this->reservoirData()) diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.h b/ApplicationCode/ProjectDataModel/RimEclipseCase.h index 67c100bbb9..d9305e3b92 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.h @@ -36,7 +36,7 @@ class QString; -class RigCaseData; +class RigEclipseCaseData; class RigGridBase; class RimCaseCollection; class RimIdenticalGridCaseGroup; @@ -68,8 +68,8 @@ public: bool openReserviorCase(); virtual bool openEclipseGridFile() = 0; - RigCaseData* reservoirData(); - const RigCaseData* reservoirData() const; + RigEclipseCaseData* reservoirData(); + const RigEclipseCaseData* reservoirData() const; RimReservoirCellResultsStorage* results(RifReaderInterface::PorosityModelResultType porosityModel); @@ -104,10 +104,10 @@ protected: // Internal methods protected: void computeCachedData(); - void setReservoirData(RigCaseData* eclipseCase); + void setReservoirData(RigEclipseCaseData* eclipseCase); private: - cvf::ref m_rigEclipseCase; + cvf::ref m_rigEclipseCase; private: caf::PdmChildField m_matrixModelResults; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp index db52994995..f080f2e62c 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp @@ -22,7 +22,7 @@ #include "RiaApplication.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigGridManager.h" #include "RigMainGrid.h" @@ -76,7 +76,7 @@ RimIdenticalGridCaseGroup* RimEclipseCaseCollection::createIdenticalCaseGroupFro { CVF_ASSERT(mainCase); - RigCaseData* rigEclipseCase = mainCase->reservoirData(); + RigEclipseCaseData* rigEclipseCase = mainCase->reservoirData(); RigMainGrid* equalGrid = registerCaseInGridCollection(rigEclipseCase); CVF_ASSERT(equalGrid); @@ -101,7 +101,7 @@ void RimEclipseCaseCollection::moveEclipseCaseIntoCaseGroup(RimEclipseCase* rimR { CVF_ASSERT(rimReservoir); - RigCaseData* rigEclipseCase = rimReservoir->reservoirData(); + RigEclipseCaseData* rigEclipseCase = rimReservoir->reservoirData(); RigMainGrid* equalGrid = registerCaseInGridCollection(rigEclipseCase); CVF_ASSERT(equalGrid); @@ -155,7 +155,7 @@ void RimEclipseCaseCollection::removeCaseFromAllGroups(RimEclipseCase* reservoir //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigMainGrid* RimEclipseCaseCollection::registerCaseInGridCollection(RigCaseData* rigEclipseCase) +RigMainGrid* RimEclipseCaseCollection::registerCaseInGridCollection(RigEclipseCaseData* rigEclipseCase) { CVF_ASSERT(rigEclipseCase); @@ -188,7 +188,7 @@ void RimEclipseCaseCollection::insertCaseInCaseGroup(RimIdenticalGridCaseGroup* { CVF_ASSERT(rimReservoir); - RigCaseData* rigEclipseCase = rimReservoir->reservoirData(); + RigEclipseCaseData* rigEclipseCase = rimReservoir->reservoirData(); registerCaseInGridCollection(rigEclipseCase); caseGroup->addCase(rimReservoir); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.h b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.h index 7ec132f3ae..ce843ceabb 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.h @@ -27,7 +27,7 @@ #include "cvfObject.h" -class RigCaseData; +class RigEclipseCaseData; class RigGridManager; class RigMainGrid; class RimEclipseCase; @@ -59,6 +59,6 @@ public: void recomputeStatisticsForAllCaseGroups(); private: - RigMainGrid* registerCaseInGridCollection(RigCaseData* rigEclipseCase); + RigMainGrid* registerCaseInGridCollection(RigEclipseCaseData* rigEclipseCase); cvf::ref m_gridCollection; }; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp index 142472a6b3..daf8892417 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp @@ -30,7 +30,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RimDefines.h" @@ -96,7 +96,7 @@ void RimEclipseInputCase::openDataFileSet(const QStringList& fileNames) if (this->reservoirData() == NULL) { - this->setReservoirData(new RigCaseData); + this->setReservoirData(new RigEclipseCaseData); } // First find and read the grid data @@ -193,7 +193,7 @@ bool RimEclipseInputCase::openEclipseGridFile() readerInterface = new RifReaderEclipseInput; readerInterface->setReaderSetting(prefs->readerSettings()); - cvf::ref eclipseCase = new RigCaseData; + cvf::ref eclipseCase = new RigEclipseCaseData; if (!readerInterface->open(m_gridFileName, eclipseCase.p())) { return false; @@ -335,7 +335,7 @@ void RimEclipseInputCase::loadAndSyncronizeInputProperties() //-------------------------------------------------------------------------------------------------- cvf::ref RimEclipseInputCase::createMockModel(QString modelName) { - cvf::ref reservoir = new RigCaseData; + cvf::ref reservoir = new RigEclipseCaseData; cvf::ref mockFileInterface = new RifReaderMockModel; if (modelName == RimDefines::mockModelBasicInputCase()) diff --git a/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp b/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp index f5a5ec8b86..e23b805ef9 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp @@ -25,7 +25,7 @@ #include "RifReaderSettings.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RimEclipseCase.h" @@ -162,7 +162,7 @@ void RimEclipseInputCaseOpm::importEclipseGridAndProperties(const QString& fileN { if (this->reservoirData() == NULL) { - this->setReservoirData(new RigCaseData); + this->setReservoirData(new RigEclipseCaseData); RifReaderOpmParserInput::importGridPropertiesFaults(fileName, reservoirData()); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseInputProperty.cpp b/ApplicationCode/ProjectDataModel/RimEclipseInputProperty.cpp index bf4c9918d3..1b973d5ff7 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseInputProperty.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseInputProperty.cpp @@ -21,7 +21,7 @@ #include "RimEclipseInputProperty.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RimEclipseInputCase.h" #include "RimEclipseResultDefinition.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp index 9c47f1c756..9f314294f2 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp @@ -21,7 +21,7 @@ #include "RimEclipsePropertyFilter.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFormationNames.h" #include "RimEclipseCase.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp index e463cc7209..8b8942e219 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp @@ -28,7 +28,7 @@ #include "RifReaderSettings.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RimMockModelSettings.h" @@ -110,7 +110,7 @@ bool RimEclipseResultCase::openEclipseGridFile() readerInterface->setReaderSetting(prefs->readerSettings()); readerInterface->setFilenamesWithFaults(this->filesContainingFaults()); - cvf::ref eclipseCase = new RigCaseData; + cvf::ref eclipseCase = new RigEclipseCaseData; if (!readerInterface->open(caseFileName(), eclipseCase.p())) { return false; @@ -141,7 +141,7 @@ bool RimEclipseResultCase::openEclipseGridFile() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimEclipseResultCase::openAndReadActiveCellData(RigCaseData* mainEclipseCase) +bool RimEclipseResultCase::openAndReadActiveCellData(RigEclipseCaseData* mainEclipseCase) { // Early exit if data is already read if (m_activeCellInfoIsReadFromFile) return true; @@ -158,7 +158,7 @@ bool RimEclipseResultCase::openAndReadActiveCellData(RigCaseData* mainEclipseCas return false; } - cvf::ref eclipseCase = new RigCaseData; + cvf::ref eclipseCase = new RigEclipseCaseData; CVF_ASSERT(mainEclipseCase && mainEclipseCase->mainGrid()); eclipseCase->setMainGrid(mainEclipseCase->mainGrid()); @@ -204,7 +204,7 @@ bool RimEclipseResultCase::openAndReadActiveCellData(RigCaseData* mainEclipseCas cvf::ref RimEclipseResultCase::createMockModel(QString modelName) { cvf::ref mockFileInterface = new RifReaderMockModel; - cvf::ref reservoir = new RigCaseData; + cvf::ref reservoir = new RigEclipseCaseData; if (modelName == RimDefines::mockModelBasic()) { diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.h b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.h index 4543cec58e..cf9f7caddb 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.h @@ -44,7 +44,7 @@ public: void setCaseInfo(const QString& userDescription, const QString& caseFileName); virtual bool openEclipseGridFile(); - bool openAndReadActiveCellData(RigCaseData* mainEclipseCase); + bool openAndReadActiveCellData(RigEclipseCaseData* mainEclipseCase); void readGridDimensions(std::vector< std::vector >& gridDimensions); // Overrides from RimCase diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 227122f604..d4aba7afd7 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -22,7 +22,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RimCellEdgeColors.h" #include "RimEclipseCase.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp index 3822fb9356..fca61379c8 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp @@ -23,7 +23,7 @@ #include "RicNewViewFeature.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigSingleWellResultsData.h" #include "RimCaseCollection.h" @@ -143,7 +143,7 @@ bool RimEclipseStatisticsCase::openEclipseGridFile() { if (this->reservoirData()) return true; - cvf::ref eclipseCase = new RigCaseData; + cvf::ref eclipseCase = new RigEclipseCaseData; CVF_ASSERT(parentStatisticsCaseCollection()); @@ -228,7 +228,7 @@ void RimEclipseStatisticsCase::computeStatistics() timeStepIndices.push_back(i); } - RigCaseData* resultCase = reservoirData(); + RigEclipseCaseData* resultCase = reservoirData(); QList resultSpecification; @@ -395,7 +395,7 @@ QList RimEclipseStatisticsCase::calculateValueOptions(co return options; } - RigCaseData* caseData = idgcg->mainCase()->reservoirData(); + RigEclipseCaseData* caseData = idgcg->mainCase()->reservoirData(); if (&m_selectedDynamicProperties == fieldNeedingOptions) { @@ -716,7 +716,7 @@ void RimEclipseStatisticsCase::populateResultSelection() return; } - RigCaseData* caseData = idgcg->mainCase()->reservoirData(); + RigEclipseCaseData* caseData = idgcg->mainCase()->reservoirData(); if (m_selectedDynamicProperties().size() == 0) { diff --git a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp index 722a0cfe77..2e2410e306 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp @@ -21,7 +21,7 @@ #include "RimEclipseStatisticsCaseEvaluator.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RigResultAccessorFactory.h" #include "RigResultModifier.h" @@ -317,7 +317,7 @@ void RimEclipseStatisticsCaseEvaluator::evaluateForResults(const QList& //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimEclipseStatisticsCaseEvaluator::RimEclipseStatisticsCaseEvaluator(const std::vector& sourceCases, const std::vector& timeStepIndices, const RimStatisticsConfig& statisticsConfig, RigCaseData* destinationCase, RimIdenticalGridCaseGroup* identicalGridCaseGroup) +RimEclipseStatisticsCaseEvaluator::RimEclipseStatisticsCaseEvaluator(const std::vector& sourceCases, const std::vector& timeStepIndices, const RimStatisticsConfig& statisticsConfig, RigEclipseCaseData* destinationCase, RimIdenticalGridCaseGroup* identicalGridCaseGroup) : m_sourceCases(sourceCases), m_statisticsConfig(statisticsConfig), m_destinationCase(destinationCase), diff --git a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.h b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.h index 3b24b093b6..73ef9aaa23 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.h @@ -28,7 +28,7 @@ class RimEclipseCase; -class RigCaseData; +class RigEclipseCaseData; class RigCaseCellResultsData; @@ -59,7 +59,7 @@ public: RimEclipseStatisticsCaseEvaluator(const std::vector& sourceCases, const std::vector& timeStepIndices, const RimStatisticsConfig& statisticsConfig, - RigCaseData* destinationCase, + RigEclipseCaseData* destinationCase, RimIdenticalGridCaseGroup* identicalGridCaseGroup); struct ResSpec @@ -90,7 +90,7 @@ private: size_t m_reservoirCellCount; RimStatisticsConfig m_statisticsConfig; - RigCaseData* m_destinationCase; + RigEclipseCaseData* m_destinationCase; RimIdenticalGridCaseGroup* m_identicalGridCaseGroup; bool m_useZeroAsInactiveCellValue; }; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index 31a2cfbad2..f19403c9b4 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -25,7 +25,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFlowDiagResults.h" #include "RigFormationNames.h" #include "RigMainGrid.h" @@ -944,7 +944,7 @@ void RimEclipseView::updateLegends() return; } - RigCaseData* eclipseCase = m_reservoir->reservoirData(); + RigEclipseCaseData* eclipseCase = m_reservoir->reservoirData(); CVF_ASSERT(eclipseCase); RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(cellResult()->porosityModel()); diff --git a/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp b/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp index 1f4be83932..c74a261d92 100644 --- a/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp +++ b/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp @@ -22,7 +22,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFlowDiagResults.h" #include "RigMainGrid.h" #include "RigSingleWellResultsData.h" diff --git a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp index 25137f34ac..19dfffb8f4 100644 --- a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp +++ b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp @@ -23,7 +23,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigGridManager.h" #include "RigMainGrid.h" @@ -181,7 +181,7 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo() return; } - RigCaseData* rigCaseData = mainCase->reservoirData(); + RigEclipseCaseData* rigCaseData = mainCase->reservoirData(); CVF_ASSERT(rigCaseData); RifReaderInterface::PorosityModelResultType poroModel = RifReaderInterface::MATRIX_RESULTS; diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index 2ead2498ef..c483b04ca9 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -23,7 +23,7 @@ #include "RiaApplication.h" #include "RiaVersionInfo.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigGridBase.h" #include "RimCalcScript.h" diff --git a/ApplicationCode/ProjectDataModel/RimProject.h b/ApplicationCode/ProjectDataModel/RimProject.h index fefadad18f..63d8c151a5 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.h +++ b/ApplicationCode/ProjectDataModel/RimProject.h @@ -26,7 +26,7 @@ #include -class RigCaseData; +class RigEclipseCaseData; class RigGridManager; class RigMainGrid; diff --git a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp index fc8db4dc07..0e479a3087 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp +++ b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp @@ -21,7 +21,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigCell.h" #include "RigMainGrid.h" @@ -1518,17 +1518,17 @@ double RimReservoirCellResultsStorage::darchysValue() if (rimCase && rimCase->reservoirData()) { - RigCaseData::UnitsType unitsType = rimCase->reservoirData()->unitsType(); + RigEclipseCaseData::UnitsType unitsType = rimCase->reservoirData()->unitsType(); - if (unitsType == RigCaseData::UNITS_FIELD) + if (unitsType == RigEclipseCaseData::UNITS_FIELD) { darchy = 0.001127; } - else if (unitsType == RigCaseData::UNITS_METRIC) + else if (unitsType == RigEclipseCaseData::UNITS_METRIC) { darchy = 0.008527; } - else if (unitsType == RigCaseData::UNITS_LAB) + else if (unitsType == RigEclipseCaseData::UNITS_LAB) { darchy = 3.6; } diff --git a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp index 7c05d222ed..2d950c2054 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp @@ -22,7 +22,7 @@ #include "RiaApplication.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigEclipseWellLogExtractor.h" #include "RigFemPartResultsCollection.h" #include "RigGeoMechCaseData.h" @@ -260,8 +260,8 @@ void RimWellLogExtractionCurve::onLoadDataAndUpdate() eclExtractor->curveData(resAcc.p(), &values); } - RigCaseData::UnitsType eclipseUnitsType = eclipseCase->reservoirData()->unitsType(); - if (eclipseUnitsType == RigCaseData::UNITS_FIELD) + RigEclipseCaseData::UnitsType eclipseUnitsType = eclipseCase->reservoirData()->unitsType(); + if (eclipseUnitsType == RigEclipseCaseData::UNITS_FIELD) { // See https://github.com/OPM/ResInsight/issues/538 diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp index fed2b8043d..3c59d00ffd 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp @@ -62,7 +62,7 @@ RigEclipseWellLogExtractor* RimWellLogPlotCollection::findOrCreateExtractor(RimW return NULL; } - RigCaseData* eclCaseData = eclCase->reservoirData(); + RigEclipseCaseData* eclCaseData = eclCase->reservoirData(); RigWellPath* wellPathGeom = wellPath->wellPathGeometry(); for (size_t exIdx = 0; exIdx < m_extractors.size(); ++exIdx) { @@ -131,7 +131,7 @@ void RimWellLogPlotCollection::removeExtractors(const RigWellPath* wellPath) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellLogPlotCollection::removeExtractors(const RigCaseData* caseData) +void RimWellLogPlotCollection::removeExtractors(const RigEclipseCaseData* caseData) { for (int eIdx = (int) m_extractors.size() - 1; eIdx >= 0; eIdx--) { diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h index dbd475c392..dba85804d5 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h +++ b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h @@ -28,7 +28,7 @@ class RimWellLogPlot; class RigEclipseWellLogExtractor; class RigGeoMechWellLogExtractor; class RimGeoMechCase; -class RigCaseData; +class RigEclipseCaseData; class RigGeoMechCaseData; class RigWellPath; class RimWellPath; @@ -50,7 +50,7 @@ public: RigGeoMechWellLogExtractor* findOrCreateExtractor(RimWellPath* wellPath, RimGeoMechCase* eclCase); void removeExtractors(const RigWellPath* wellPath); - void removeExtractors(const RigCaseData* caseData); + void removeExtractors(const RigEclipseCaseData* caseData); void removeExtractors(const RigGeoMechCaseData* caseData); caf::PdmChildArrayField wellLogPlots; diff --git a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake index 598b7806e8..2314978edd 100644 --- a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake @@ -7,7 +7,7 @@ endif() set (SOURCE_GROUP_HEADER_FILES ${CEE_CURRENT_LIST_DIR}RigActiveCellInfo.h ${CEE_CURRENT_LIST_DIR}RigCell.h -${CEE_CURRENT_LIST_DIR}RigCaseData.h +${CEE_CURRENT_LIST_DIR}RigEclipseCaseData.h ${CEE_CURRENT_LIST_DIR}RigGridBase.h ${CEE_CURRENT_LIST_DIR}RigGridManager.h ${CEE_CURRENT_LIST_DIR}RigResultAccessor.h @@ -54,7 +54,7 @@ ${CEE_CURRENT_LIST_DIR}RigLasFileExporter.h set (SOURCE_GROUP_SOURCE_FILES ${CEE_CURRENT_LIST_DIR}RigActiveCellInfo.cpp ${CEE_CURRENT_LIST_DIR}RigCell.cpp -${CEE_CURRENT_LIST_DIR}RigCaseData.cpp +${CEE_CURRENT_LIST_DIR}RigEclipseCaseData.cpp ${CEE_CURRENT_LIST_DIR}RigGridBase.cpp ${CEE_CURRENT_LIST_DIR}RigGridManager.cpp ${CEE_CURRENT_LIST_DIR}RigResultAccessor.cpp diff --git a/ApplicationCode/ReservoirDataModel/RigCaseData.cpp b/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.cpp similarity index 90% rename from ApplicationCode/ReservoirDataModel/RigCaseData.cpp rename to ApplicationCode/ReservoirDataModel/RigEclipseCaseData.cpp index 751c7a91ba..5d56bd8881 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.cpp @@ -18,7 +18,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" @@ -32,7 +32,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigCaseData::RigCaseData() +RigEclipseCaseData::RigEclipseCaseData() { m_mainGrid = new RigMainGrid(); @@ -51,7 +51,7 @@ RigCaseData::RigCaseData() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigCaseData::~RigCaseData() +RigEclipseCaseData::~RigEclipseCaseData() { } @@ -59,7 +59,7 @@ RigCaseData::~RigCaseData() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigMainGrid* RigCaseData::mainGrid() +RigMainGrid* RigEclipseCaseData::mainGrid() { return m_mainGrid.p(); } @@ -67,7 +67,7 @@ RigMainGrid* RigCaseData::mainGrid() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const RigMainGrid* RigCaseData::mainGrid() const +const RigMainGrid* RigEclipseCaseData::mainGrid() const { return m_mainGrid.p(); } @@ -75,7 +75,7 @@ const RigMainGrid* RigCaseData::mainGrid() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::setMainGrid(RigMainGrid* mainGrid) +void RigEclipseCaseData::setMainGrid(RigMainGrid* mainGrid) { m_mainGrid = mainGrid; @@ -86,7 +86,7 @@ void RigCaseData::setMainGrid(RigMainGrid* mainGrid) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::allGrids(std::vector* grids) +void RigEclipseCaseData::allGrids(std::vector* grids) { CVF_ASSERT(grids); @@ -105,7 +105,7 @@ void RigCaseData::allGrids(std::vector* grids) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::allGrids(std::vector* grids) const +void RigEclipseCaseData::allGrids(std::vector* grids) const { CVF_ASSERT(grids); @@ -124,7 +124,7 @@ void RigCaseData::allGrids(std::vector* grids) const //-------------------------------------------------------------------------------------------------- /// Get grid by index. The main grid has index 0, so the first lgr has index 1 //-------------------------------------------------------------------------------------------------- -const RigGridBase* RigCaseData::grid(size_t index) const +const RigGridBase* RigEclipseCaseData::grid(size_t index) const { CVF_ASSERT(m_mainGrid.notNull()); return m_mainGrid->gridByIndex(index); @@ -134,7 +134,7 @@ const RigGridBase* RigCaseData::grid(size_t index) const //-------------------------------------------------------------------------------------------------- /// Get grid by index. The main grid has index 0, so the first lgr has index 1 //-------------------------------------------------------------------------------------------------- -RigGridBase* RigCaseData::grid(size_t index) +RigGridBase* RigEclipseCaseData::grid(size_t index) { CVF_ASSERT(m_mainGrid.notNull()); return m_mainGrid->gridByIndex(index); @@ -143,7 +143,7 @@ RigGridBase* RigCaseData::grid(size_t index) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -size_t RigCaseData::gridCount() const +size_t RigEclipseCaseData::gridCount() const { CVF_ASSERT(m_mainGrid.notNull()); return m_mainGrid->gridCount(); @@ -153,7 +153,7 @@ size_t RigCaseData::gridCount() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::computeWellCellsPrGrid() +void RigEclipseCaseData::computeWellCellsPrGrid() { // If we have computed this already, return if (m_wellCellsInGrid.size()) return; @@ -253,7 +253,7 @@ void RigCaseData::computeWellCellsPrGrid() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::setWellResults(const cvf::Collection& data) +void RigEclipseCaseData::setWellResults(const cvf::Collection& data) { m_wellResults = data; m_wellCellsInGrid.clear(); @@ -265,7 +265,7 @@ void RigCaseData::setWellResults(const cvf::Collection //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const cvf::UByteArray* RigCaseData::wellCellsInGrid(size_t gridIndex) +const cvf::UByteArray* RigEclipseCaseData::wellCellsInGrid(size_t gridIndex) { computeWellCellsPrGrid(); CVF_ASSERT(gridIndex < m_wellCellsInGrid.size()); @@ -277,7 +277,7 @@ const cvf::UByteArray* RigCaseData::wellCellsInGrid(size_t gridIndex) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const cvf::UIntArray* RigCaseData::gridCellToResultWellIndex(size_t gridIndex) +const cvf::UIntArray* RigEclipseCaseData::gridCellToResultWellIndex(size_t gridIndex) { computeWellCellsPrGrid(); CVF_ASSERT(gridIndex < m_gridCellToResultWellIndex.size()); @@ -288,7 +288,7 @@ const cvf::UIntArray* RigCaseData::gridCellToResultWellIndex(size_t gridIndex) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigCell& RigCaseData::cellFromWellResultCell(const RigWellResultPoint& wellResultCell) +RigCell& RigEclipseCaseData::cellFromWellResultCell(const RigWellResultPoint& wellResultCell) { CVF_ASSERT(wellResultCell.isCell()); @@ -304,7 +304,7 @@ RigCell& RigCaseData::cellFromWellResultCell(const RigWellResultPoint& wellResul //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RigCaseData::findSharedSourceFace(cvf::StructGridInterface::FaceType& sharedSourceFace,const RigWellResultPoint& sourceWellCellResult, const RigWellResultPoint& otherWellCellResult) const +bool RigEclipseCaseData::findSharedSourceFace(cvf::StructGridInterface::FaceType& sharedSourceFace,const RigWellResultPoint& sourceWellCellResult, const RigWellResultPoint& otherWellCellResult) const { size_t gridIndex = sourceWellCellResult.m_gridIndex; size_t gridCellIndex = sourceWellCellResult.m_gridCellIndex; @@ -380,7 +380,7 @@ public: //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::computeActiveCellIJKBBox() +void RigEclipseCaseData::computeActiveCellIJKBBox() { if (m_mainGrid.notNull() && m_activeCellInfo.notNull() && m_fractureActiveCellInfo.notNull()) { @@ -411,7 +411,7 @@ void RigCaseData::computeActiveCellIJKBBox() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::computeActiveCellBoundingBoxes() +void RigEclipseCaseData::computeActiveCellBoundingBoxes() { computeActiveCellIJKBBox(); computeActiveCellsGeometryBoundingBox(); @@ -420,7 +420,7 @@ void RigCaseData::computeActiveCellBoundingBoxes() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigActiveCellInfo* RigCaseData::activeCellInfo(RifReaderInterface::PorosityModelResultType porosityModel) +RigActiveCellInfo* RigEclipseCaseData::activeCellInfo(RifReaderInterface::PorosityModelResultType porosityModel) { if (porosityModel == RifReaderInterface::MATRIX_RESULTS) { @@ -433,7 +433,7 @@ RigActiveCellInfo* RigCaseData::activeCellInfo(RifReaderInterface::PorosityModel //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const RigActiveCellInfo* RigCaseData::activeCellInfo(RifReaderInterface::PorosityModelResultType porosityModel) const +const RigActiveCellInfo* RigEclipseCaseData::activeCellInfo(RifReaderInterface::PorosityModelResultType porosityModel) const { if (porosityModel == RifReaderInterface::MATRIX_RESULTS) { @@ -446,7 +446,7 @@ const RigActiveCellInfo* RigCaseData::activeCellInfo(RifReaderInterface::Porosit //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::setActiveCellInfo(RifReaderInterface::PorosityModelResultType porosityModel, RigActiveCellInfo* activeCellInfo) +void RigEclipseCaseData::setActiveCellInfo(RifReaderInterface::PorosityModelResultType porosityModel, RigActiveCellInfo* activeCellInfo) { if (porosityModel == RifReaderInterface::MATRIX_RESULTS) { @@ -464,7 +464,7 @@ void RigCaseData::setActiveCellInfo(RifReaderInterface::PorosityModelResultType //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::computeActiveCellsGeometryBoundingBox() +void RigEclipseCaseData::computeActiveCellsGeometryBoundingBox() { if (m_activeCellInfo.isNull() || m_fractureActiveCellInfo.isNull()) { @@ -518,7 +518,7 @@ void RigCaseData::computeActiveCellsGeometryBoundingBox() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::setActiveFormationNames(RigFormationNames* activeFormationNames) +void RigEclipseCaseData::setActiveFormationNames(RigFormationNames* activeFormationNames) { m_activeFormationNamesData = activeFormationNames; @@ -582,7 +582,7 @@ void RigCaseData::setActiveFormationNames(RigFormationNames* activeFormationName //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigFormationNames* RigCaseData::activeFormationNames() +RigFormationNames* RigEclipseCaseData::activeFormationNames() { return m_activeFormationNamesData.p(); } @@ -590,7 +590,7 @@ RigFormationNames* RigCaseData::activeFormationNames() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigCaseCellResultsData* RigCaseData::results(RifReaderInterface::PorosityModelResultType porosityModel) +RigCaseCellResultsData* RigEclipseCaseData::results(RifReaderInterface::PorosityModelResultType porosityModel) { if (porosityModel == RifReaderInterface::MATRIX_RESULTS) { @@ -603,7 +603,7 @@ RigCaseCellResultsData* RigCaseData::results(RifReaderInterface::PorosityModelRe //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const RigCaseCellResultsData* RigCaseData::results(RifReaderInterface::PorosityModelResultType porosityModel) const +const RigCaseCellResultsData* RigEclipseCaseData::results(RifReaderInterface::PorosityModelResultType porosityModel) const { if (porosityModel == RifReaderInterface::MATRIX_RESULTS) { diff --git a/ApplicationCode/ReservoirDataModel/RigCaseData.h b/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h similarity index 98% rename from ApplicationCode/ReservoirDataModel/RigCaseData.h rename to ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h index f6503d132b..5e135b0d8a 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseData.h +++ b/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h @@ -44,7 +44,7 @@ struct RigWellResultPoint; //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -class RigCaseData : public cvf::Object +class RigEclipseCaseData : public cvf::Object { public: enum UnitsType @@ -55,8 +55,8 @@ public: }; public: - RigCaseData(); - ~RigCaseData(); + RigEclipseCaseData(); + ~RigEclipseCaseData(); RigMainGrid* mainGrid(); const RigMainGrid* mainGrid() const; diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp index b994d24d80..d3840eec23 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp +++ b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp @@ -19,7 +19,7 @@ #include "RigEclipseWellLogExtractor.h" #include -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigWellPath.h" #include "RigResultAccessor.h" #include "cvfBoundingBox.h" @@ -32,7 +32,7 @@ /// //================================================================================================== -RigEclipseWellLogExtractor::RigEclipseWellLogExtractor(const RigCaseData* aCase, const RigWellPath* wellpath, const std::string& wellCaseErrorMsgName) +RigEclipseWellLogExtractor::RigEclipseWellLogExtractor(const RigEclipseCaseData* aCase, const RigWellPath* wellpath, const std::string& wellCaseErrorMsgName) : m_caseData(aCase), RigWellLogExtractor(wellpath, wellCaseErrorMsgName) { calculateIntersection(); diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h index d92a362377..abb0c3b03b 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h +++ b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h @@ -29,7 +29,7 @@ #include #include "cvfStructGrid.h" -class RigCaseData; +class RigEclipseCaseData; class RigWellPath; class RigResultAccessor; @@ -43,14 +43,14 @@ namespace cvf { class RigEclipseWellLogExtractor : public RigWellLogExtractor { public: - RigEclipseWellLogExtractor(const RigCaseData* aCase, const RigWellPath* wellpath, const std::string& wellCaseErrorMsgName); + RigEclipseWellLogExtractor(const RigEclipseCaseData* aCase, const RigWellPath* wellpath, const std::string& wellCaseErrorMsgName); void curveData(const RigResultAccessor* resultAccessor, std::vector* values ); - const RigCaseData* caseData() { return m_caseData.p();} + const RigEclipseCaseData* caseData() { return m_caseData.p();} protected: void calculateIntersection(); std::vector findCloseCells(const cvf::BoundingBox& bb); - cvf::cref m_caseData; + cvf::cref m_caseData; }; diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp index a1e9312c56..c6751d67a2 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp @@ -19,7 +19,7 @@ #include "RigFlowDiagResults.h" #include "RigActiveCellInfo.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFlowDiagSolverInterface.h" #include "RigFlowDiagStatCalc.h" diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp index 81063c2a56..d163e95eed 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp @@ -23,7 +23,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFlowDiagInterfaceTools.h" #include "RimEclipseCase.h" diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h index e1d5bdac32..d602a45602 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h @@ -49,7 +49,7 @@ private: }; -class RigCaseData; +class RigEclipseCaseData; class RigOpmFldStaticData; class RigFlowDiagSolverInterface : public cvf::Object diff --git a/ApplicationCode/ReservoirDataModel/RigGridManager.cpp b/ApplicationCode/ReservoirDataModel/RigGridManager.cpp index d02816ce5d..e52d0525e6 100644 --- a/ApplicationCode/ReservoirDataModel/RigGridManager.cpp +++ b/ApplicationCode/ReservoirDataModel/RigGridManager.cpp @@ -17,14 +17,14 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RigGridManager.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigGridManager::addCase(RigCaseData* eclipseCase) +void RigGridManager::addCase(RigEclipseCaseData* eclipseCase) { cvf::ref caseAndGrid = new CaseToGridMap(eclipseCase, eclipseCase->mainGrid()); m_caseToGrid.push_back(caseAndGrid.p()); @@ -33,7 +33,7 @@ void RigGridManager::addCase(RigCaseData* eclipseCase) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigGridManager::removeCase(RigCaseData* eclipseCase) +void RigGridManager::removeCase(RigEclipseCaseData* eclipseCase) { for (size_t i = 0; i < m_caseToGrid.size(); i++) { @@ -121,7 +121,7 @@ bool RigGridManager::isGridDimensionsEqual(const std::vector< std::vector > //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigGridManager::CaseToGridMap::CaseToGridMap(RigCaseData* eclipseCase, RigMainGrid* mainGrid) : +RigGridManager::CaseToGridMap::CaseToGridMap(RigEclipseCaseData* eclipseCase, RigMainGrid* mainGrid) : m_eclipseCase(eclipseCase), m_mainGrid(mainGrid) { diff --git a/ApplicationCode/ReservoirDataModel/RigGridManager.h b/ApplicationCode/ReservoirDataModel/RigGridManager.h index 7f5f2adc45..6f96b20f16 100644 --- a/ApplicationCode/ReservoirDataModel/RigGridManager.h +++ b/ApplicationCode/ReservoirDataModel/RigGridManager.h @@ -25,14 +25,14 @@ #include class RigMainGrid; -class RigCaseData; +class RigEclipseCaseData; class RigGridManager : public cvf::Object { public: - void addCase(RigCaseData* eclipseCase); + void addCase(RigEclipseCaseData* eclipseCase); - void removeCase(RigCaseData* eclipseCase); + void removeCase(RigEclipseCaseData* eclipseCase); RigMainGrid* findEqualGrid(RigMainGrid* candidateGrid); @@ -44,9 +44,9 @@ private: class CaseToGridMap : public cvf::Object { public: - CaseToGridMap(RigCaseData* eclipseCase, RigMainGrid* mainGrid); + CaseToGridMap(RigEclipseCaseData* eclipseCase, RigMainGrid* mainGrid); - RigCaseData* m_eclipseCase; + RigEclipseCaseData* m_eclipseCase; RigMainGrid* m_mainGrid; }; diff --git a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp index 88529379ae..9fd1189e02 100644 --- a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp +++ b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp @@ -21,7 +21,7 @@ #include "RigReservoirBuilderMock.h" #include "RigActiveCellInfo.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigCell.h" #include "RigMainGrid.h" #include "RigSingleWellResultsData.h" @@ -168,7 +168,7 @@ void RigReservoirBuilderMock::appendCells(size_t nodeStartIndex, size_t cellCoun //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigReservoirBuilderMock::populateReservoir(RigCaseData* eclipseCase) +void RigReservoirBuilderMock::populateReservoir(RigEclipseCaseData* eclipseCase) { std::vector& mainGridNodes = eclipseCase->mainGrid()->nodes(); appendNodes(m_minWorldCoordinate, m_maxWorldCoordinate, cellDimension(), mainGridNodes); @@ -293,7 +293,7 @@ void RigReservoirBuilderMock::setWorldCoordinates(cvf::Vec3d minWorldCoordinate, //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RigReservoirBuilderMock::inputProperty(RigCaseData* eclipseCase, const QString& propertyName, std::vector* values) +bool RigReservoirBuilderMock::inputProperty(RigEclipseCaseData* eclipseCase, const QString& propertyName, std::vector* values) { size_t k; @@ -314,7 +314,7 @@ bool RigReservoirBuilderMock::inputProperty(RigCaseData* eclipseCase, const QStr //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RigReservoirBuilderMock::staticResult(RigCaseData* eclipseCase, const QString& result, std::vector* values) +bool RigReservoirBuilderMock::staticResult(RigEclipseCaseData* eclipseCase, const QString& result, std::vector* values) { values->resize(eclipseCase->mainGrid()->globalCellArray().size()); @@ -330,7 +330,7 @@ bool RigReservoirBuilderMock::staticResult(RigCaseData* eclipseCase, const QStri //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RigReservoirBuilderMock::dynamicResult(RigCaseData* eclipseCase, const QString& result, size_t stepIndex, std::vector* values) +bool RigReservoirBuilderMock::dynamicResult(RigEclipseCaseData* eclipseCase, const QString& result, size_t stepIndex, std::vector* values) { int resultIndex = 1; @@ -365,7 +365,7 @@ bool RigReservoirBuilderMock::dynamicResult(RigCaseData* eclipseCase, const QStr //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigReservoirBuilderMock::addWellData(RigCaseData* eclipseCase, RigGridBase* grid) +void RigReservoirBuilderMock::addWellData(RigEclipseCaseData* eclipseCase, RigGridBase* grid) { CVF_ASSERT(eclipseCase); CVF_ASSERT(grid); @@ -481,7 +481,7 @@ void RigReservoirBuilderMock::addWellData(RigCaseData* eclipseCase, RigGridBase* //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigReservoirBuilderMock::addFaults(RigCaseData* eclipseCase) +void RigReservoirBuilderMock::addFaults(RigEclipseCaseData* eclipseCase) { if (!eclipseCase) return; diff --git a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h index eb805b2077..682c548210 100644 --- a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h +++ b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h @@ -25,11 +25,7 @@ #include "cvfArray.h" #include "cvfVector3.h" -//#include "RigCell.h" -//#include "RigCaseData.h" -//#include "RigMainGrid.h" - -class RigCaseData; +class RigEclipseCaseData; class RigMainGrid; class RigConnection; class RigGridBase; @@ -68,17 +64,17 @@ public: void addLocalGridRefinement(const cvf::Vec3st& minCellPosition, const cvf::Vec3st& maxCellPosition, const cvf::Vec3st& singleCellRefinementFactors); - void populateReservoir(RigCaseData* eclipseCase); + void populateReservoir(RigEclipseCaseData* eclipseCase); - bool inputProperty(RigCaseData* eclipseCase, const QString& propertyName, std::vector* values ); - bool staticResult(RigCaseData* eclipseCase, const QString& result, std::vector* values ); - bool dynamicResult(RigCaseData* eclipseCase, const QString& result, size_t stepIndex, std::vector* values ); + bool inputProperty(RigEclipseCaseData* eclipseCase, const QString& propertyName, std::vector* values ); + bool staticResult(RigEclipseCaseData* eclipseCase, const QString& result, std::vector* values ); + bool dynamicResult(RigEclipseCaseData* eclipseCase, const QString& result, size_t stepIndex, std::vector* values ); private: - void addFaults(RigCaseData* eclipseCase); + void addFaults(RigEclipseCaseData* eclipseCase); static void addNnc(RigMainGrid* grid, size_t i1, size_t j1, size_t k1, size_t i2, size_t j2, size_t k2, std::vector &nncConnections); - void addWellData(RigCaseData* eclipseCase, RigGridBase* grid); + void addWellData(RigEclipseCaseData* eclipseCase, RigGridBase* grid); static void appendCells(size_t nodeStartIndex, size_t cellCount, RigGridBase* hostGrid, std::vector& cells); static void appendNodes(const cvf::Vec3d& min, const cvf::Vec3d& max, const cvf::Vec3st& cubeDimension, std::vector& nodes); diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp index b96971d0fc..7dd7f21d25 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp +++ b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp @@ -23,7 +23,7 @@ #include "RigActiveCellsResultAccessor.h" #include "RigAllGridCellsResultAccessor.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigCombMultResultAccessor.h" #include "RigCombTransResultAccessor.h" #include "RigGridBase.h" @@ -44,7 +44,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultAccessorFactory::createFromUiResultName(RigCaseData* eclipseCase, +cvf::ref RigResultAccessorFactory::createFromUiResultName(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -137,7 +137,7 @@ cvf::ref RigResultAccessorFactory::createFromUiResultName(Rig //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultAccessorFactory::createFromNameAndType(RigCaseData* eclipseCase, +cvf::ref RigResultAccessorFactory::createFromNameAndType(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -172,7 +172,7 @@ cvf::ref RigResultAccessorFactory::createFromNameAndType(RigC //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultAccessorFactory::createFromResultDefinition(RigCaseData* eclipseCase, +cvf::ref RigResultAccessorFactory::createFromResultDefinition(RigEclipseCaseData* eclipseCase, size_t gridIndex, size_t timeStepIndex, RimEclipseResultDefinition* resultDefinition) @@ -214,7 +214,7 @@ cvf::ref RigResultAccessorFactory::createFromResultDefinition //-------------------------------------------------------------------------------------------------- /// This function must be harmonized with RigResultModifierFactory::createResultModifier() //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultAccessorFactory::createNativeFromUiResultName(RigCaseData* eclipseCase, +cvf::ref RigResultAccessorFactory::createNativeFromUiResultName(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -242,7 +242,7 @@ cvf::ref RigResultAccessorFactory::createNativeFromUiResultNa //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultAccessorFactory::createFromResultIdx(RigCaseData* eclipseCase, +cvf::ref RigResultAccessorFactory::createFromResultIdx(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h index f3e995e0d6..5cb2e83b13 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h +++ b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h @@ -33,20 +33,20 @@ class RigResultAccessorFactory { public: static cvf::ref - createFromResultDefinition(RigCaseData* eclipseCase, + createFromResultDefinition(RigEclipseCaseData* eclipseCase, size_t gridIndex, size_t timeStepIndex, RimEclipseResultDefinition* resultDefinition); static cvf::ref - createFromUiResultName(RigCaseData* eclipseCase, + createFromUiResultName(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, const QString& uiResultName); static cvf::ref - createFromNameAndType(RigCaseData* eclipseCase, + createFromNameAndType(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -54,7 +54,7 @@ public: RimDefines::ResultCatType resultType); static cvf::ref - createFromResultIdx(RigCaseData* eclipseCase, + createFromResultIdx(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -62,7 +62,7 @@ public: private: static cvf::ref - createNativeFromUiResultName(RigCaseData* eclipseCase, + createNativeFromUiResultName(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, diff --git a/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp b/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp index 3b9064324f..0515009f7f 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp +++ b/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp @@ -20,7 +20,7 @@ #include "RigResultModifierFactory.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigResultModifier.h" #include @@ -29,7 +29,7 @@ //-------------------------------------------------------------------------------------------------- /// This function must be harmonized with RigResultAccessorFactory::createNativeResultAccessor() //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultModifierFactory::createResultModifier(RigCaseData* eclipseCase, +cvf::ref RigResultModifierFactory::createResultModifier(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -51,7 +51,7 @@ cvf::ref RigResultModifierFactory::createResultModifier(RigCa //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultModifierFactory::createResultModifier(RigCaseData* eclipseCase, +cvf::ref RigResultModifierFactory::createResultModifier(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, size_t scalarResultIndex) diff --git a/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.h b/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.h index 0ca58f7800..61b36d3425 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.h +++ b/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.h @@ -21,21 +21,21 @@ #include "RifReaderInterface.h" -class RigCaseData; +class RigEclipseCaseData; class RigResultModifier; class RigResultModifierFactory { public: static cvf::ref - createResultModifier(RigCaseData* eclipseCase, + createResultModifier(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, QString& uiResultName); static cvf::ref - createResultModifier(RigCaseData* eclipseCase, + createResultModifier(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, diff --git a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp index 1bf3e2748d..96e66e6629 100644 --- a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp +++ b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp @@ -19,7 +19,7 @@ #include "RigSimulationWellCenterLineCalculator.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigCell.h" #include "RimEclipseCase.h" @@ -39,7 +39,7 @@ void RigSimulationWellCenterLineCalculator::calculateWellPipeCenterline(RimEclip std::vector< std::vector >& pipeBranchesCellIds) { bool isAutoDetectBranches = false; - RigCaseData* eclipseCaseData = NULL; + RigEclipseCaseData* eclipseCaseData = NULL; RigSingleWellResultsData* wellResults = NULL; { diff --git a/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp b/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp index b07b4bed89..7706782176 100644 --- a/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp +++ b/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp @@ -20,7 +20,7 @@ #include "RigTimeHistoryResultAccessor.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigGridBase.h" #include "RigResultAccessor.h" #include "RigResultAccessorFactory.h" @@ -30,7 +30,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigTimeHistoryResultAccessor::RigTimeHistoryResultAccessor(RigCaseData* eclipseCaseData, size_t gridIndex, size_t cellIndex, size_t scalarResultIndex, RifReaderInterface::PorosityModelResultType porosityModel) +RigTimeHistoryResultAccessor::RigTimeHistoryResultAccessor(RigEclipseCaseData* eclipseCaseData, size_t gridIndex, size_t cellIndex, size_t scalarResultIndex, RifReaderInterface::PorosityModelResultType porosityModel) : m_eclipseCaseData(eclipseCaseData), m_gridIndex(gridIndex), m_cellIndex(cellIndex), diff --git a/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.h b/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.h index 1caacfb575..7451a2e6ba 100644 --- a/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.h +++ b/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.h @@ -22,13 +22,13 @@ #include "cvfStructGrid.h" #include "RifReaderInterface.h" -class RigCaseData; +class RigEclipseCaseData; class RigTimeHistoryResultAccessor { public: - RigTimeHistoryResultAccessor(RigCaseData* eclipseCaseData, size_t gridIndex, size_t cellIndex, size_t scalarResultIndex, RifReaderInterface::PorosityModelResultType porosityModel); + RigTimeHistoryResultAccessor(RigEclipseCaseData* eclipseCaseData, size_t gridIndex, size_t cellIndex, size_t scalarResultIndex, RifReaderInterface::PorosityModelResultType porosityModel); void setFace(cvf::StructGridInterface::FaceType face); QString topologyText() const; @@ -38,7 +38,7 @@ private: void computeTimeHistoryData(); private: - RigCaseData* m_eclipseCaseData; + RigEclipseCaseData* m_eclipseCaseData; size_t m_gridIndex; size_t m_cellIndex; diff --git a/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp b/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp index 1b1b299c1e..f3f6625771 100644 --- a/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp @@ -27,7 +27,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "Rim3dOverlayInfoConfig.h" diff --git a/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp b/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp index 3984a7b0c3..94c4184307 100644 --- a/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp @@ -27,7 +27,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "Rim3dOverlayInfoConfig.h" diff --git a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp index 96eba45585..2f824abc25 100644 --- a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp @@ -24,7 +24,7 @@ #include "RiaSocketTools.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RigResultAccessor.h" #include "RigResultAccessorFactory.h" diff --git a/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp b/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp index f51efc9b36..6df39fd03d 100644 --- a/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp @@ -23,7 +23,7 @@ #include "RiaSocketTools.h" #include "RigGridBase.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigSingleWellResultsData.h" #include "RimEclipseCase.h" diff --git a/ApplicationCode/UnitTests/RifEclipseInputFileTools-Test.cpp b/ApplicationCode/UnitTests/RifEclipseInputFileTools-Test.cpp index 98b071f106..b25013e84f 100644 --- a/ApplicationCode/UnitTests/RifEclipseInputFileTools-Test.cpp +++ b/ApplicationCode/UnitTests/RifEclipseInputFileTools-Test.cpp @@ -1,6 +1,6 @@ #include "gtest/gtest.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RifEclipseInputFileTools.h" diff --git a/ApplicationCode/UnitTests/RifReaderEclipseOutput-Test.cpp b/ApplicationCode/UnitTests/RifReaderEclipseOutput-Test.cpp index df75bfdbf3..e58cb7a0f2 100644 --- a/ApplicationCode/UnitTests/RifReaderEclipseOutput-Test.cpp +++ b/ApplicationCode/UnitTests/RifReaderEclipseOutput-Test.cpp @@ -20,7 +20,7 @@ #include "gtest/gtest.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include @@ -441,7 +441,7 @@ TEST(RigReservoirTest, BasicTest) TEST(RigReservoirTest, WellTest) { cvf::ref readerInterfaceEcl = new RifReaderEclipseOutput; - cvf::ref reservoir = new RigCaseData; + cvf::ref reservoir = new RigEclipseCaseData; // Location of test dataset received from Håkon Høgstøl in July 2011 with 10k active cells #ifdef WIN32 diff --git a/ApplicationCode/UnitTests/RigReservoir-Test.cpp b/ApplicationCode/UnitTests/RigReservoir-Test.cpp index ab85e79344..e074f1d067 100644 --- a/ApplicationCode/UnitTests/RigReservoir-Test.cpp +++ b/ApplicationCode/UnitTests/RigReservoir-Test.cpp @@ -20,7 +20,7 @@ #include "gtest/gtest.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigGridManager.h" #include "RigMainGrid.h" @@ -32,7 +32,7 @@ TEST(RigGridManager, BasicTest) { cvf::ref mainGridA = new RigMainGrid; - cvf::ref eclipseCase = new RigCaseData; + cvf::ref eclipseCase = new RigEclipseCaseData; eclipseCase->setMainGrid(mainGridA.p()); int count = mainGridA->refCount(); @@ -59,7 +59,7 @@ TEST(RigGridManager, EqualTests) mainGridA->nodes().push_back(cvf::Vec3d(0, 0, 1)); mainGridA->nodes().push_back(cvf::Vec3d(0, 0, 2)); - cvf::ref eclipseCase = new RigCaseData; + cvf::ref eclipseCase = new RigEclipseCaseData; eclipseCase->setMainGrid(mainGridA.p()); diff --git a/ApplicationCode/UnitTests/opm-parser-Performance-Test.cpp b/ApplicationCode/UnitTests/opm-parser-Performance-Test.cpp index dd673675c9..cd1cfd4f86 100644 --- a/ApplicationCode/UnitTests/opm-parser-Performance-Test.cpp +++ b/ApplicationCode/UnitTests/opm-parser-Performance-Test.cpp @@ -2,7 +2,7 @@ #include "opm/parser/eclipse/Parser/Parser.hpp" #include "gtest/gtest.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RifEclipseInputFileTools.h" #include "RifReaderOpmParserInput.h" diff --git a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp index 49d3ecfcd5..a870232f5f 100644 --- a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp +++ b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp @@ -20,7 +20,7 @@ #include "RiuResultTextBuilder.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFormationNames.h" #include "RigMainGrid.h" #include "RigResultAccessor.h" @@ -139,7 +139,7 @@ QString RiuResultTextBuilder::topologyText(QString itemSeparator) if (m_reservoirView && m_reservoirView->eclipseCase()) { - const RigCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); + const RigEclipseCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); if (eclipseCase) { if (m_cellIndex != cvf::UNDEFINED_SIZE_T) @@ -187,7 +187,7 @@ QString RiuResultTextBuilder::gridResultDetails() if (m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData()) { - RigCaseData* eclipseCaseData = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCaseData = m_reservoirView->eclipseCase()->reservoirData(); RigGridBase* grid = eclipseCaseData->grid(m_gridIndex); this->appendTextFromResultColors(eclipseCaseData, m_gridIndex, m_cellIndex, m_timeStepIndex, m_reservoirView->cellResult(), &text); @@ -210,7 +210,7 @@ QString RiuResultTextBuilder::faultResultDetails() if (m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData()) { - RigCaseData* eclipseCaseData = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCaseData = m_reservoirView->eclipseCase()->reservoirData(); RigGridBase* grid = eclipseCaseData->grid(m_gridIndex); RigMainGrid* mainGrid = grid->mainGrid(); @@ -251,7 +251,7 @@ QString RiuResultTextBuilder::formationDetails() size_t k = cvf::UNDEFINED_SIZE_T; { - const RigCaseData* eclipseData = m_reservoirView->eclipseCase()->reservoirData(); + const RigEclipseCaseData* eclipseData = m_reservoirView->eclipseCase()->reservoirData(); if(eclipseData) { if(m_cellIndex != cvf::UNDEFINED_SIZE_T) @@ -301,7 +301,7 @@ QString RiuResultTextBuilder::faultResultText() if (m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData()) { - RigCaseData* eclipseCaseData = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCaseData = m_reservoirView->eclipseCase()->reservoirData(); RigGridBase* grid = eclipseCaseData->grid(m_gridIndex); RigMainGrid* mainGrid = grid->mainGrid(); @@ -331,7 +331,7 @@ QString RiuResultTextBuilder::nncResultText() { if (m_reservoirView.notNull() && m_reservoirView->eclipseCase()) { - RigCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); RigMainGrid* grid = eclipseCase->mainGrid(); CVF_ASSERT(grid); @@ -366,7 +366,7 @@ QString RiuResultTextBuilder::nncResultText() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuResultTextBuilder::appendTextFromResultColors(RigCaseData* eclipseCase, size_t gridIndex, size_t cellIndex, size_t timeStepIndex, RimEclipseCellColors* resultColors, QString* resultInfoText) +void RiuResultTextBuilder::appendTextFromResultColors(RigEclipseCaseData* eclipseCase, size_t gridIndex, size_t cellIndex, size_t timeStepIndex, RimEclipseCellColors* resultColors, QString* resultInfoText) { if (!resultColors) { @@ -561,7 +561,7 @@ QString RiuResultTextBuilder::nncDetails() { if (m_reservoirView.notNull() && m_reservoirView->eclipseCase()) { - RigCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); RigMainGrid* grid = eclipseCase->mainGrid(); CVF_ASSERT(grid); @@ -649,7 +649,7 @@ QString RiuResultTextBuilder::cellResultText(RimEclipseCellColors* resultColors) if (m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData()) { - RigCaseData* eclipseCaseData = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCaseData = m_reservoirView->eclipseCase()->reservoirData(); RigGridBase* grid = eclipseCaseData->grid(m_gridIndex); RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(resultColors->porosityModel()); diff --git a/ApplicationCode/UserInterface/RiuResultTextBuilder.h b/ApplicationCode/UserInterface/RiuResultTextBuilder.h index 543214c57f..012f1a5624 100644 --- a/ApplicationCode/UserInterface/RiuResultTextBuilder.h +++ b/ApplicationCode/UserInterface/RiuResultTextBuilder.h @@ -27,7 +27,7 @@ class RimEclipseView; class RimEclipseCellColors; class QString; -class RigCaseData; +class RigEclipseCaseData; namespace cvf { class Part; @@ -65,7 +65,7 @@ private: QString cellResultText(RimEclipseCellColors* resultColors); - void appendTextFromResultColors(RigCaseData* eclipseCase, size_t gridIndex, size_t cellIndex, size_t timeStepIndex, RimEclipseCellColors* resultColors, QString* resultInfoText); + void appendTextFromResultColors(RigEclipseCaseData* eclipseCase, size_t gridIndex, size_t cellIndex, size_t timeStepIndex, RimEclipseCellColors* resultColors, QString* resultInfoText); private: caf::PdmPointer m_reservoirView; diff --git a/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp b/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp index 35e3bce98b..11014de619 100644 --- a/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp +++ b/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp @@ -22,7 +22,7 @@ #include "RiaApplication.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RiuFemTimeHistoryResultAccessor.h" #include "RigGeoMechCaseData.h" #include "RigTimeHistoryResultAccessor.h" diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp index 6a6f76af06..e9e454ab9c 100644 --- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp +++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp @@ -27,7 +27,7 @@ #include "RicRangeFilterNewExec.h" #include "WellPathCommands/RicWellPathViewerEventHandler.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFault.h" #include "RigFemPartCollection.h" #include "RigFemPartGrid.h"

Min P10 Mean P90 Max Sum
%1 %2 %3 %4 %5 %6