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

NNC: Compute data on demand

Browse Source
This commit is contained in:
Magne Sjaastad
2020-05-16 15:51:59 +02:00
parent 734e992384
commit 51fd5e39b0
8 changed files with 74 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/Application/RiaDefines.cpp
View File

@@ -399,6 +399,22 @@ QString RiaDefines::formationAllanResultName()
return "Formation Allan";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<QString> RiaDefines::nncResultNames()
{
return {combinedTransmissibilityResultName(),
formationAllanResultName(),
formationBinaryAllanResultName(),
combinedWaterFluxResultName(),
combinedGasFluxResultName(),
combinedOilFluxResultName(),
combinedRiAreaNormTranResultName(),
combinedRiMultResultName(),
combinedRiTranResultName()};
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

6
ApplicationCode/Application/RiaDefines.h
View File

@@ -21,6 +21,7 @@
#pragma once
#include <QString>
#include <set>
#include <vector>
namespace RiaDefines
@@ -106,8 +107,9 @@ QString mobilePoreVolumeName();
QString completionTypeResultName();
// Fault results
QString formationBinaryAllanResultName();
QString formationAllanResultName();
QString formationBinaryAllanResultName();
QString formationAllanResultName();
std::set<QString> nncResultNames();
// Mock model text identifiers
QString mockModelBasic();

11
ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp
View File

@@ -125,16 +125,7 @@ void RicCreateTemporaryLgrFeature::updateViews( RimEclipseCase* eclipseCase )
RimProject::current()->mainPlotCollection()->wellLogPlotCollection()->reloadAllPlots();
for ( const auto& v : eclipseCase->views() )
{
RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>( v );
if ( eclipseView )
{
eclipseView->scheduleReservoirGridGeometryRegen();
}
v->loadDataAndUpdate();
}
eclipseCase->createDisplayModelAndUpdateAllViews();
}
//--------------------------------------------------------------------------------------------------

32
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -707,6 +707,38 @@ void RimEclipseCase::ensureFaultDataIsComputed()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimEclipseCase::ensureNncDataIsComputed()
{
bool computedData = false;
RigEclipseCaseData* rigEclipseCase = eclipseCaseData();
if ( rigEclipseCase && rigEclipseCase->mainGrid() )
{
computedData = rigEclipseCase->mainGrid()->nncData()->ensureConnectionDataIsProcecced();
}
return computedData;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseCase::createDisplayModelAndUpdateAllViews()
{
for ( const auto& v : views() )
{
RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>( v );
if ( eclipseView )
{
eclipseView->scheduleReservoirGridGeometryRegen();
}
v->loadDataAndUpdate();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimEclipseCase.h
View File

@@ -116,6 +116,8 @@ public:
void loadAndSyncronizeInputProperties( bool includeGridFileName );
void ensureFaultDataIsComputed();
bool ensureNncDataIsComputed();
void createDisplayModelAndUpdateAllViews();
protected:
void initAfterRead() override;

14
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@@ -22,6 +22,7 @@
#include "RiaColorTables.h"
#include "RiaLogging.h"
#include "RiaNncDefines.h"
#include "RiaQDateTimeTools.h"
#include "RicfCommandObject.h"
@@ -1150,6 +1151,19 @@ void RimEclipseResultDefinition::loadResult()
gridCellResults->createResultEntry( this->eclipseResultAddress(), false );
}
QString resultName = m_resultVariable();
std::set<QString> eclipseResultNamesWithNncData = RiaDefines::nncResultNames();
if ( eclipseResultNamesWithNncData.find( resultName ) != eclipseResultNamesWithNncData.end() )
{
eclipseCase()->ensureFaultDataIsComputed();
bool dataWasComputed = eclipseCase()->ensureNncDataIsComputed();
if ( dataWasComputed )
{
eclipseCase()->createDisplayModelAndUpdateAllViews();
}
}
gridCellResults->ensureKnownResultLoaded( this->eclipseResultAddress() );
}
}

6
ApplicationCode/ReservoirDataModel/RigNNCData.cpp
View File

@@ -187,9 +187,9 @@ size_t RigNNCData::connectionsWithNoCommonArea( QStringList& connectionTextFirst
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigNNCData::ensureConnectionDataIsProcecced()
bool RigNNCData::ensureConnectionDataIsProcecced()
{
if ( m_connectionsAreProcessed ) return;
if ( m_connectionsAreProcessed ) return false;
if ( m_mainGrid )
{
@@ -229,6 +229,8 @@ void RigNNCData::ensureConnectionDataIsProcecced()
}
}
}
return true;
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ReservoirDataModel/RigNNCData.h
View File

@@ -50,7 +50,7 @@ public:
RigNNCData();
void ensureConnectionDataIsProcecced();
bool ensureConnectionDataIsProcecced();
void setSourceDataForProcessing( RigMainGrid* mainGrid,
const RigActiveCellInfo* activeCellInfo,
bool includeInactiveCells );