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

clang-format : Set PenaltyBreakAssignment to 130

Browse Source
This commit is contained in:
Magne Sjaastad
2019-11-04 15:08:09 +01:00
parent 7c8cf60dba
commit 57cab2457e
105 changed files with 596 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp
View File

@@ -101,11 +101,8 @@ cvf::ref<RigResultAccessor> RigResultAccessorFactory::createFromResultAddress( c
adjustedTimeStepIndex = 0;
}
cvf::ref<RigResultAccessor> derivedCandidate = createCombinedResultAccessor( eclipseCase,
gridIndex,
porosityModel,
adjustedTimeStepIndex,
resVarAddr );
cvf::ref<RigResultAccessor> derivedCandidate =
createCombinedResultAccessor( eclipseCase, gridIndex, porosityModel, adjustedTimeStepIndex, resVarAddr );
if ( derivedCandidate.notNull() ) return derivedCandidate;
@@ -136,23 +133,26 @@ cvf::ref<RigResultAccessor>
cvf::ref<RigCombTransResultAccessor> cellFaceAccessObject = new RigCombTransResultAccessor( grid );
nativeAddr.m_resultName = "TRANX";
cvf::ref<RigResultAccessor> xTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
gridIndex,
porosityModel,
timeStepIndex,
nativeAddr );
nativeAddr.m_resultName = "TRANY";
cvf::ref<RigResultAccessor> yTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
gridIndex,
porosityModel,
timeStepIndex,
nativeAddr );
nativeAddr.m_resultName = "TRANZ";
cvf::ref<RigResultAccessor> zTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
gridIndex,
porosityModel,
timeStepIndex,
nativeAddr );
cvf::ref<RigResultAccessor> xTransAccessor =
RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
gridIndex,
porosityModel,
timeStepIndex,
nativeAddr );
nativeAddr.m_resultName = "TRANY";
cvf::ref<RigResultAccessor> yTransAccessor =
RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
gridIndex,
porosityModel,
timeStepIndex,
nativeAddr );
nativeAddr.m_resultName = "TRANZ";
cvf::ref<RigResultAccessor> zTransAccessor =
RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
gridIndex,
porosityModel,
timeStepIndex,
nativeAddr );
cellFaceAccessObject->setTransResultAccessors( xTransAccessor.p(), yTransAccessor.p(), zTransAccessor.p() );
@@ -216,24 +216,27 @@ cvf::ref<RigResultAccessor>
cvf::ref<RigCombTransResultAccessor> cellFaceAccessObject = new RigCombTransResultAccessor( grid );
nativeAddr.m_resultName = RiaDefines::riTranXResultName();
cvf::ref<RigResultAccessor> xTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
gridIndex,
porosityModel,
timeStepIndex,
nativeAddr );
nativeAddr.m_resultName = RiaDefines::riTranYResultName();
cvf::ref<RigResultAccessor> yTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
gridIndex,
porosityModel,
timeStepIndex,
nativeAddr );
nativeAddr.m_resultName = RiaDefines::riTranZResultName();
cvf::ref<RigResultAccessor> zTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
gridIndex,
porosityModel,
timeStepIndex,
nativeAddr );
nativeAddr.m_resultName = RiaDefines::riTranXResultName();
cvf::ref<RigResultAccessor> xTransAccessor =
RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
gridIndex,
porosityModel,
timeStepIndex,
nativeAddr );
nativeAddr.m_resultName = RiaDefines::riTranYResultName();
cvf::ref<RigResultAccessor> yTransAccessor =
RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
gridIndex,
porosityModel,
timeStepIndex,
nativeAddr );
nativeAddr.m_resultName = RiaDefines::riTranZResultName();
cvf::ref<RigResultAccessor> zTransAccessor =
RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
gridIndex,
porosityModel,
timeStepIndex,
nativeAddr );
cellFaceAccessObject->setTransResultAccessors( xTransAccessor.p(), yTransAccessor.p(), zTransAccessor.p() );
@@ -463,8 +466,8 @@ cvf::ref<RigResultAccessor>
return nullptr;
}
const std::vector<std::vector<double>>& scalarSetResults = eclipseCase->results( porosityModel )
->cellScalarResults( resultAddress );
const std::vector<std::vector<double>>& scalarSetResults =
eclipseCase->results( porosityModel )->cellScalarResults( resultAddress );
if ( timeStepIndex >= scalarSetResults.size() )
{
@@ -485,10 +488,8 @@ cvf::ref<RigResultAccessor>
bool useGlobalActiveIndex = eclipseCase->results( porosityModel )->isUsingGlobalActiveIndex( resultAddress );
if ( useGlobalActiveIndex )
{
cvf::ref<RigResultAccessor> object = new RigActiveCellsResultAccessor( grid,
resultValues,
eclipseCase->activeCellInfo(
porosityModel ) );
cvf::ref<RigResultAccessor> object =
new RigActiveCellsResultAccessor( grid, resultValues, eclipseCase->activeCellInfo( porosityModel ) );
return object;
}
else