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

#4204 Export faults as part of visible grid export

Browse Source 
#4204 Enable reading of faults from a different file than the main grid file
This commit is contained in:
Gaute Lindkvist
2019-03-21 10:35:52 +01:00
parent 88d2ad2c35
commit 677f42591b
11 changed files with 360 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ReservoirDataModel/RigFault.cpp
View File

@@ -90,7 +90,7 @@ const std::vector<size_t>& RigFault::connectionIndices() const
//--------------------------------------------------------------------------------------------------
/// Order FaultCellAndFace by i, j, face then k.
//--------------------------------------------------------------------------------------------------
bool RigFault::faultOrdering(FaultCellAndFace first, FaultCellAndFace second)
bool RigFault::ordering(CellAndFace first, CellAndFace second)
{
size_t i1, i2, j1, j2, k1, k2;
cvf::StructGridInterface::FaceType f1, f2;

4
ApplicationCode/ReservoirDataModel/RigFault.h
View File

@@ -76,7 +76,7 @@ private:
class RigFault : public cvf::Object
{
public:
typedef std::tuple<size_t, size_t, size_t, cvf::StructGridInterface::FaceType> FaultCellAndFace;
typedef std::tuple<size_t, size_t, size_t, cvf::StructGridInterface::FaceType> CellAndFace;
struct FaultFace
{
@@ -108,7 +108,7 @@ public:
std::vector<size_t>& connectionIndices();
const std::vector<size_t>& connectionIndices() const;
static bool faultOrdering(RigFault::FaultCellAndFace first, RigFault::FaultCellAndFace second);
static bool ordering(CellAndFace first, CellAndFace second);
private:
QString m_name;

10
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@@ -406,7 +406,15 @@ void RigMainGrid::setFaults(const cvf::Collection<RigFault>& faults)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const cvf::Collection<RigFault>& RigMainGrid::faults()
const cvf::Collection<RigFault>& RigMainGrid::faults() const
{
return m_faults;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::Collection<RigFault>& RigMainGrid::faults()
{
return m_faults;
}

3
ApplicationCode/ReservoirDataModel/RigMainGrid.h
View File

@@ -71,7 +71,8 @@ public:
RigNNCData* nncData();
void setFaults(const cvf::Collection<RigFault>& faults);
const cvf::Collection<RigFault>& faults();
const cvf::Collection<RigFault>& faults() const;
cvf::Collection<RigFault>& faults();
void calculateFaults(const RigActiveCellInfo* activeCellInfo);
void distributeNNCsToFaults();