OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-25 14:40:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use opm-flowdiagnostics-applications as submodule

Browse Source 
* Deletes the copy of the code in ThirdPary folder
* Replace code with opm-flowdiagnostics-applications as submodule
* Refactors ECL data handling for flow diagnostics
Updates flow diagnostics to utilize ECL init data consistently.
This change streamlines the passing and usage of initialization
data within the flow diagnostics routines, enhancing code
clarity and maintainability. Removes redundant passing of grid
data, simplifying function signatures.
This commit is contained in:
Magne Sjaastad authored and GitHub committed 2025-10-27 14:09:57 +01:00
1 parent 73dd0e0667
commit 91192a671c
70 files changed
+54 -35417
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ReservoirDataModel/RigFlowDiagInterfaceTools.h
+2 -2
View File
@@ -102,11 +102,11 @@ inline Opm::FlowDiagnostics::ConnectionValues calculateFluxField( const Opm::ECL
const Opm::ECLRestartData& rstrt,
RigFlowDiagResultAddress::PhaseSelection phaseSelection )
{
auto satfunc = Opm::ECLSaturationFunc( G, init );
auto satfunc = Opm::ECLSaturationFunc( init );
Opm::ECLFluxCalc calc( G, init, 9.80665, false );
auto getFlux = [&calc, &rstrt]( const Opm::ECLPhaseIndex p ) { return calc.flux( rstrt, p ); };
auto getFlux = [&calc, &init, &rstrt]( const Opm::ECLPhaseIndex p ) { return calc.flux( rstrt, init, p ); };
return extractFluxField( G, getFlux, getPhases( phaseSelection ) );
}
ApplicationLibCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp
+30 -16
View File
@@ -117,18 +117,20 @@ void RigFlowDiagTimeStepResult::addResult( const RigFlowDiagResultAddress& resAd
class RigOpmFlowDiagStaticData
{
public:
RigOpmFlowDiagStaticData( const ecl_grid_type* mainGrid, const std::wstring& init, RiaDefines::EclipseUnitSystem caseUnitSystem )
RigOpmFlowDiagStaticData( const ecl_grid_type* mainGrid, const std::wstring& initFilename, RiaDefines::EclipseUnitSystem caseUnitSystem )
: m_initData( initFilename )
{
Opm::ECLInitFileData initData( init );
try
{
m_eclGraph = std::make_unique<Opm::ECLGraph>( Opm::ECLGraph::load( mainGrid, initData ) );
if ( mainGrid )
{
m_eclGraph = std::make_unique<Opm::ECLGraph>( Opm::ECLGraph::load( mainGrid, m_initData ) );
m_poreVolume = m_eclGraph->poreVolume();
}
m_hasUnifiedRestartFile = false;
m_poreVolume = m_eclGraph->poreVolume();
m_eclSaturationFunc = std::make_unique<Opm::ECLSaturationFunc>( *m_eclGraph, initData );
m_eclSaturationFunc = std::make_unique<Opm::ECLSaturationFunc>( m_initData );
}
catch ( ... )
{
@@ -138,7 +140,7 @@ public:
try
{
m_eclPvtCurveCollection = std::make_unique<Opm::ECLPVT::ECLPvtCurveCollection>( *m_eclGraph, initData );
m_eclPvtCurveCollection = std::make_unique<Opm::ECLPVT::ECLPvtCurveCollection>( m_initData );
}
catch ( ... )
{
@@ -168,6 +170,7 @@ public:
}
public:
Opm::ECLInitFileData m_initData;
std::unique_ptr<Opm::ECLGraph> m_eclGraph;
std::vector<double> m_poreVolume;
std::unique_ptr<Opm::FlowDiagnostics::Toolbox> m_fldToolbox;
@@ -237,7 +240,7 @@ RigFlowDiagTimeStepResult RigFlowDiagSolverInterface::calculate( size_t
{
progressInfo.setProgressDescription( "Grid access" );
if ( !ensureStaticDataObjectInstanceCreated() )
if ( !ensureStaticDataObjectInstanceCreated() || !m_opmFlowDiagStaticData->m_eclGraph )
{
return result;
}
@@ -511,19 +514,23 @@ bool RigFlowDiagSolverInterface::ensureStaticDataObjectInstanceCreated()
const RigEclipseCaseData* eclipseCaseData = m_eclipseCase->eclipseCaseData();
if ( eclipseCaseData )
{
auto fileReader = eclipseCaseData->results( RiaDefines::PorosityModelType::MATRIX_MODEL )->readerInterface();
auto eclOutput = dynamic_cast<const RifReaderEclipseOutput*>( fileReader );
if ( eclOutput )
auto fileReader = eclipseCaseData->results( RiaDefines::PorosityModelType::MATRIX_MODEL )->readerInterface();
ecl_grid_type* mainGrid = nullptr;
if ( auto eclOutput = dynamic_cast<const RifReaderEclipseOutput*>( fileReader ) )
{
ecl_grid_type* mainGrid = eclOutput->loadAllGrids();
mainGrid = eclOutput->loadAllGrids();
if ( !mainGrid )
{
return false;
}
}
RiaDefines::EclipseUnitSystem caseUnitSystem = eclipseCaseData->unitsType();
m_opmFlowDiagStaticData = std::make_unique<RigOpmFlowDiagStaticData>( mainGrid, initFileName, caseUnitSystem );
RiaDefines::EclipseUnitSystem caseUnitSystem = eclipseCaseData->unitsType();
m_opmFlowDiagStaticData = std::make_unique<RigOpmFlowDiagStaticData>( mainGrid, initFileName, caseUnitSystem );
if ( mainGrid )
{
ecl_grid_free( mainGrid );
}
}
@@ -654,7 +661,7 @@ RigFlowDiagDefines::FlowCharacteristicsResultFrame
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RigFlowDiagDefines::RelPermCurve> RigFlowDiagSolverInterface::calculateRelPermCurves( size_t activeCellIndex )
std::vector<RigFlowDiagDefines::RelPermCurve> RigFlowDiagSolverInterface::calculateRelPermCurves( size_t activeCellIndex, int satnum )
{
std::vector<RigFlowDiagDefines::RelPermCurve> retCurveArr;
@@ -720,8 +727,15 @@ std::vector<RigFlowDiagDefines::RelPermCurve> RigFlowDiagSolverInterface::calcul
{
scaling.enable = static_cast<unsigned char>( 0 );
}
std::string gridID = "";
std::vector<Opm::FlowDiagnostics::Graph> graphArr =
m_opmFlowDiagStaticData->m_eclSaturationFunc->getSatFuncCurve( satFuncRequests, static_cast<int>( activeCellIndex ), scaling );
m_opmFlowDiagStaticData->m_eclSaturationFunc->getSatFuncCurve( satFuncRequests,
m_opmFlowDiagStaticData->m_initData,
gridID,
static_cast<int>( activeCellIndex ),
scaling );
for ( size_t i = 0; i < graphArr.size(); i++ )
{
const RigFlowDiagDefines::RelPermCurve::Ident curveIdent = curveIdentNameArr[i].first;
ApplicationLibCode/ReservoirDataModel/RigFlowDiagSolverInterface.h
+1 -1
View File
@@ -79,7 +79,7 @@ public:
const std::vector<size_t>& selected_cell_indices,
double max_pv_fraction );
std::vector<RigFlowDiagDefines::RelPermCurve> calculateRelPermCurves( size_t activeCellIndex );
std::vector<RigFlowDiagDefines::RelPermCurve> calculateRelPermCurves( size_t activeCellIndex, int satnum );
std::vector<RigFlowDiagDefines::PvtCurve> calculatePvtCurves( RigFlowDiagDefines::PvtCurveType pvtCurveType, int pvtNum );
bool calculatePvtDynamicPropertiesFvf( int pvtNum, double pressure, double rs, double rv, double* bo, double* bg );