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

Replace RiaApplication::instance()->project() with RimProject::current().

Browse Source 
Also remove uneccessary includes of RiaApplication.h.
This commit is contained in:
Kristian Bendiksen
2020-05-12 09:50:38 +02:00
committed by Magne Sjaastad
parent 7972ff8c02
commit c016c02e40
263 changed files with 320 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -148,7 +148,7 @@ RimEclipseCase::~RimEclipseCase()
delete m_fractureModelResults();
delete m_inputPropertyCollection;
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
if ( project )
{
if ( project->mainPlotCollection() )
@@ -365,7 +365,7 @@ const RigVirtualPerforationTransmissibilities* RimEclipseCase::computeAndGetVirt
std::vector<RimWellPath*> visibleWellPaths;
bool anyPerforationsPresent = false;
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
std::vector<RimWellPath*> wellPaths = proj->allWellPaths();
for ( auto w : wellPaths )
{
@@ -509,7 +509,7 @@ void RimEclipseCase::updateFormationNamesData()
// Update plots based on formations
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
if ( project )
{
if ( project->mainPlotCollection() )
@@ -940,7 +940,7 @@ bool RimEclipseCase::openReserviorCase()
createTimeStepFormatString();
// Associate existing well paths with simulation wells
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
for ( const auto& oilField : proj->oilFields() )
{
for ( const auto& wellPath : oilField->wellPathCollection()->wellPaths() )