use unique_ptr

This commit is contained in:
Kristian Bendiksen committed 2025-12-22 20:10:35 +01:00
1 parent e88e436108
commit 0e56a1e589
38 files changed
+173 -196

No files matched your search

@@ -243,7 +243,7 @@ std::expected<std::vector<double>, std::string> RifEclipseInputFileTools::extrac
const cvf::Vec3st& maxIn,
const cvf::Vec3st& refinement )
{
std::shared_ptr<RigCaseCellResultsData> cellResultsData = eclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
RigCaseCellResultsData* cellResultsData = eclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
RigActiveCellInfo* activeCells = cellResultsData->activeCellInfo();
RigMainGrid* mainGrid = eclipseCase->mainGrid();
@@ -86,8 +86,8 @@ void RifEclipseOutputFileTools::createResultEntries( const std::vector<RifEclips
{
if ( !eclipseCaseData ) return;
std::shared_ptr<RigCaseCellResultsData> matrixModelResults = eclipseCaseData->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
std::shared_ptr<RigCaseCellResultsData> fractureModelResults = eclipseCaseData->results( RiaDefines::PorosityModelType::FRACTURE_MODEL );
RigCaseCellResultsData* matrixModelResults = eclipseCaseData->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
RigCaseCellResultsData* fractureModelResults = eclipseCaseData->results( RiaDefines::PorosityModelType::FRACTURE_MODEL );
{
auto validKeywords = validKeywordsForPorosityModel( fileKeywordInfo,
@@ -547,7 +547,7 @@ void RifReaderEclipseOutput::setHdf5FileName( const QString& fileName )
{
CVF_ASSERT( m_eclipseCaseData );
std::shared_ptr<RigCaseCellResultsData> matrixModelResults = m_eclipseCaseData->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
RigCaseCellResultsData* matrixModelResults = m_eclipseCaseData->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
CVF_ASSERT( matrixModelResults );
if ( fileName.isEmpty() )
@@ -35,7 +35,7 @@ bool RifReaderMockModel::open( const QString& fileName, RigEclipseCaseData* ecli
m_reservoir = eclipseCase;
std::shared_ptr<RigCaseCellResultsData> cellResults = eclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
RigCaseCellResultsData* cellResults = eclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
std::vector<RigEclipseTimeStepInfo> timeStepInfos;
{
@@ -56,7 +56,7 @@ RifReaderOpmCommonActive::~RifReaderOpmCommonActive()
bool RifReaderOpmCommonActive::importGrid( RigMainGrid* /* mainGrid*/, RigEclipseCaseData* eclipseCaseData )
{
RigActiveCellGrid* activeGrid = new RigActiveCellGrid();
eclipseCaseData->setMainGrid( std::shared_ptr<RigMainGrid>( activeGrid ) );
eclipseCaseData->setMainGrid( std::unique_ptr<RigMainGrid>( activeGrid ) );
caf::ProgressInfo progInfo( 4, "Importing Eclipse Grid" );