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

Fix after merge conflicts take two

Browse Source
This commit is contained in:
Magne Sjaastad
2014-04-14 10:24:15 +02:00
parent ce33c00219
commit 7b68c3cb6b
7 changed files with 4 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
View File

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