Commit Graph

195 Commits

Author SHA1 Message Date
Jacob Støren
d371da246f Renamed uiPdmModel() to uiPdmModel_OBSOLETE()
To make it easier to see what code is using the obsolete stuff.
2015-08-14 13:27:17 +02:00
Jacob Støren
235e024533 (#354) Called updateConnectedEditors everywhere updateUiSubTree is called 2015-08-13 21:28:09 +02:00
Jacob Støren
b2fb9ae2c8 Fixed wrong CaseTypeId in octave GetCases. Introduced by the GeoMech Case.
(#325)
2015-07-01 07:44:50 +02:00
Jacob Støren
2b1e2bb157 Fix of #321 and #284 Crash when setting data from octave into an input case 2015-06-29 17:06:55 +02:00
Pål Hagen
7917a89c65 Renamed source files according to new class names 2015-06-26 10:00:45 +02:00
Pål Hagen
fd03a02645 Renamed source files according to new class names 2015-06-26 10:00:44 +02:00
Pål Hagen
cd662dc7d1 Renamed source files according to new class names 2015-06-26 10:00:43 +02:00
Pål Hagen
c2561eb287 Renamed source files according to new class names 2015-06-26 10:00:42 +02:00
Pål Hagen
2f34b03135 Renamed source files according to new class names 2015-06-26 10:00:41 +02:00
Pål Hagen
ca7428ca4a Renamed class RimAnalysisModels to RimEclipseCaseCollection 2015-06-26 10:00:40 +02:00
Pål Hagen
33684d32c3 Renamed class RimInputProperty to RimEclipseInputProperty 2015-06-26 10:00:34 +02:00
Pål Hagen
dec6791027 Renamed class RimInputCase to RimEclipseInputCase 2015-06-26 10:00:33 +02:00
Jacob Støren
2c7a741805 Renamed the files of RimReservoirView to RimEclipseView 2015-05-21 10:34:38 +02:00
Jacob Støren
ed74116376 Rename of RimReservoirView to RimEclipseView
To make the separation to geomech clearer, and alligning it to the
RigCaseNaming
2015-05-21 10:05:33 +02:00
Jacob Støren
969a181897 RimCase reintroduced as baseclass for all cases
Refactored to handle cases generically in  a lot of places.
Mostly complete regarding all these issues, but not tested yet:
Assigning caseId
Update relative path to the case data
RimProject::createDisplayModelAndRedrawAllViews
RimProject::computeUtmAreaOfInterest
Load case data on project open
save snapshots for all views
RegressionTest viewer size
Finding case based on caseId
Giving case information to octave
2015-05-15 18:51:49 +02:00
Jacob Støren
b111a26f21 Renamed Files: RimCase to RimEclipseCase 2015-05-15 09:16:33 +02:00
Jacob Støren
223f8385d2 Renamed base class RimCase to RimEclipseCase
To make room for a RimCase base class that can be used as base class for
RimGeoMechCase as well.
This commit is only the class rename not the file rename.
2015-05-15 08:40:27 +02:00
Jacob Støren
d6643d9d35 RimView etc: More aligning GeoMech/Eclipse
Now Animation drawstyle works fairly well.
2015-05-08 14:13:26 +02:00
Magne Sjaastad
5b5d0ffa5a Show generated static result for all time steps 2014-10-27 08:00:23 +01:00
Magne Sjaastad
2d36af4f06 Updated file header for new files 2014-09-24 07:14:52 +02:00
Magne Sjaastad
b4df5419b1 Updated file header for modified files 2014-09-23 15:04:57 +02:00
Magne Sjaastad
e605ceafa2 Socket server : Improved server logic 2014-09-08 15:39:23 +02:00
Magne Sjaastad
103a9f4018 Bugfix : Allocate max timestep count when receiving data from Octave 2014-08-28 09:54:34 +02:00
Jacob Støren
1b2b0d8560 Fixed compile error introduced by rename
The dependency was not detected by CMAKE/msvbuild. ... Strange
Needed a complete make clean to find it.
2014-08-25 08:04:31 +02:00
Magne Sjaastad
d5e911d01b Added RigStatisticsDataCache and RigStatisticsCalculator
Moved cache from RigCaseCellResultsData to RigStatisticsDataCache
Moved statistics computations from RigCaseCellResultsData to RigStatisticsCalculator
2014-08-19 08:14:03 +02:00
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