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

Build result child nodes after the placeholder entries have been created

Browse Source
This commit is contained in:
Magne Sjaastad 2023-12-05 09:07:56 +01:00
parent 5f962ae89d
commit a3036a1b37
1 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -954,8 +954,6 @@ bool RimEclipseCase::openReserviorCase()
return false; return false;
} }
if ( m_resultAddressCollections.empty() ) buildResultChildNodes();
if ( eclipseCaseData() && eclipseCaseData()->mainGrid() && !eclipseCaseData()->mainGrid()->hasValidCharacteristicCellSizes() ) if ( eclipseCaseData() && eclipseCaseData()->mainGrid() && !eclipseCaseData()->mainGrid()->hasValidCharacteristicCellSizes() )
{ {
RigMainGrid* mainGrid = eclipseCaseData()->mainGrid(); RigMainGrid* mainGrid = eclipseCaseData()->mainGrid();
@ -986,54 +984,51 @@ bool RimEclipseCase::openReserviorCase()
if ( createPlaceholderEntries ) if ( createPlaceholderEntries )
{ {
if ( RigCaseCellResultsData* results = this->results( RiaDefines::PorosityModelType::MATRIX_MODEL ) )
{ {
RigCaseCellResultsData* results = this->results( RiaDefines::PorosityModelType::MATRIX_MODEL ); results->createPlaceholderResultEntries();
if ( results ) // After the placeholder result for combined transmissibility is created,
// make sure the nnc transmissibilities can be addressed by this scalarResultIndex as well
RigEclipseResultAddress combinedTransmissibilityResAddr( RiaDefines::ResultCatType::STATIC_NATIVE,
RiaResultNames::combinedTransmissibilityResultName() );
if ( results->hasResultEntry( combinedTransmissibilityResAddr ) )
{ {
results->createPlaceholderResultEntries(); eclipseCaseData()->mainGrid()->nncData()->setEclResultAddress( RiaDefines::propertyNameCombTrans(),
// After the placeholder result for combined transmissibility is created, combinedTransmissibilityResAddr );
// make sure the nnc transmissibilities can be addressed by this scalarResultIndex as well }
RigEclipseResultAddress combinedTransmissibilityResAddr( RiaDefines::ResultCatType::STATIC_NATIVE, RigEclipseResultAddress combinedWaterFluxResAddr( RiaDefines::ResultCatType::DYNAMIC_NATIVE,
RiaResultNames::combinedTransmissibilityResultName() ); RiaResultNames::combinedWaterFluxResultName() );
if ( results->hasResultEntry( combinedTransmissibilityResAddr ) ) if ( results->hasResultEntry( combinedWaterFluxResAddr ) )
{ {
eclipseCaseData()->mainGrid()->nncData()->setEclResultAddress( RiaDefines::propertyNameCombTrans(), eclipseCaseData()->mainGrid()->nncData()->setEclResultAddress( RiaDefines::propertyNameFluxWat(), combinedWaterFluxResAddr );
combinedTransmissibilityResAddr ); }
}
RigEclipseResultAddress combinedWaterFluxResAddr( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RigEclipseResultAddress combinedOilFluxResAddr( RiaDefines::ResultCatType::DYNAMIC_NATIVE,
RiaResultNames::combinedWaterFluxResultName() ); RiaResultNames::combinedOilFluxResultName() );
if ( results->hasResultEntry( combinedWaterFluxResAddr ) ) if ( results->hasResultEntry( combinedOilFluxResAddr ) )
{ {
eclipseCaseData()->mainGrid()->nncData()->setEclResultAddress( RiaDefines::propertyNameFluxWat(), combinedWaterFluxResAddr ); eclipseCaseData()->mainGrid()->nncData()->setEclResultAddress( RiaDefines::propertyNameFluxOil(), combinedOilFluxResAddr );
} }
RigEclipseResultAddress combinedGasFluxResAddr( RiaDefines::ResultCatType::DYNAMIC_NATIVE,
RiaResultNames::combinedGasFluxResultName() );
RigEclipseResultAddress combinedOilFluxResAddr( RiaDefines::ResultCatType::DYNAMIC_NATIVE, if ( results->hasResultEntry( combinedGasFluxResAddr ) )
RiaResultNames::combinedOilFluxResultName() ); {
if ( results->hasResultEntry( combinedOilFluxResAddr ) ) eclipseCaseData()->mainGrid()->nncData()->setEclResultAddress( RiaDefines::propertyNameFluxGas(), combinedGasFluxResAddr );
{
eclipseCaseData()->mainGrid()->nncData()->setEclResultAddress( RiaDefines::propertyNameFluxOil(), combinedOilFluxResAddr );
}
RigEclipseResultAddress combinedGasFluxResAddr( RiaDefines::ResultCatType::DYNAMIC_NATIVE,
RiaResultNames::combinedGasFluxResultName() );
if ( results->hasResultEntry( combinedGasFluxResAddr ) )
{
eclipseCaseData()->mainGrid()->nncData()->setEclResultAddress( RiaDefines::propertyNameFluxGas(), combinedGasFluxResAddr );
}
} }
} }
if ( RigCaseCellResultsData* results = this->results( RiaDefines::PorosityModelType::FRACTURE_MODEL ) )
{ {
RigCaseCellResultsData* results = this->results( RiaDefines::PorosityModelType::FRACTURE_MODEL ); results->createPlaceholderResultEntries();
if ( results )
{
results->createPlaceholderResultEntries();
}
} }
} }
// Build result child nodes after the placeholder entries have been created
if ( m_resultAddressCollections.empty() ) buildResultChildNodes();
createTimeStepFormatString(); createTimeStepFormatString();
// Associate existing well paths with simulation wells // Associate existing well paths with simulation wells