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

84
ApplicationCode/ReservoirDataModel/RigFault.h
View File

@@ -2,29 +2,28 @@
//
// 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.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cvfObject.h"
#include "cvfVector3.h"
#include "cvfBoundingBox.h"
#include "cvfStructGrid.h"
#include "cvfCellRange.h"
#include "cvfObject.h"
#include "cvfStructGrid.h"
#include "cvfVector3.h"
#include <QString>
@@ -35,43 +34,45 @@
class RigMainGrid;
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
class RigFaultsPrCellAccumulator : public cvf::Object
{
public:
enum { NO_FAULT = -1, UNKNOWN_FAULT = -2 };
enum
{
NO_FAULT = -1,
UNKNOWN_FAULT = -2
};
public:
explicit RigFaultsPrCellAccumulator(size_t reservoirCellCount)
{
std::array<int, 6> initVals = { NO_FAULT, NO_FAULT, NO_FAULT, NO_FAULT, NO_FAULT, NO_FAULT};
m_faultIdxForCellFace.resize(reservoirCellCount, initVals);
explicit RigFaultsPrCellAccumulator( size_t reservoirCellCount )
{
std::array<int, 6> initVals = {NO_FAULT, NO_FAULT, NO_FAULT, NO_FAULT, NO_FAULT, NO_FAULT};
m_faultIdxForCellFace.resize( reservoirCellCount, initVals );
}
inline int faultIdx(size_t reservoirCellIndex, cvf::StructGridInterface::FaceType face) const
inline int faultIdx( size_t reservoirCellIndex, cvf::StructGridInterface::FaceType face ) const
{
// Ensure no crash after creating temporary LGRs
if (reservoirCellIndex < m_faultIdxForCellFace.size())
if ( reservoirCellIndex < m_faultIdxForCellFace.size() )
{
return m_faultIdxForCellFace[reservoirCellIndex][face];
}
return NO_FAULT;
}
inline void setFaultIdx(size_t reservoirCellIndex, cvf::StructGridInterface::FaceType face, int faultIdx)
inline void setFaultIdx( size_t reservoirCellIndex, cvf::StructGridInterface::FaceType face, int faultIdx )
{
m_faultIdxForCellFace[reservoirCellIndex][face] = faultIdx;
}
private:
std::vector<std::array<int, 6>> m_faultIdxForCellFace;
std::vector<std::array<int, 6>> m_faultIdxForCellFace;
};
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
class RigFault : public cvf::Object
{
@@ -80,43 +81,46 @@ public:
struct FaultFace
{
FaultFace(size_t nativeReservoirCellIndex, cvf::StructGridInterface::FaceType nativeFace, size_t oppositeReservoirCellIndex) :
m_nativeReservoirCellIndex(nativeReservoirCellIndex),
m_nativeFace(nativeFace),
m_oppositeReservoirCellIndex(oppositeReservoirCellIndex)
{ }
FaultFace( size_t nativeReservoirCellIndex,
cvf::StructGridInterface::FaceType nativeFace,
size_t oppositeReservoirCellIndex )
: m_nativeReservoirCellIndex( nativeReservoirCellIndex )
, m_nativeFace( nativeFace )
, m_oppositeReservoirCellIndex( oppositeReservoirCellIndex )
{
}
size_t m_nativeReservoirCellIndex;
cvf::StructGridInterface::FaceType m_nativeFace;
size_t m_oppositeReservoirCellIndex;
size_t m_nativeReservoirCellIndex;
cvf::StructGridInterface::FaceType m_nativeFace;
size_t m_oppositeReservoirCellIndex;
};
public:
RigFault();
void setName(const QString& name);
void setName( const QString& name );
QString name() const;
void addCellRangeForFace(cvf::StructGridInterface::FaceType face, const cvf::CellRange& cellRange);
void computeFaultFacesFromCellRanges(const RigMainGrid* grid);
void addCellRangeForFace( cvf::StructGridInterface::FaceType face, const cvf::CellRange& cellRange );
void computeFaultFacesFromCellRanges( const RigMainGrid* grid );
void accumulateFaultsPrCell(RigFaultsPrCellAccumulator* faultsPrCellAcc, int faultIdx);
void accumulateFaultsPrCell( RigFaultsPrCellAccumulator* faultsPrCellAcc, int faultIdx );
std::vector<FaultFace>& faultFaces();
const std::vector<FaultFace>& faultFaces() const;
std::vector<FaultFace>& faultFaces();
const std::vector<FaultFace>& faultFaces() const;
std::vector<size_t>& connectionIndices();
const std::vector<size_t>& connectionIndices() const;
std::vector<size_t>& connectionIndices();
const std::vector<size_t>& connectionIndices() const;
static bool ordering(CellAndFace first, CellAndFace second);
static bool ordering( CellAndFace first, CellAndFace second );
private:
QString m_name;
std::array<std::vector<cvf::CellRange>, 6> m_cellRangesForFaces;
std::vector<FaultFace> m_faultFaces;
std::vector<size_t> m_connectionIndices;
std::vector<size_t> m_connectionIndices;
static cvf::ref<RigFaultsPrCellAccumulator> m_faultsPrCellAcc;
};