Commit Graph

596 Commits

Author SHA1 Message Date
Magne Sjaastad
d9750b2dd4 Produce geometry for all cells, not per grid
p4#: 21710
2013-05-24 09:54:32 +02:00
Magne Sjaastad
5d2249aaea Produce geometry for all cells, not per grid
p4#: 21710
2013-05-24 09:54:00 +02:00
Magne Sjaastad
e5b1921bdf Reorganized data so ijk are the first three indexes in the receiving Octave arrays.
Fixed a typo
p4#: 21708
2013-05-24 08:48:36 +02:00
Magne Sjaastad
f556171bec Use read/write functions of the stream to increase performance
p4#: 21699
2013-05-23 11:55:33 +02:00
Magne Sjaastad
511ea74d4e Use read/write functions of the stream to increase performance
p4#: 21698
2013-05-23 11:29:34 +02:00
Magne Sjaastad
d5fd09f658 Added riGetCellCorners/riGetActiveCellCorners
Updated how matrix is allocated in Octave for riGetCellCenters
p4#: 21697
2013-05-23 11:02:10 +02:00
Magne Sjaastad
e4bc6c9339 Added riGetActiveCellCenters
p4#: 21691
2013-05-22 09:54:39 +02:00
Jacob Støren
f0d315c55e Octave Interface: GetActiveCellProperty: Made timestep indices 1-based. Renamed the GetActiveCellProperty command where it was not yet done
p4#: 21690
2013-05-22 09:26:12 +02:00
Jacob Støren
90e61c254b Octave Interface: Rolled out use of common constant for DataStreamVersion
p4#: 21689
2013-05-22 09:18:57 +02:00
Magne Sjaastad
4b7ff209f6 Added getCellCenters
p4#: 21688
2013-05-22 08:11:39 +02:00
Magne Sjaastad
8a6234690c Added GetCoarseningInfo
Added coarse cells to mock model with results
p4#: 21686
2013-05-21 21:03:05 +02:00
Magne Sjaastad
9df895ddc7 FIxed missing return statement
p4#: 21685
2013-05-21 20:43:03 +02:00
Magne Sjaastad
1d2e1dcce1 Cleanup of includes
p4#: 21684
2013-05-21 15:27:42 +02:00
Jacob Støren
d947f68f83 Octave Interface: GetActiveCellProperty now handles coarsening
p4#: 21683
2013-05-21 14:35:47 +02:00
Jacob Støren
2009838b04 Octave: Updated GetActiveCellProperty to the new specification.
Still missing handling of coarse grids
p4#: 21677
2013-05-21 11:18:28 +02:00
Magne Sjaastad
eff924c630 Store coarsening boxes in RigGridBase
Assign index to coarse cells back to coarse box they are a part of
p4#: 21675
2013-05-21 11:10:59 +02:00
Magne Sjaastad
d6560d017e Added riGetGridDimensions
p4#: 21664
2013-05-16 15:16:51 +02:00
Magne Sjaastad
db18a855db Added GetTimeStepDays
p4#: 21662
2013-05-16 14:44:34 +02:00
Vidar Lundberg
163ce74052 Added visualization of Well Paths in reservoir views.
Added PDM objects for a list of well paths (RimWellPathCollection) and for individual well paths (RimWellPath).
RimWellPathCollection uses RivWellPathCollectionPartMgr to generate visualization parts for each well path in the collection.
RimWellPath handles geometry defined in RigWellPath, and RivWellPathPartMgr is used to generate visualization parts. The well path visualization parts are generated by reusing RivPipeGeometryGenerator (also used for well pipes).
Added features:
- Select Open Well Paths in File menu to open one or more well path files, file format supported is Statoil JSON format.
- Each well path has a label showing the name, and the PDM window will show additional info (Id, Source System, UTM Zone, Update Date and User, Survey Type, File Path).
- Possible to turn on / off visibility, set thickness, set color for individual well paths.
- List of well paths including specified parameters/settings will be stored in project file.
- Possible to clip all well paths at a specified distance to the reservoir as this is the relevant area to see, and if showing whole well path it may be problematic for auto zoom etc.
Known problems:
- Well paths are not shown in some types of reservoir views, for instance reservoir views showing well pipes. Will look into this later.
p4#: 21658
2013-05-16 14:10:22 +02:00
Vidar Lundberg
704facc1c1 Added some includes to get well path changes to compile, this is related to PDM include problems.
p4#: 21657
2013-05-16 14:02:59 +02:00
Magne Sjaastad
2303f30200 Added RiaSocketCommands as placeholder for new commands
Moved declaration to RiaSocketServer.h to be able to create new commands in other files
Added riGetTimeStepDates
p4#: 21655
2013-05-16 13:43:37 +02:00
Jacob Støren
bb0c4c37c1 SocketServer: Moved GetProperty command to new regime.
p4#: 21654
2013-05-16 13:29:38 +02:00
Vidar Lundberg
86a53980a4 Added visualization of Well Paths in reservoir views.
Added PDM objects for a list of well paths (RimWellPathCollection) and for individual well paths (RimWellPath).
RimWellPathCollection uses RivWellPathCollectionPartMgr to generate visualization parts for each well path in the collection.
RimWellPath handles geometry defined in RigWellPath, and RivWellPathPartMgr is used to generate visualization parts. The well path visualization parts are generated by reusing RivPipeGeometryGenerator (also used for well pipes).
Added features:
- Select Open Well Paths in File menu to open one or more well path files, file format supported is Statoil JSON format.
- Each well path has a label showing the name, and the PDM window will show additional info (Id, Source System, UTM Zone, Update Date and User, Survey Type, File Path).
- Possible to turn on / off visibility, set thickness, set color for individual well paths.
- List of well paths including specified parameters/settings will be stored in project file.
- Possible to clip all well paths at a specified distance to the reservoir as this is the relevant area to see, and if showing whole well path it may be problematic for auto zoom etc.
p4#: 21652
2013-05-16 13:06:00 +02:00
Vidar Lundberg
939c6ad156 Added visualization of Well Paths in reservoir views.
Added PDM objects for a list of well paths (RimWellPathCollection) and for individual well paths (RimWellPath).
RimWellPathCollection uses RivWellPathCollectionPartMgr to generate visualization parts for each well path in the collection.
RimWellPath handles geometry defined in RigWellPath, and RivWellPathPartMgr is used to generate visualization parts. The well path visualization parts are generated by reusing RivPipeGeometryGenerator (also used for well pipes).
Added features:
- Select Open Well Paths in File menu to open one or more well path files, file format supported is Statoil JSON format.
- Each well path has a label showing the name, and the PDM window will show additional info (Id, Source System, UTM Zone, Update Date and User, Survey Type, File Path).
- Possible to turn on / off visibility, set thickness, set color for individual well paths.
- List of well paths including specified parameters/settings will be stored in project file.
- Possible to clip all well paths at a specified distance to the reservoir as this is the relevant area to see, and if showing whole well path it may be problematic for auto zoom etc.
p4#: 21651
2013-05-16 12:59:35 +02:00
Vidar Lundberg
4a0c3d7ca9 Added visualization of Well Paths in reservoir views.
Added PDM objects for a list of well paths (RimWellPathCollection) and for individual well paths (RimWellPath).
RimWellPathCollection uses RivWellPathCollectionPartMgr to generate visualization parts for each well path in the collection.
RimWellPath handles geometry defined in RigWellPath, and RivWellPathPartMgr is used to generate visualization parts. The well path visualization parts are generated by reusing RivPipeGeometryGenerator (also used for well pipes).
Added features:
- Select Open Well Paths in File menu to open one or more well path files, file format supported is Statoil JSON format.
- Each well path has a label showing the name, and the PDM window will show additional info (Id, Source System, UTM Zone, Update Date and User, Survey Type, File Path).
- Possible to turn on / off visibility, set thickness, set color for individual well paths.
- List of well paths including specified parameters/settings will be stored in project file.
- Possible to clip all well paths at a specified distance to the reservoir as this is the relevant area to see, and if showing whole well path it may be problematic for auto zoom etc.
p4#: 21651
2013-05-16 12:59:01 +02:00
Jacob Støren
6173381652 SocketServer: GetActiveCellInfo moved to new regime
p4#: 21649
2013-05-16 12:44:43 +02:00
Jacob Støren
a63b2caae5 SocketServer: Converted GetMainGridDims to new regime
p4#: 21648
2013-05-16 11:47:42 +02:00
Jacob Støren
db168909d7 Fixed Windows compile issue
p4#: 21647
2013-05-16 11:27:34 +02:00
Jacob Støren
36d7c46e57 Socket Server: Rolled in separate command handler classes created by factory.
Translated several commands to the new regime.
p4#: 21645
2013-05-16 11:15:34 +02:00
Jacob Støren
739c530fcf Socket Server: Rolled in separate command handler classes created by factory.
Translated several commands to the new regime.
p4#: 21645
2013-05-16 11:14:57 +02:00
Vidar Lundberg
ac832866e6 Add Json parser based on code example found on:
http://stackoverflow.com/questions/4169988/easiest-way-to-parse-json-in-qt-4-7
p4#: 21634
2013-05-15 16:00:36 +02:00
Magne Sjaastad
dfd72c42a0 Added support for two optional input parameters, caseId and porosity model
p4#: 21631
2013-05-15 15:23:45 +02:00
Magne Sjaastad
6d8f6307f6 Find case based on caseId instead of case name/case index
Updated calculateMatrixModelActiveCellInfo()  to include coarse box index and use 1-based index for IJK values
p4#: 21629
2013-05-15 14:37:03 +02:00
Magne Sjaastad
b1e73a4eb7 Try to fix issues on build server related to copy of oct files
p4#: 21626
2013-05-15 12:50:32 +02:00
Magne Sjaastad
97c3a330f6 Updated riGetSelectedCases to use a string as type name
Improved how to get currently selected cases
p4#: 21625
2013-05-15 12:03:36 +02:00
Magne Sjaastad
b5f5f49572 Updated error text with correct module name
p4#: 21624
2013-05-15 12:02:53 +02:00
Magne Sjaastad
667a4e6995 Updated riGetCurrentCase with case type
p4#: 21619
2013-05-15 11:08:42 +02:00
Magne Sjaastad
b3a15268f6 Added riGetCases
p4#: 21618
2013-05-15 10:51:41 +02:00
Magne Sjaastad
5213baed0d Use data structure as output
Updated documentation
p4#: 21617
2013-05-15 10:44:55 +02:00
Magne Sjaastad
8c29270294 Use Octave_map instead of octave_scalar_map when building Octave data structures
p4#: 21615
2013-05-15 06:55:54 +02:00
Magne Sjaastad
f5b779d4c4 Use data structure concept instead of several independent vectors
p4#: 21614
2013-05-15 06:49:02 +02:00
Magne Sjaastad
8342899c5e Support previous name Octave_map of class octave_scalar_map
p4#: 21610
2013-05-14 15:14:39 +02:00
Magne Sjaastad
bc22ce7fa5 Use data structure to represent case information
p4#: 21608
2013-05-14 14:28:07 +02:00
Magne Sjaastad
22d45bc28f Added riGetSelectedCases based on currently selected cases in the main tree view
p4#: 21604
2013-05-13 22:32:01 +02:00
Magne Sjaastad
10b49efae9 Completed riGetCurrentCase
p4#: 21603
2013-05-13 21:41:45 +02:00
Magne Sjaastad
65710a8e08 Added riGetCaseGroups
Added Qt DataStream version to riSettings
VisualStudio: Copy generated *.oct files into Application folder
VisualStudio: ResInsight is dependent on octave_plugin
p4#: 21602
2013-05-13 21:15:38 +02:00
Jacob Støren
cad25bcd59 Caf:PdmUiTree: Rewrote rebuildUiSubTree to become updateUiSubTree
Now the UI state is preserved when refreshing the tree, making it suitable
to use this method more extensively. This paves the way to make changes to the Pdm data structure without considering the ui at all, until a  call to updateUiSubTree gets the ui gracefully into sync.
p4#: 21599
2013-05-13 12:00:52 +02:00
Magne Sjaastad
06d32ae97e Added groupId to case groups
p4#: 21594
2013-05-10 15:35:33 +02:00
Magne Sjaastad
b63306099e Added riGetCurrentCase used to get caseId from current rimCase in ResInsight
p4#: 21593
2013-05-10 14:43:03 +02:00
CeetronResInsight
cb1c276e01 Fixed missing include (only needed for RHEL6)
p4#: 21591
2013-05-10 11:10:41 +02:00