OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-11 07:56:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,179 Commits 29 Branches 61 Tags 290 MiB
dceae0581e
Commit Graph

117 Commits

Author SHA1 Message Date
Magne Sjaastad
dd912b4f97 Merge branch 'dev' into pre-proto 2017-06-08 14:09:03 +02:00
Bjørnar Grip Fjær
f1b4b735ff #1573 Created own unit system class 2017-06-06 14:57:32 +02:00
Bjørnar Grip Fjær
0318a8c455 Move fracture related models under completions folder 2017-06-01 14:25:38 +02:00
Bjørnar Grip Fjær
935299b3df Merge branch 'fishbones' into pre-proto 2017-06-01 12:32:36 +02:00
Bjørnar Grip Fjær
ffb084a78b #1532 Move completion related data models into separate completions folder 2017-05-30 14:50:43 +02:00
Bjørnar Grip Fjær
c55d381cbf #1532 Move export settings classes to commands folder 2017-05-30 14:37:51 +02:00
Bjørnar Grip Fjær
87cfb22efe #1464 Move well segment export to own feature 2017-05-29 15:39:37 +02:00
Magne Sjaastad
a45aee0cc2 Merge branch 'fishbones' into pre-proto 2017-05-23 10:28:42 +02:00
Magne Sjaastad
1853f97bbc #1495 Add WellPathCompletions 2017-05-19 14:04:01 +02:00
Bjørnar Grip Fjær
0b872dbf3a #1462 Add support for exporting WPIMULT 2017-05-16 09:43:41 +02:00
Bjørnar Grip Fjær
9bf361ed64 #1462 Create generic select file and eclipse case to export model 2017-05-15 16:04:53 +02:00
Bjørnar Grip Fjær
d3bcc1644c #1451 Add data structures for perforation intervals 2017-05-12 10:01:59 +02:00
Bjørnar Grip Fjær
34f00b07ef #1467 Data structure for completions 2017-05-10 17:03:10 +02:00
Magne Sjaastad
c35e79c3b5 Merge branch 'dev' into pre-proto 2017-04-20 13:40:56 +02:00
Jacob Støren
6c7dfdca7b #1395 Renamed TopologyItem to GeometrySelectionItem including Keywords with friends. 
Changed keyword to GridTimeHistoryCurve (previously missing Grid)
 2017-04-04 16:10:00 +02:00
Magne Sjaastad
866f62410f #1371 opm-parser : Removed project data model files 2017-04-04 13:53:44 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
astridkbjorke
6d791ca3e0 Pre-proto - Fixing compile issues after rename 2017-03-29 11:31:26 +02:00
astridkbjorke
520ab45649 1363 - pre-proto - Creating class StimPlanCell and using this class when displaying stimPlan mesh on fracture 2017-03-27 14:19:21 +02:00
Magne Sjaastad
388fa2b70e #1322 Added GridTimeHistoryCurve and topology picking items 2017-03-19 08:15:41 +01:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Magne Sjaastad
ecfd61ce68 #1288 Moved copy of camera properties to RimViewManipulator 2017-03-10 13:13:31 +01:00
Magne Sjaastad
cc5f5eddd0 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
 2017-02-22 13:12:23 +01:00
Magne Sjaastad
8eb8a6fd3b #1248 Add namedObject and checkableNamedObject 2017-02-22 13:09:31 +01:00
Magne Sjaastad
1753449772 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
 2017-02-22 09:42:51 +01:00
Magne Sjaastad
401918910a #1231 Moved category handling to new class RimPropertyFilter 2017-02-21 08:57:40 +01:00
Magne Sjaastad
b7aebbb392 #1230 Created StimPlan colors and show lenged in 3D view 2017-02-20 09:31:24 +01:00
Magne Sjaastad
aef913739c #1230 Added StimPlan legend configuration object 2017-02-17 09:28:46 +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
astridkbjorke
d52cfc0f0b (#1136, #1137) - pre-proto - Adding base class RimFractureTemplte, and classes for stimPlan fractureTemplate and data structures. Also adding features for creating new stimPlan Fracture templates. 2017-02-10 09:52:18 +01:00
Magne Sjaastad
e845ae1ed8 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/CMakeLists.txt
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
 2017-01-24 15:23:02 +01:00
Jacob Støren
43249f7af8 Refactor related to #1106, #1107, #1109, #1113. Refactored the MDI control 
of windows. This might introduce problems.
 2017-01-19 17:54:01 +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
fcd2a09f83 #1105 Created new folder for flow project files 2017-01-12 15:00:23 +01:00
astridkbjorke
ba2362ffce pre-proto - Update cmake file after rename (forgotten in last commit) 2017-01-12 13:31:33 +01:00
astridkbjorke
44aefe6ed7 pre-proto - Rename RimFractureDefinition to RimFractureEllipseDefinition 2017-01-12 10:33:33 +01:00
astridkbjorke
9bba00999e #1092 - pre-proto - Added feature for exporting fracture data to file. File is written, but not with any useful information yet. 2017-01-11 14:32:42 +01:00
Magne Sjaastad
db3f7d6650 #1069 : pre-proto - Added empty files related to RigFracture 2017-01-02 14:13:34 +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
e6ef4fee42 #1037 - pre-proto - added classes RimSimWellFracture and RimSimWellFractureCollection, and functions for creating new / deleting. 2017-01-02 11:10:25 +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
Jacob Støren
8f65bd3fee #1028 Flow Diag Solution object. #1029 Flow Diag Result type in Result Definition along with some refactoring. 2016-12-14 09:50:30 +01:00
Magne Sjaastad
242dbd3693 #1018 Snapshot : Added RimMultiSnapshotDefinition 2016-12-09 10:01:50 +01:00
Magne Sjaastad
b38c1986aa #864 Moved summary files into separate folder 2016-11-05 13:31:14 +01:00
Magne Sjaastad
62411301da (#840) Summary : Added properties for time axis 2016-10-12 10:14:48 +02:00
Magne Sjaastad
c07f13d407 (#869) Summary : Right axis WIP 2016-10-12 10:08:08 +02:00
Magne Sjaastad
63ed368b5c (#857) Summary : Added properties for left and right Y-axis 2016-10-12 10:08:08 +02:00
Jacob Støren
1349cf0104 #900 Merged Intersection Boxes into Intersections folder 2016-09-30 08:40:46 +02:00