OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-26 16:26:48 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,683 Commits 31 Branches 61 Tags 287 MiB
0a58a752ff
Commit Graph

170 Commits

Author SHA1 Message Date
Magne Sjaastad
8451ffc2fb Added include to RigResultAccessor in factory 2014-08-14 10:56:32 +02:00
Magne Sjaastad
a500c68efe Use RigResultAccessFactory 2014-08-14 10:56:29 +02:00
Jacob Støren
09313c6caa More Rename of globalCell to reservoirCell 2014-08-14 10:56:25 +02:00
Jacob Støren
3022a40204 Renamed globalCell to reservoirCell etc. 2014-08-14 10:56:25 +02:00
Jacob Støren
37ef1cf71c Renamed globalCellIndex to reservoirCellIndex 2014-08-14 10:56:23 +02:00
Jacob Støren
0ea794a1a8 Renamed localCellIndex to gridLocalCellIndex 2014-08-14 10:56:23 +02:00
Magne Sjaastad
d9e9a173e4 Added RigResultModifier and use this object for result modifications 2014-08-14 10:56:22 +02:00
Jacob Støren
322823754b Replaced dataAccessObject with resultAccessor 2014-08-14 10:56:20 +02:00
Magne Sjaastad
f259f21b32 Renamed file to match class name for RimReservoirCellResultStorage 2014-08-14 10:55:51 +02:00
Magne Sjaastad
d21e532c61 Cleaned up includes for ProjectDataModel 2014-08-14 10:55:49 +02:00
Magne Sjaastad
7faf950dc7 riGetActiveCellProperty: Fix for input properties 
Only read values for active cells if we have result values for all cells
 2014-06-11 12:06:15 +02:00
Magne Sjaastad
0f8b844873 Use max block size when reading from socket 2014-04-24 07:40:29 +02:00
Magne Sjaastad
d529e58c56 Fixed block transfer 2014-04-22 13:17:54 +02:00
Magne Sjaastad
e799a25c2e Block transfer for active cell info 2014-04-22 13:17:53 +02:00
Magne Sjaastad
19b655542a Use block transfer for data transfer of cell properties 2014-04-22 13:17:53 +02:00
Magne Sjaastad
eec2ffbecd Fixed invalid assert 2014-04-22 13:17:52 +02:00
Magne Sjaastad
32bfb65a9d Added socket data transfer 
Added one common class used to transfer data using socket. This class is
used both from the Octave plugins and from the socket server code in
ResInsight
 2014-04-22 13:17:52 +02:00
Magne Sjaastad
1693ae25dd Updated riGetGridProperty 2014-04-22 13:17:47 +02:00
Magne Sjaastad
b16536c9b0 Use socket block read/write for geometry data 2014-04-22 13:17:45 +02:00
Magne Sjaastad
492d86c39f Added block read from socket 2014-04-22 13:17:44 +02:00
Magne Sjaastad
c2f80f402d Fixed used on unsigned 2014-04-22 13:17:43 +02:00
Magne Sjaastad
e5248683f0 Added block write to socket tools 2014-04-22 13:17:43 +02:00
Magne Sjaastad
7a07b2926e Added flag to control how to do IO with sockets 2014-04-22 13:17:42 +02:00
Magne Sjaastad
c74851bfff Performance: Reduce memory use for riGetPropertyData 2014-04-22 13:16:32 +02:00
Jacob Støren
606a14f9f7 Octave Interface: Tentative Fix of lockup of Resinsight 
Added a timer to call back if a signal from the socket has to be
ignored.
This way we should not loose signals and state.
Needs to be experienced over some time to be verified.
 2013-10-08 14:21:18 +02:00
Jacob Støren
d5fe84bfbb Octave Interface: Moved debug output macro to socket tools 
To make it available to all the SocketServer related classes.
 2013-10-08 14:18:23 +02:00
Jacob Støren
230561573e Merge branch 'internal' of https://github.com/OPM/ResInsight into internal 2013-10-08 13:51:48 +02:00
Jacob Støren
7701cef865 Octave interfance: GetActiveCellCenters GetActiveCellCorners Fixed wrong CaseId addressing 
Fixed Wrong CaseId addressing
 2013-10-08 13:41:30 +02:00
Magne Sjaastad
ab31222efa Octave: Use 1-based IJK for riGetWellCells 2013-10-08 13:07:14 +02:00
Jacob Støren
12f3986d5f Octave interface: SocketServer Major review 
Simplified and made more readable. Hopefully more stable and robust.
 2013-10-07 11:47:09 +02:00
Jacob Støren
ca55d44884 Octave Interface: Fixed bugs riSetGridProperties riSetActiveCellProperty 
SetGridProp did not read all data (if -> while)
Both returned not finished while they could have been finished
 2013-10-04 14:36:34 +02:00
Jacob Støren
4efeba4a51 Socket Interface: Comments and debug message possibilities 2013-10-04 14:36:26 +02:00
Ceetron
7e4c793da5 Octave Interface: Yet more fix on multicase octave script exec. 2013-09-27 17:06:20 +02:00
Ceetron
6a7181e1d9 Octave Interface: Current Case is now interpreted correctly by Resinsight 
The method returning the current case had not been updated to do so.
Some debug output is also removed.
 2013-09-27 16:25:40 +02:00
Magne Sjaastad
1543f05794 Use a mutex to make sure all command objects have completed before issuing snapshots in the regression tests. 
p4#: 22400
 2013-09-13 09:23:13 +02:00
Magne Sjaastad
c3adfb7cb0 Prototyped command object infrastructure to be used in regression tests of Octave scripts 
p4#: 22387
 2013-09-12 08:11:56 +02:00
Magne Sjaastad
f928ef87e8 Fixed bug in riGetPropertyData only returning values for the first time step 
https://github.com/OPM/ResInsight/issues/56
p4#: 22379
 2013-09-11 10:26:53 +02:00
Magne Sjaastad
1a8f3d2555 Fixed segmentation fault for SetGridProperty with selected timestep 
See TP#4179
p4#: 22364
 2013-09-09 14:33:37 +02:00
Jacob Støren
e72318f348 Octave Interface: Added riGetWellCells 
p4#: 22310
 2013-09-04 12:57:36 +02:00
Jacob Støren
cac9d9d3f9 Octave Interface: Added riGetWellStatus 
p4#: 22301
 2013-09-04 08:03:11 +02:00
Jacob Støren
336eb56e3f Octave interface: Added riGetPropertyNames 
Not yet included in build system
p4#: 22253
 2013-08-30 15:26:35 +02:00
Magne Sjaastad
89c67df963 Fixed issue with missing well pipe geometry 
p4#: 22151
 2013-08-12 17:04:31 +02:00
Magne Sjaastad
ee4e6aeed4 Use data access object for access to data structures in ResInsight 
p4#: 22144
 2013-08-12 10:04:30 +02:00
Jacob Støren
080fc4c094 Fixed some compiler warnings. 
p4#: 21853
 2013-06-07 14:15:13 +02:00
Vidar Lundberg
6340c4a4a8 Established new PDM structure with RimProject owning RimOilFields owning RimAnalysisModels. 
Moved wellPathCollection into new class RimOilFields.
Moved cases (previously called reservoirs) and caseGroups from RimProject into new class RimAnalysisGroups.
Added support for old project files, move cases and caseGroups from RimProject to RimAnalysisModels. (Do not handle WellPaths for old project files in a similar way, since almost no users have used this functionality yet.)
p4#: 21846
 2013-06-06 15:07:31 +02:00
Vidar Lundberg
691f24e7a7 Added include files because of known include problems related to PDM. 
p4#: 21845
 2013-06-06 15:02:35 +02:00
Magne Sjaastad
1519ad0ad1 Fix for correct handling of pending socket connection requests 
p4#: 21759
 2013-05-29 10:07:35 +02:00
Magne Sjaastad
389247c17e Read command header in interpretCommand() 
p4#: 21756
 2013-05-28 16:02:00 +02:00
Magne Sjaastad
408795c0fc Test for ijk dimention match before reading data 
Whitespace fixup
p4#: 21749
 2013-05-28 11:11:32 +02:00
Magne Sjaastad
5bca9b28c1 Added riSetGridProperty 
Some known issues related to parsing of the Octave arguments
p4#: 21747
 2013-05-28 10:43:32 +02:00
Magne Sjaastad
1cfdb0ddb1 Write all double values in one go. Fixed argument parsing. 
p4#: 21746
 2013-05-28 09:20:09 +02:00
Magne Sjaastad
a7c49c0a31 Use ECLIPSE corner ordering 
p4#: 21743
 2013-05-27 15:38:33 +02:00
Magne Sjaastad
fa161607a1 Added context menu used to execute a script for multiple cases 
For all selected cases, set current case and launch an external Octave process using this current case
p4#: 21742
 2013-05-27 15:38:03 +02:00
Jacob Støren
fe8c155b44 Octave interface: Compiling complete, but completely untested GetGridProperty. 
p4#: 21740
 2013-05-27 12:22:05 +02:00
Magne Sjaastad
2afca2bd5d Added current case to socket server. 
Fixed includes on Windows
p4#: 21725
 2013-05-26 21:55:05 +02:00
Jacob Støren
fbc02e79b0 Octave Interface: SetActiveCellProperty: Prettifying 
p4#: 21724
 2013-05-26 12:16:32 +02:00
Jacob Støren
1aa8857f4d Octave interface: SetActiveCellProperty: Now working according to spec. 
Not tested for Coarce Cells yet.
p4#: 21723
 2013-05-26 12:07:42 +02:00
Jacob Støren
33bfb287d6 Octave Interface: Cleaned up code, and moved SetActiveCellProperties to the correct file 
p4#: 21716
 2013-05-24 12:02:52 +02:00
Jacob Støren
767c1d2409 Octave interface: Rebuilt the riSetActiveCellProperties command. 
Accept the new arguments, refactored to new framework, improved error handling.
Still needs to support specified timesteps and Grid Coarsening
p4#: 21713
 2013-05-24 11:36:59 +02:00
Magne Sjaastad
7ba9cef84b Moved socket commands into files grouped by case info, geometry, project info and property data 
p4#: 21712
 2013-05-24 11:07:59 +02:00
Magne Sjaastad
d9750b2dd4 Produce geometry for all cells, not per grid 
p4#: 21710
 2013-05-24 09:54:32 +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
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
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
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
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
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
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
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
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
b63306099e Added riGetCurrentCase used to get caseId from current rimCase in ResInsight 
p4#: 21593
 2013-05-10 14:43:03 +02:00
Jacob Støren
cf664210bf Major cleanup/change in the way things are included. 
Needs a Linux compile check.
p4#: 21545
 2013-05-06 10:55:00 +02:00
Jacob Støren
df533d0afe Alligning 
p4#: 21321
 2013-04-17 07:41:48 +02:00
Jacob Støren
b38d4313d7 Octave Server: Fix on getting active cellinfo 
p4#: 21318
 2013-04-16 12:08:45 +02:00
Magne Sjaastad
48d2a6c598 Use model index at drop position when asking user for confirm of drop event causing statistics to be deleted 
p4#: 21242
 2013-04-11 12:06:38 +02:00
Jacob Støren
e10bd73658 Renamed the final filenames for this time: 
RICursors		RiuCursors
RIMainWindow	RiuMainWindow
RIPreferencesDialog	RiuPreferencesDialog
RIProcessMonitor	RiuProcessMonitor
RIResultInfoPanel	RiuResultInfoPanel
RIViewer		RiuViewer
p4#: 21072
 2013-03-22 17:30:50 +01:00
Jacob Støren
c8da0f4179 Aligning prefix of class names with standard: 
RICursors		RiuCursors
RIMainWindow	RiuMainWindow
RIPreferencesDialog	RiuPreferencesDialog
RIProcessMonitor	RiuProcessMonitor
RIResultInfoPanel	RiuResultInfoPanel
RIViewer		RiuViewer
p4#: 21071
 2013-03-22 17:17:56 +01:00
Jacob Støren
f0174a02fa More file renaming: 
RigEclipseCase		RigCaseData
RigReservoirCellResults	RigCaseCellResultsData
RigWellResults		RigSingleWellResultsData
RigGridCollection	RigGridManager
p4#: 21070
 2013-03-22 16:58:44 +01:00
Jacob Støren
6a2cbbcf07 Renamed files: 
RimReservoir		RimCase
RimResultReservoir	RimResultCase
RimInputReservoir	RimInputCase
p4#: 21069
 2013-03-22 16:40:41 +01:00
Jacob Støren
b903c7f8c2 Renamed files: 
RIApplication	RiaApplication
RIPreferences	RiaPreferences
p4#: 21068
 2013-03-22 16:24:42 +01:00