OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace

Browse Source
This commit is contained in:
Magne Sjaastad 2018-11-06 08:35:04 +01:00
parent 00b0d6ef9f
commit 5e17eaf98a
1 changed files with 129 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -25,8 +25,8 @@
#include "RiaFieldHandleTools.h" #include "RiaFieldHandleTools.h"
#include "RiaPreferences.h" #include "RiaPreferences.h"
#include "CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h"
#include "CompletionExportCommands/RicExportCompletionDataSettingsUi.h" #include "CompletionExportCommands/RicExportCompletionDataSettingsUi.h"
#include "CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h"
#include "RigActiveCellInfo.h" #include "RigActiveCellInfo.h"
#include "RigCaseCellResultsData.h" #include "RigCaseCellResultsData.h"
@ -51,11 +51,11 @@
#include "RimFormationNames.h" #include "RimFormationNames.h"
#include "RimGridCollection.h" #include "RimGridCollection.h"
#include "RimIntersectionCollection.h" #include "RimIntersectionCollection.h"
#include "RimRegularLegendConfig.h"
#include "RimMainPlotCollection.h" #include "RimMainPlotCollection.h"
#include "RimOilField.h" #include "RimOilField.h"
#include "RimPerforationCollection.h" #include "RimPerforationCollection.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimRegularLegendConfig.h"
#include "RimReservoirCellResultsStorage.h" #include "RimReservoirCellResultsStorage.h"
#include "RimStimPlanColors.h" #include "RimStimPlanColors.h"
#include "RimSummaryCase.h" #include "RimSummaryCase.h"
@ -71,14 +71,13 @@
#include "RimWellPathCollection.h" #include "RimWellPathCollection.h"
#include "cafPdmDocument.h" #include "cafPdmDocument.h"
#include "cafProgressInfo.h"
#include "cafPdmUiTreeOrdering.h" #include "cafPdmUiTreeOrdering.h"
#include "cafProgressInfo.h"
#include <QDebug>
#include <QDir>
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include <QDir>
#include <QDebug>
CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimEclipseCase, "RimReservoir"); CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimEclipseCase, "RimReservoir");
@ -244,7 +243,6 @@ void RimEclipseCase::initAfterRead()
contourMap->setEclipseCase(this); contourMap->setEclipseCase(this);
} }
if (caseUserDescription().isEmpty() && !m_caseName_OBSOLETE().isEmpty()) if (caseUserDescription().isEmpty() && !m_caseName_OBSOLETE().isEmpty())
{ {
caseUserDescription = m_caseName_OBSOLETE; caseUserDescription = m_caseName_OBSOLETE;
@ -292,7 +290,8 @@ RimEclipseView* RimEclipseCase::createCopyAndAddView(const RimEclipseView* sourc
{ {
CVF_ASSERT(sourceView); CVF_ASSERT(sourceView);
RimEclipseView* rimEclipseView = dynamic_cast<RimEclipseView*>(sourceView->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance())); RimEclipseView* rimEclipseView = dynamic_cast<RimEclipseView*>(
sourceView->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
CVF_ASSERT(rimEclipseView); CVF_ASSERT(rimEclipseView);
rimEclipseView->setEclipseCase(this); rimEclipseView->setEclipseCase(this);
@ -313,11 +312,8 @@ RimEclipseView* RimEclipseCase::createCopyAndAddView(const RimEclipseView* sourc
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
Rim2dEclipseView* RimEclipseCase::create2dContourMapFrom3dView(const RimEclipseView* sourceView) Rim2dEclipseView* RimEclipseCase::create2dContourMapFrom3dView(const RimEclipseView* sourceView)
{ {
Rim2dEclipseView* contourMap = Rim2dEclipseView* contourMap = dynamic_cast<Rim2dEclipseView*>(sourceView->xmlCapability()->copyAndCastByXmlSerialization(
dynamic_cast<Rim2dEclipseView*>(sourceView->xmlCapability()->copyAndCastByXmlSerialization( Rim2dEclipseView::classKeywordStatic(), sourceView->classKeyword(), caf::PdmDefaultObjectFactory::instance()));
Rim2dEclipseView::classKeywordStatic(),
sourceView->classKeyword(),
caf::PdmDefaultObjectFactory::instance()));
CVF_ASSERT(contourMap); CVF_ASSERT(contourMap);
contourMap->setEclipseCase(this); contourMap->setEclipseCase(this);
@ -405,7 +401,8 @@ const RigVirtualPerforationTransmissibilities* RimEclipseCase::computeAndGetVirt
for (auto w : visibleWellPaths) for (auto w : visibleWellPaths)
{ {
std::vector<RigCompletionData> staticCompletionData = RicWellPathExportCompletionDataFeatureImpl::computeStaticCompletionsForWellPath(w, this); std::vector<RigCompletionData> staticCompletionData =
RicWellPathExportCompletionDataFeatureImpl::computeStaticCompletionsForWellPath(w, this);
if (anyPerforationsPresent) if (anyPerforationsPresent)
{ {
@ -413,9 +410,12 @@ const RigVirtualPerforationTransmissibilities* RimEclipseCase::computeAndGetVirt
for (size_t i = 0; i < timeStepDates().size(); i++) for (size_t i = 0; i < timeStepDates().size(); i++)
{ {
std::vector<RigCompletionData> dynamicCompletionDataOneTimeStep = RicWellPathExportCompletionDataFeatureImpl::computeDynamicCompletionsForWellPath(w, this, i); std::vector<RigCompletionData> dynamicCompletionDataOneTimeStep =
RicWellPathExportCompletionDataFeatureImpl::computeDynamicCompletionsForWellPath(w, this, i);
std::copy(staticCompletionData.begin(), staticCompletionData.end(), std::back_inserter(dynamicCompletionDataOneTimeStep)); std::copy(staticCompletionData.begin(),
staticCompletionData.end(),
std::back_inserter(dynamicCompletionDataOneTimeStep));
allCompletionData.push_back(dynamicCompletionDataOneTimeStep); allCompletionData.push_back(dynamicCompletionDataOneTimeStep);
} }
@ -446,14 +446,16 @@ const RigVirtualPerforationTransmissibilities* RimEclipseCase::computeAndGetVirt
{ {
if (r.isValid()) if (r.isValid())
{ {
RigCompletionData compData(wellRes->m_wellName, RigCompletionDataGridCell(r.m_gridCellIndex, rigEclipseCase->mainGrid()), 0); RigCompletionData compData(
wellRes->m_wellName,
RigCompletionDataGridCell(r.m_gridCellIndex, rigEclipseCase->mainGrid()),
0);
compData.setTransmissibility(r.connectionFactor()); compData.setTransmissibility(r.connectionFactor());
completionData.push_back(compData); completionData.push_back(compData);
} }
} }
} }
} }
completionsPerTimeStep.push_back(completionData); completionsPerTimeStep.push_back(completionData);
@ -504,7 +506,6 @@ void RimEclipseCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -572,7 +573,8 @@ void RimEclipseCase::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
std::vector<PdmObjectHandle*> children; std::vector<PdmObjectHandle*> children;
reservoirViews.childObjects(&children); reservoirViews.childObjects(&children);
for (auto child : children) uiTreeOrdering.add(child); for (auto child : children)
uiTreeOrdering.add(child);
if (!m_2dIntersectionViewCollection->views().empty()) if (!m_2dIntersectionViewCollection->views().empty())
{ {
@ -622,7 +624,6 @@ void RimEclipseCase::computeCachedData()
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -789,7 +790,8 @@ std::vector<QString> RimEclipseCase::filesContainingFaults() const
QStringList pathList = separatedPaths.split(";", QString::SkipEmptyParts); QStringList pathList = separatedPaths.split(";", QString::SkipEmptyParts);
std::vector<QString> stdPathList; std::vector<QString> stdPathList;
for (auto& path: pathList) stdPathList.push_back(path); for (auto& path : pathList)
stdPathList.push_back(path);
return stdPathList; return stdPathList;
} }
@ -840,28 +842,35 @@ bool RimEclipseCase::openReserviorCase()
results->createPlaceholderResultEntries(); results->createPlaceholderResultEntries();
// After the placeholder result for combined transmissibility is created, // After the placeholder result for combined transmissibility is created,
// make sure the nnc transmissibilities can be addressed by this scalarResultIndex as well // make sure the nnc transmissibilities can be addressed by this scalarResultIndex as well
size_t combinedTransResIdx = results->findScalarResultIndex(RiaDefines::STATIC_NATIVE, RiaDefines::combinedTransmissibilityResultName()); size_t combinedTransResIdx =
results->findScalarResultIndex(RiaDefines::STATIC_NATIVE, RiaDefines::combinedTransmissibilityResultName());
if (combinedTransResIdx != cvf::UNDEFINED_SIZE_T) if (combinedTransResIdx != cvf::UNDEFINED_SIZE_T)
{ {
eclipseCaseData()->mainGrid()->nncData()->setScalarResultIndex(RigNNCData::propertyNameCombTrans(), combinedTransResIdx); eclipseCaseData()->mainGrid()->nncData()->setScalarResultIndex(RigNNCData::propertyNameCombTrans(),
combinedTransResIdx);
} }
size_t combinedWatFluxResIdx = results->findScalarResultIndex(RiaDefines::DYNAMIC_NATIVE, RiaDefines::combinedWaterFluxResultName()); size_t combinedWatFluxResIdx =
results->findScalarResultIndex(RiaDefines::DYNAMIC_NATIVE, RiaDefines::combinedWaterFluxResultName());
if (combinedWatFluxResIdx != cvf::UNDEFINED_SIZE_T) if (combinedWatFluxResIdx != cvf::UNDEFINED_SIZE_T)
{ {
eclipseCaseData()->mainGrid()->nncData()->setScalarResultIndex(RigNNCData::propertyNameFluxWat(), combinedWatFluxResIdx); eclipseCaseData()->mainGrid()->nncData()->setScalarResultIndex(RigNNCData::propertyNameFluxWat(),
combinedWatFluxResIdx);
} }
size_t combinedOilFluxResIdx = results->findScalarResultIndex(RiaDefines::DYNAMIC_NATIVE, RiaDefines::combinedOilFluxResultName()); size_t combinedOilFluxResIdx =
results->findScalarResultIndex(RiaDefines::DYNAMIC_NATIVE, RiaDefines::combinedOilFluxResultName());
if (combinedOilFluxResIdx != cvf::UNDEFINED_SIZE_T) if (combinedOilFluxResIdx != cvf::UNDEFINED_SIZE_T)
{ {
eclipseCaseData()->mainGrid()->nncData()->setScalarResultIndex(RigNNCData::propertyNameFluxOil(), combinedOilFluxResIdx); eclipseCaseData()->mainGrid()->nncData()->setScalarResultIndex(RigNNCData::propertyNameFluxOil(),
combinedOilFluxResIdx);
} }
size_t combinedGasFluxResIdx = results->findScalarResultIndex(RiaDefines::DYNAMIC_NATIVE, RiaDefines::combinedGasFluxResultName()); size_t combinedGasFluxResIdx =
results->findScalarResultIndex(RiaDefines::DYNAMIC_NATIVE, RiaDefines::combinedGasFluxResultName());
if (combinedGasFluxResIdx != cvf::UNDEFINED_SIZE_T) if (combinedGasFluxResIdx != cvf::UNDEFINED_SIZE_T)
{ {
eclipseCaseData()->mainGrid()->nncData()->setScalarResultIndex(RigNNCData::propertyNameFluxGas(), combinedGasFluxResIdx); eclipseCaseData()->mainGrid()->nncData()->setScalarResultIndex(RigNNCData::propertyNameFluxGas(),
combinedGasFluxResIdx);
} }
} }
} }
{ {
@ -993,7 +1002,8 @@ void RimEclipseCase::reloadDataAndUpdate()
RimProject* project = RiaApplication::instance()->project(); RimProject* project = RiaApplication::instance()->project();
if (project) if (project)
{ {
RimSummaryCaseMainCollection* sumCaseColl = project->activeOilField() ? project->activeOilField()->summaryCaseMainCollection() : nullptr; RimSummaryCaseMainCollection* sumCaseColl =
project->activeOilField() ? project->activeOilField()->summaryCaseMainCollection() : nullptr;
if (sumCaseColl) if (sumCaseColl)
{ {
sumCaseColl->loadAllSummaryCaseData(); sumCaseColl->loadAllSummaryCaseData();