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

#4683 clang-format on all files in ApplicationCode

Browse Source
This commit is contained in:
Magne Sjaastad
2019-09-06 10:40:57 +02:00
parent 3a317504bb
commit fe9e567825
2092 changed files with 117952 additions and 111846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp
View File

@@ -2,17 +2,17 @@
//
// Copyright (C) Statoil ASA
// Copyright (C) Ceetron Solutions AS
//
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
@@ -25,56 +25,58 @@
#include <cmath>
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
cvf::ref<RigResultModifier> RigResultModifierFactory::createResultModifier(RigEclipseCaseData* eclipseCase,
size_t gridIndex,
RiaDefines::PorosityModelType porosityModel,
size_t timeStepIndex,
const RigEclipseResultAddress& resVarAddr)
cvf::ref<RigResultModifier> RigResultModifierFactory::createResultModifier( RigEclipseCaseData* eclipseCase,
size_t gridIndex,
RiaDefines::PorosityModelType porosityModel,
size_t timeStepIndex,
const RigEclipseResultAddress& resVarAddr )
{
if ( !eclipseCase ) return nullptr;
if (!eclipseCase->results(porosityModel) || !eclipseCase->activeCellInfo(porosityModel))
if ( !eclipseCase->results( porosityModel ) || !eclipseCase->activeCellInfo( porosityModel ) )
{
return nullptr;
}
if (!resVarAddr.isValid())
if ( !resVarAddr.isValid() )
{
return nullptr;
}
RigGridBase* grid = eclipseCase->grid(gridIndex);
if (!grid)
RigGridBase* grid = eclipseCase->grid( gridIndex );
if ( !grid )
{
return nullptr;
}
std::vector< std::vector<double> >& scalarSetResults = eclipseCase->results(porosityModel)->modifiableCellScalarResultTimesteps(resVarAddr);
std::vector<std::vector<double>>& scalarSetResults = eclipseCase->results( porosityModel )
->modifiableCellScalarResultTimesteps( resVarAddr );
if (timeStepIndex >= scalarSetResults.size())
if ( timeStepIndex >= scalarSetResults.size() )
{
return nullptr;
}
std::vector<double>* resultValues = nullptr;
if (timeStepIndex < scalarSetResults.size())
if ( timeStepIndex < scalarSetResults.size() )
{
resultValues = &(scalarSetResults[timeStepIndex]);
resultValues = &( scalarSetResults[timeStepIndex] );
}
bool useGlobalActiveIndex = eclipseCase->results(porosityModel)->isUsingGlobalActiveIndex(resVarAddr);
if (useGlobalActiveIndex)
bool useGlobalActiveIndex = eclipseCase->results( porosityModel )->isUsingGlobalActiveIndex( resVarAddr );
if ( useGlobalActiveIndex )
{
cvf::ref<RigResultModifier> object = new RigActiveCellsResultModifier(grid, eclipseCase->activeCellInfo(porosityModel), resultValues);
cvf::ref<RigResultModifier> object = new RigActiveCellsResultModifier( grid,
eclipseCase->activeCellInfo( porosityModel ),
resultValues );
return object;
}
else
{
cvf::ref<RigResultModifier> object = new RigAllGridCellsResultModifier(grid, resultValues);
cvf::ref<RigResultModifier> object = new RigAllGridCellsResultModifier( grid, resultValues );
return object;
}
}