Jacob Støren 2d85f1f1c5 Merge branch 'dev' into pre-proto

2017-06-05 11:40:13 +02:00

..

CMakeLists_files.cmake

#1487 Separated fracture files in Rim CMakeLists file

2017-06-02 09:23:24 +02:00

RimCompletionCellIntersectionCalc.cpp

#1543 Naming and fixes from review

2017-06-02 10:35:52 +02:00

RimCompletionCellIntersectionCalc.h

#1520 Establish new result type 'Completion Type'

2017-06-01 12:36:54 +02:00

RimEllipseFractureTemplate.cpp

Move fracture related models under completions folder

2017-06-01 14:25:38 +02:00

RimEllipseFractureTemplate.h

Move fracture related models under completions folder

2017-06-01 14:25:38 +02:00

RimFishbonesCollection.cpp

#1503 Added icons to fishbones and perforations

2017-06-05 11:12:13 +02:00

RimFishbonesCollection.h

#1532 Move completion related data models into separate completions folder

2017-05-30 14:50:43 +02:00

RimFishbonesMultipleSubs.cpp

#1503 Added icons to fishbones and perforations

2017-06-05 11:12:13 +02:00

RimFishbonesMultipleSubs.h

#1466 Fishbones MSW : Export of WSEGVALV

2017-06-02 12:50:16 +02:00

RimFishbonesPipeProperties.cpp

#1532 Move completion related data models into separate completions folder

2017-05-30 14:50:43 +02:00

RimFishbonesPipeProperties.h

#1532 Move completion related data models into separate completions folder

2017-05-30 14:50:43 +02:00

RimFishboneWellPath.cpp

#1503 Added icons to fishbones and perforations

2017-06-05 11:12:13 +02:00

RimFishboneWellPath.h

#1532 Move completion related data models into separate completions folder

2017-05-30 14:50:43 +02:00

RimFishboneWellPathCollection.cpp

#1503 Added icons to fishbones and perforations

2017-06-05 11:12:13 +02:00

RimFishboneWellPathCollection.h

#1532 Move completion related data models into separate completions folder

2017-05-30 14:50:43 +02:00

RimFracture.cpp

#1542 Perforation legnth and efficiency are only visible in GUI for Along-Well-oriented fracture, since the values are not used in the calculations for transverse and azimuth fratures.

2017-06-02 15:34:37 +02:00

RimFracture.h

Move fracture related models under completions folder

2017-06-01 14:25:38 +02:00

RimFractureExportSettings.cpp

Move fracture related models under completions folder

2017-06-01 14:25:38 +02:00

RimFractureExportSettings.h

Move fracture related models under completions folder

2017-06-01 14:25:38 +02:00

RimFractureTemplate.cpp

#1542 Perforation legnth and efficiency are only visible in GUI for Along-Well-oriented fracture, since the values are not used in the calculations for transverse and azimuth fratures.

2017-06-02 15:34:37 +02:00

RimFractureTemplate.h

Move fracture related models under completions folder

2017-06-01 14:25:38 +02:00

RimFractureTemplateCollection.cpp

#1503 Use fracture layout icon, and improve icon a bit

2017-06-05 09:15:31 +02:00

RimFractureTemplateCollection.h

Move fracture related models under completions folder

2017-06-01 14:25:38 +02:00

RimPerforationCollection.cpp

#1503 Added icons to fishbones and perforations

2017-06-05 11:12:13 +02:00

RimPerforationCollection.h

#1532 Move completion related data models into separate completions folder

2017-05-30 14:50:43 +02:00

RimPerforationInterval.cpp

#1503 Added icons to fishbones and perforations

2017-06-05 11:12:13 +02:00

RimPerforationInterval.h

#1534 Perforation Intervals : Do not include in export based on time step

2017-05-30 15:42:05 +02:00

RimSimWellFracture.cpp

Move fracture related models under completions folder

2017-06-01 14:25:38 +02:00

RimSimWellFracture.h

Move fracture related models under completions folder

2017-06-01 14:25:38 +02:00

RimSimWellFractureCollection.cpp

#1503 Use fracture layout icon, and improve icon a bit

2017-06-05 09:15:31 +02:00

RimSimWellFractureCollection.h

Move fracture related models under completions folder

2017-06-01 14:25:38 +02:00

RimStimPlanFractureTemplate.cpp

Move fracture related models under completions folder

2017-06-01 14:25:38 +02:00

RimStimPlanFractureTemplate.h

Move fracture related models under completions folder

2017-06-01 14:25:38 +02:00

RimWellPathCompletions.cpp

Merge branch 'dev' into pre-proto

2017-06-05 11:40:13 +02:00

RimWellPathCompletions.h

Merge branch 'fishbones' into pre-proto

2017-06-01 12:32:36 +02:00

RimWellPathFracture.cpp

Move fracture related models under completions folder

2017-06-01 14:25:38 +02:00

RimWellPathFracture.h

Move fracture related models under completions folder

2017-06-01 14:25:38 +02:00

RimWellPathFractureCollection.cpp

#1503 Use fracture layout icon, and improve icon a bit

2017-06-05 09:15:31 +02:00

RimWellPathFractureCollection.h

Move fracture related models under completions folder

2017-06-01 14:25:38 +02:00