Commit Graph

228 Commits

Author SHA1 Message Date
Magne Sjaastad
7104064937 #2089 Cross Plot : Add cross plot collection 2017-11-07 20:40:45 +01:00
Bjørn Erik Jensen
a35329555b #1948 PLT plot. Initial version, RFT plot copy 2017-10-25 14:36:18 +02:00
Bjørn Erik Jensen
b62d4448d9 #1976 RFT/PLT Plot. Prevent multiple well paths from associate to the same sim well 2017-10-25 09:55:55 +02:00
Magne Sjaastad
35a2769cab #2032 Curve Calculator : Rename of calculation and calculation collection 2017-10-23 14:42:38 +02:00
Rebecca Cox
3eaeba8f67 #2025 Formations : Use imported formation names by default when sensible 2017-10-20 16:10:48 +02:00
Magne Sjaastad
244916c0ed #2022 Curve Calculator : Calculated summary case is now available 2017-10-18 12:47:10 +02:00
Bjørn Erik Jensen
389234715c Well branches. Simple well branch cache 2017-10-12 11:05:28 +02:00
Magne Sjaastad
4b8186652f #1967 Curve Calculator : Add calculation objects and containers 2017-10-12 10:52:30 +02:00
Bjørn Erik Jensen
dcb1c40414 #1976 RFT/PLT Plot. Associate sim well and well path. RFT branch index impl 2017-10-11 13:53:05 +02:00
Bjørn Erik Jensen
9db96cbb1b #1943 Curve creator. RimProject::allSummaryCases also returns observed data 2017-09-28 14:42:13 +02:00
Bjørn Erik Jensen
70a41709cf #1842 RFT plot. Initial commit. Under construction... 2017-09-27 12:39:35 +02:00
Jacob Støren
64445e65b9 Moved Summary Plots collection above Well Log Plots 2017-09-26 10:50:09 +02:00
Magne Sjaastad
eb744f381d #1816 : Observed Data : Add mock data to RifReaderObservedData 2017-09-22 15:02:15 +02:00
Rebecca Cox
16f8b9771f #1815 Observed data: Add function to return vector of all observed data 2017-09-19 14:19:44 +02:00
Rebecca Cox
e1263888b4 #1813 Observed data: Observed data folder as an oilfield child 2017-09-19 14:19:44 +02:00
Bjørn Erik Jensen
6892273188 #1841 Curve creator. Improved case selection. Case grouping 2017-09-18 14:49:31 +02:00
Rebecca Cox
063542af1b #1751 #1840 Curves are connected to their case 2017-09-11 10:45:26 +02:00
Rebecca Cox
dd845e3dc7 #1751 Rename RimSummaryCaseCollection to RimSummaryCaseMainCollection 2017-09-06 16:32:52 +02:00
Magne Sjaastad
553b3bf63e #1794 Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 15:24:20 +02:00
Magne Sjaastad
bf3636a9df #1732 Update path to StimPlan xml if required 2017-08-03 13:21:19 +02:00
Bjørnar Grip Fjær
7179aaeac9 Merge branch 'dev' into pre-proto 2017-08-01 12:44:11 +02:00
Magne Sjaastad
78a779424f #1677 Store dialog data in project file 2017-06-30 16:14:15 +02:00
Bjørnar Grip Fjær
17593fba92 #1602 Include sim well fractures when calculating completion type results 2017-06-21 11:06:38 +02:00
Bjørnar Grip Fjær
78c948ea89 #1623 Schedule invalidation of completion type results instead of immediate calculation 2017-06-20 16:40:50 +02:00
Magne Sjaastad
a8b8e061d7 #1596 Merge dev into pre-proto 2017-06-14 07:25:34 +02:00
Magne Sjaastad
cf859e7c16 #1596 Rename from RimDefines to RiaDefines 2017-06-13 15:41:52 +02:00
Jacob Støren
2d85f1f1c5 Merge branch 'dev' into pre-proto 2017-06-05 11:40:13 +02:00
Bjørnar Grip Fjær
b82aed4bfc #1543 Naming and fixes from review 2017-06-02 10:35:52 +02:00
Jacob Støren
e7244d0b0b Merge dev into pre-proto. 2017-06-02 08:05:07 +02:00
Bjørnar Grip Fjær
b20a563517 #1520 Establish new result type 'Completion Type' 2017-06-01 12:36:54 +02:00
Magne Sjaastad
a45aee0cc2 Merge branch 'fishbones' into pre-proto 2017-05-23 10:28:42 +02:00
Bjørnar Grip Fjær
3fc0a59f06 #1444 Reallocate summary case file names when opening project 2017-05-03 12:32:03 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
Jacob Støren
cde71ef07a #1344 AppFwk: Renamed methods in uiTreeOrdering to align with uiOrdering 2017-03-22 15:57:04 +01:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Magne Sjaastad
647b4348eb Renamed to eclipseCaseData 2017-03-15 09:10:16 +01:00
astridkbjorke
22ee6250bd (#1137) - pre-proto - Adding delete/new command for stimplan fracture templates. Removing RimStimPlanFractureDefinition, functionality moved into RimStimPlanFractureTemplate. Renaming RimFractureDefinitionCollection to RimFractureTemplateCollection. 2017-02-10 09:54:37 +01:00
Magne Sjaastad
36bcdab426 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
2017-01-18 12:19:07 +01:00
Magne Sjaastad
0cbdcd587d #1105 Stripped down basic infrastructure code 2017-01-13 13:32:17 +01:00
Magne Sjaastad
9cd17ec508 Merge dev into pre-proto
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseView.cpp
	ApplicationCode/ProjectDataModel/RimEclipseView.h
2017-01-10 10:09:44 +01:00
Magne Sjaastad
8970d93a4d #1068 Renamed to RigEclipseCaseData 2017-01-10 09:51:39 +01:00
Magne Sjaastad
f70806e056 #1068 Avoid include of RigCell.h and RigSingleWellResultsData in RigCaseData.h 2017-01-10 09:20:03 +01:00
astridkbjorke
b6053147df #1037 - pre-proto - Changed RimFracture to RimWellPathFracture (and same for FractureCollection and commands to create / delete fractures) 2017-01-02 11:59:30 +01:00
astridkbjorke
f6221340b1 Merge branch 'dev' 2016-12-21 08:38:52 +01:00
Magne Sjaastad
455e99d9cd #1018 Delete multiSnapshotDefinitions on project close 2016-12-21 07:14:15 +01:00
astridkbjorke
ab6e12eb3a #1038 - pre-proto - Added command feature for creating new well log collection fracture from context menu in project tree 2016-12-20 09:53:19 +01:00
astridkbjorke
5806dc24ab #1036 - pre-proto - Added RimFractureDefinitionCollection 2016-12-16 14:38:27 +01:00
astridkbjorke
be23a2ee84 #1037 - pre-proto - Added RimFracture and RimFractureCollection 2016-12-16 14:05:11 +01:00
astridkbjorke
2df403245e #1036 - pre-proto - Added fracture definition for storing description of simple fractures 2016-12-16 10:15:23 +01:00
Magne Sjaastad
331456e619 #1018 : Snapshot : Added table editor to export dialog 2016-12-09 11:11:16 +01:00