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

Simulation Input: Convert RigCaseCellResultsData to std::shared_ptr

Browse Source 
Convert m_matrixModelResults and m_fractureModelResults in RigEclipseCaseData from
cvf::ref<RigCaseCellResultsData> to std::shared_ptr<RigCaseCellResultsData>,
following the same pattern as previous modernizations.

Changes:
- RigEclipseCaseData: Updated memory management, accessors, and null checks
- Added resultsShared() accessor methods for direct shared_ptr access
- RigCaseCellResultsData.h: Added includes for RigEclipseResultInfo and
  RigAllanDiagramData to support std::make_shared allocation

All 569 unit tests pass successfully.
This commit is contained in:
Kristian Bendiksen committed 2025-12-22 19:19:33 +01:00
1 parent e08056360f
commit 870b1e640e
29 files changed
+91 -85
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/UnitTests/RifEclipseInputFileTools-Test.cpp
+7 -6
View File
@@ -551,7 +551,7 @@ TEST( RifEclipseInputFileToolsTest, ExportKeywords )
ASSERT_TRUE( success ) << "Failed to load test grid file: " << errorMessages.toStdString();
RigCaseCellResultsData* cellResultsData = eclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
std::shared_ptr<RigCaseCellResultsData> cellResultsData = eclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
ASSERT_NE( nullptr, cellResultsData );
auto allResults = cellResultsData->existingResults();
@@ -610,7 +610,7 @@ TEST( RifEclipseInputFileToolsTest, ExportKeywordsWithSubset )
ASSERT_TRUE( success ) << "Failed to load test grid file: " << errorMessages.toStdString();
RigCaseCellResultsData* cellResultsData = eclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
std::shared_ptr<RigCaseCellResultsData> cellResultsData = eclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
ASSERT_NE( nullptr, cellResultsData );
auto allResults = cellResultsData->existingResults();
@@ -662,7 +662,7 @@ TEST( RifEclipseInputFileToolsTest, ExportKeywordsWithRefinement )
ASSERT_TRUE( success ) << "Failed to load test grid file: " << errorMessages.toStdString();
RigCaseCellResultsData* cellResultsData = eclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
std::shared_ptr<RigCaseCellResultsData> cellResultsData = eclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
ASSERT_NE( nullptr, cellResultsData );
// Look specifically for PORO property in the results system
@@ -737,8 +737,8 @@ TEST( RifEclipseInputFileToolsTest, ExportKeywordsWithRefinement )
EXPECT_TRUE( propertyMap.find( "PORO" ) != propertyMap.end() ) << "Should have imported PORO property";
// Get the imported PORO data from both original and refined cases
RigCaseCellResultsData* originalResultsData = eclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
RigCaseCellResultsData* refinedResultsData = refinedEclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
std::shared_ptr<RigCaseCellResultsData> originalResultsData = eclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
std::shared_ptr<RigCaseCellResultsData> refinedResultsData = refinedEclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
RigEclipseResultAddress poroAddress( RiaDefines::ResultCatType::INPUT_PROPERTY, "PORO" );
@@ -764,7 +764,8 @@ TEST( RifEclipseInputFileToolsTest, ExportKeywordsWithRefinement )
EXPECT_EQ( refinedGrid->cellCount(), refinedData.size() ) << "Refined PORO data size should match refined cell count";
// Find an active cell to test the refinement mapping principle
auto findActiveCell = []( RigMainGrid* originalGrid, RigCaseCellResultsData* originalResultsData, const std::vector<double>& originalData )
auto findActiveCell =
[]( RigMainGrid* originalGrid, std::shared_ptr<RigCaseCellResultsData> originalResultsData, const std::vector<double>& originalData )
{
// Search for an active cell to test with
for ( size_t k = 0; k < originalGrid->cellCountK(); ++k )