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

Janitor: Remove deprecated method.

Browse Source
This commit is contained in:
Kristian Bendiksen
2023-09-11 15:12:18 +02:00
committed by Magne Sjaastad
parent 5ecf621357
commit 1899184a41
38 changed files with 109 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
ApplicationLibCode/ProjectDataModel/RimProject.cpp
View File

@@ -554,8 +554,50 @@ std::vector<RimCase*> RimProject::allGridCases() const
{
std::vector<RimCase*> cases;
// TODO: Move code from allCases here
allCases( cases );
for ( size_t oilFieldIdx = 0; oilFieldIdx < oilFields().size(); oilFieldIdx++ )
{
RimOilField* oilField = oilFields[oilFieldIdx];
if ( !oilField ) continue;
RimEclipseCaseCollection* analysisModels = oilField->analysisModels();
if ( analysisModels )
{
for ( size_t caseIdx = 0; caseIdx < analysisModels->cases.size(); caseIdx++ )
{
cases.push_back( analysisModels->cases[caseIdx] );
}
for ( size_t cgIdx = 0; cgIdx < analysisModels->caseGroups.size(); cgIdx++ )
{
// Load the Main case of each IdenticalGridCaseGroup
RimIdenticalGridCaseGroup* cg = analysisModels->caseGroups[cgIdx];
if ( cg == nullptr ) continue;
if ( cg->statisticsCaseCollection() )
{
for ( size_t caseIdx = 0; caseIdx < cg->statisticsCaseCollection()->reservoirs.size(); caseIdx++ )
{
cases.push_back( cg->statisticsCaseCollection()->reservoirs[caseIdx] );
}
}
if ( cg->caseCollection() )
{
for ( size_t caseIdx = 0; caseIdx < cg->caseCollection()->reservoirs.size(); caseIdx++ )
{
cases.push_back( cg->caseCollection()->reservoirs[caseIdx] );
}
}
}
}
RimGeoMechModels* geomModels = oilField->geoMechModels();
if ( geomModels )
{
for ( auto acase : geomModels->cases() )
{
cases.push_back( acase );
}
}
}
return cases;
}
@@ -637,57 +679,6 @@ void RimProject::assignPlotIdToPlotWindow( RimPlotWindow* plotWindow )
}
}
//--------------------------------------------------------------------------------------------------
/// TODO: This function is deprecated, use allGridCases()
//--------------------------------------------------------------------------------------------------
void RimProject::allCases( std::vector<RimCase*>& cases ) const
{
for ( size_t oilFieldIdx = 0; oilFieldIdx < oilFields().size(); oilFieldIdx++ )
{
RimOilField* oilField = oilFields[oilFieldIdx];
if ( !oilField ) continue;
RimEclipseCaseCollection* analysisModels = oilField->analysisModels();
if ( analysisModels )
{
for ( size_t caseIdx = 0; caseIdx < analysisModels->cases.size(); caseIdx++ )
{
cases.push_back( analysisModels->cases[caseIdx] );
}
for ( size_t cgIdx = 0; cgIdx < analysisModels->caseGroups.size(); cgIdx++ )
{
// Load the Main case of each IdenticalGridCaseGroup
RimIdenticalGridCaseGroup* cg = analysisModels->caseGroups[cgIdx];
if ( cg == nullptr ) continue;
if ( cg->statisticsCaseCollection() )
{
for ( size_t caseIdx = 0; caseIdx < cg->statisticsCaseCollection()->reservoirs.size(); caseIdx++ )
{
cases.push_back( cg->statisticsCaseCollection()->reservoirs[caseIdx] );
}
}
if ( cg->caseCollection() )
{
for ( size_t caseIdx = 0; caseIdx < cg->caseCollection()->reservoirs.size(); caseIdx++ )
{
cases.push_back( cg->caseCollection()->reservoirs[caseIdx] );
}
}
}
}
RimGeoMechModels* geomModels = oilField->geoMechModels();
if ( geomModels )
{
for ( auto acase : geomModels->cases() )
{
cases.push_back( acase );
}
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -754,8 +745,7 @@ RimSummaryCaseMainCollection* RimProject::firstSummaryCaseMainCollection() const
//--------------------------------------------------------------------------------------------------
void RimProject::allNotLinkedViews( std::vector<Rim3dView*>& views )
{
std::vector<RimCase*> cases;
allCases( cases );
std::vector<RimCase*> cases = allGridCases();
std::vector<Rim3dView*> alreadyLinkedViews;
if ( viewLinkerCollection->viewLinker() )
@@ -796,8 +786,7 @@ void RimProject::allNotLinkedViews( std::vector<Rim3dView*>& views )
//--------------------------------------------------------------------------------------------------
void RimProject::allViews( std::vector<Rim3dView*>& views ) const
{
std::vector<RimCase*> cases;
allCases( cases );
std::vector<RimCase*> cases = allGridCases();
for ( size_t caseIdx = 0; caseIdx < cases.size(); caseIdx++ )
{
@@ -832,8 +821,7 @@ void RimProject::allViews( std::vector<Rim3dView*>& views ) const
//--------------------------------------------------------------------------------------------------
void RimProject::allVisibleViews( std::vector<Rim3dView*>& views ) const
{
std::vector<RimCase*> cases;
allCases( cases );
std::vector<RimCase*> cases = allGridCases();
for ( size_t caseIdx = 0; caseIdx < cases.size(); caseIdx++ )
{
@@ -870,8 +858,7 @@ void RimProject::allVisibleGridViews( std::vector<RimGridView*>& views ) const
//--------------------------------------------------------------------------------------------------
void RimProject::scheduleCreateDisplayModelAndRedrawAllViews()
{
std::vector<RimCase*> cases;
allCases( cases );
std::vector<RimCase*> cases = allGridCases();
for ( size_t caseIdx = 0; caseIdx < cases.size(); caseIdx++ )
{
RimCase* rimCase = cases[caseIdx];
@@ -933,8 +920,7 @@ const RimOilField* RimProject::activeOilField() const
//--------------------------------------------------------------------------------------------------
void RimProject::computeUtmAreaOfInterest()
{
std::vector<RimCase*> cases;
allCases( cases );
std::vector<RimCase*> cases = allGridCases();
cvf::BoundingBox projectBB;
@@ -1064,13 +1050,13 @@ RimDialogData* RimProject::dialogData() const
//--------------------------------------------------------------------------------------------------
std::vector<RimEclipseCase*> RimProject::eclipseCases() const
{
std::vector<RimEclipseCase*> allCases;
std::vector<RimEclipseCase*> allGridCases;
for ( const auto& oilField : oilFields )
{
const auto& cases = oilField->analysisModels->cases;
allCases.insert( allCases.end(), cases.begin(), cases.end() );
allGridCases.insert( allGridCases.end(), cases.begin(), cases.end() );
}
return allCases;
return allGridCases;
}
//--------------------------------------------------------------------------------------------------
@@ -1346,8 +1332,7 @@ std::vector<RimValveTemplate*> RimProject::allValveTemplates() const
//--------------------------------------------------------------------------------------------------
caf::AppEnum<RiaDefines::EclipseUnitSystem> RimProject::commonUnitSystemForAllCases() const
{
std::vector<RimCase*> rimCases;
allCases( rimCases );
std::vector<RimCase*> rimCases = allGridCases();
RiaDefines::EclipseUnitSystem commonUnitSystem = RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN;