Merge branch 'fishbones' into pre-proto

This commit is contained in:
Bjørnar Grip Fjær
2017-06-01 12:32:36 +02:00
97 changed files with 9865 additions and 1293 deletions
@@ -78,7 +78,9 @@ public:
caf::PdmChildField<RimWellLogFile*> m_wellLogFile;
RimFishbonesCollection* fishbonesCollection();
const RimFishbonesCollection* fishbonesCollection() const;
RimPerforationCollection* perforationIntervalCollection();
const RimPerforationCollection* perforationIntervalCollection() const;
RimWellPathFractureCollection* fractureCollection();
RigWellPath* wellPathGeometry();