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

Merge remote-tracking branch 'origin/2018.01.01-patch' into dev

Browse Source
This commit is contained in:
Rebecca Cox
2018-01-24 10:56:10 +01:00
parent 7c47783e3a 650fc2147d
commit 97aab5bda5
12 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimIntersectionCollection.h
View File

@@ -48,9 +48,9 @@ public:
caf::PdmField<bool> isActive;
void appendIntersection(RimIntersection* intersection);
void appendIntersectionBox(RimIntersectionBox* intersectionBox);
void appendIntersectionAndUpdate(RimIntersection* intersection);
void appendIntersectionBoxAndUpdate(RimIntersectionBox* intersectionBox);
bool hasActiveIntersectionForSimulationWell(const RimSimWellInView* simWell) const;