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

Files fixed after merge conflicts

Browse Source
This commit is contained in:
Magne Sjaastad
2014-04-14 09:25:27 +02:00
parent 0562f92585 770f706803
commit ce33c00219
7 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
View File

@@ -253,8 +253,11 @@ void RigReservoirBuilderMock::populateReservoir(RigCaseData* eclipseCase)
{
addWellData(eclipseCase, eclipseCase->mainGrid());
}
<<<<<<< HEAD
addFaults(eclipseCase);
=======
>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
// Set all cells active
RigActiveCellInfo* activeCellInfo = eclipseCase->activeCellInfo(RifReaderInterface::MATRIX_RESULTS);
@@ -492,6 +495,7 @@ void RigReservoirBuilderMock::addWellData(RigCaseData* eclipseCase, RigGridBase*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
<<<<<<< HEAD
void RigReservoirBuilderMock::addFaults(RigCaseData* eclipseCase)
{
if (!eclipseCase) return;
@@ -529,6 +533,8 @@ void RigReservoirBuilderMock::addFaults(RigCaseData* eclipseCase)
grid->setFaults(faults);
}
=======
>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
void RigReservoirBuilderMock::enableWellData(bool enableWellData)
{
m_enableWellData = false;