Commit Graph

96 Commits

Author SHA1 Message Date
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