OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-21 22:13:25 -06:00
Code Issues Packages Projects Releases Wiki Activity
14,984 Commits 29 Branches 61 Tags 286 MiB
56a456043b
Commit Graph

143 Commits

Author SHA1 Message Date
Magne Sjaastad
1fd4c56a46 Moved Octave socket reading into riSocketTools 2014-04-22 13:17:44 +02:00
Magne Sjaastad
492d86c39f Added block read from socket 2014-04-22 13:17:44 +02:00
Magne Sjaastad
0fc0b62f7d Updated use of buffer read 2014-04-22 13:17:14 +02:00
magnesj
14521bd5b0 Temporarily fixes for handling communication of more than 2GB data to/from octave 2014-04-22 13:16:33 +02:00
Magne Sjaastad
2deb434a07 Fix compile of ResInsight without Octave plugins 2013-10-24 16:03:39 +02:00
Jacob Støren
a29756edb4 Build system: Set 32bitOctave option not advanced 2013-10-17 13:38:51 +02:00
Magne Sjaastad
ffdeb6fdeb CMAKE: Add missing NAMES keyword 2013-10-17 08:10:03 +02:00
Magne Sjaastad
290c6ea402 CMAKE: Also look for qmake-q4 for RHEL6 2013-10-17 08:05:58 +02:00
Magne Sjaastad
90e10dea4d Mark option as advanced to hide from normal GUI options 2013-10-16 14:17:34 +02:00
Magne Sjaastad
ea45279154 Improved the build configuration of OctavePlugins. Added an advanced 
option on Windows VS2010 to compile 32-bit octave plugins when compiling
ResInsight 64-bit. Renamed some options.
 2013-10-16 13:57:48 +02:00
JacobStoren
a82b46846d Octave interface: Copy oct files to the same directory as the ResInsight 
binary to ease testing on linux.
 2013-10-08 15:19:21 +02:00
Jacob Støren
52c2d4ba8d Octave Interface: Unit Test Complete stage 1 2013-10-08 14:52:33 +02:00
Jacob Støren
cf3cf7c3f9 Octave Interface : Unit test. Still Work in progress 
But several bugs have been discovered.
 2013-10-08 13:54:35 +02:00
Jacob Støren
8a66e0fd5c Octave Interface: getWellNames: Return Cell values 
instead of char matrix.
 2013-10-08 13:48:36 +02:00
Jacob Støren
88df686902 Octave interface: Fixed switched dimentions on riGetCoarseningInfo 2013-10-08 10:06:49 +02:00
Jacob Støren
86e8b75e41 Octave Interface: Started to use Octave test 
Increased fidelity of the tests now checking the return values also.
Using the octave test system to make reporting somewhat easier.
 2013-10-07 17:06:21 +02:00
Jacob Støren
aee87bd100 Octave interface: Updated help text 2013-10-07 17:03:28 +02:00
Jacob Støren
a7ba7c793c Octave Interface: Fixed wrong timestep array detection 
The test to check whether an argument was a array of timestep indices
was not good enough. Text was also interpreted as a matrix.
Typechecking of the arguments is difficult due to the lack of
documentation of the octave API
 2013-10-07 11:47:09 +02:00
Jacob Støren
05ae735519 Octave interface: Improved Unit test 2013-10-07 11:47:09 +02:00
Magne Sjaastad
dbb0ad090c Fixed typo for CaseGroupName 2013-10-06 21:50:27 +02:00
Jacob Støren
c4d42790dd Octave Interface: Added unit test of Octave interface 2013-10-04 14:36:31 +02:00
Jacob Støren
de8c335c61 Octave interface: Fixed Typo 2013-10-04 14:36:28 +02:00
Magne Sjaastad
43e51b9994 Octave: Set timeout for communication with ResInsight to 6000 sec 2013-10-01 11:39:46 +02:00
Magne Sjaastad
2372cf86ca Octave: Use long timeout (60 s) for all socket data transfer, as socket 
data transfer is dependent on several layers of network optimizations.
 2013-09-30 20:54:31 +02:00
JacobStoren
78aaa53b54 Octave Interface: Corrected the returned dimensions of 
riGetGridDimensions to follow specification.
 2013-09-30 13:38:49 +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
Ceetron
571c4f85c0 Removed linux warning 2013-09-27 14:22:21 +02:00
Magne Sjaastad
f8f51bbe92 Updated function docs 
p4#: 22371
 2013-09-10 13:30:40 +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
1e7c4a385a Buildsystem: Prefixed the resinsight vars to make them groupend and more accessible from the cmake gui. 
Also introduced an option to turn openmp on and off
p4#: 22257
 2013-08-30 15:37:29 +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
178dd88aa0 Use timeout period of 60 sec as timeout for large data transfer operations 
p4#: 22182
 2013-08-16 15:59:52 +02:00
Magne Sjaastad
8c128aeb6e Added more detailed timeout for data transfer between ResInsight and Octave 
p4#: 22148
 2013-08-12 11:38:09 +02:00
Magne Sjaastad
494a5857dd Improved text output to Process Monitor and added grid index 
p4#: 22145
 2013-08-12 10:12:36 +02:00
Magne Sjaastad
b45c49104a Allow dataset to be received by ResInsight from Octave to have a dimension of 3, meaning 4D dataset with one time step 
Fixed comments
p4#: 22143
 2013-08-09 13:42:25 +02:00
Jacob Støren
f091629676 Octave Interface: Fixed two issues with setGridProperty 
Missing argument check and wrong dimension check
p4#: 21828
 2013-06-04 16:10:39 +02:00
Magne Sjaastad
3b05c59b55 Test for ijk dimention match before reading data 
Whitespace fixup
p4#: 21749
 2013-05-28 11:11:11 +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
83d5143b69 Fixed missing gridIndex in command 
p4#: 21744
 2013-05-27 15:58:50 +02:00
Jacob Støren
fe8c155b44 Octave interface: Compiling complete, but completely untested GetGridProperty. 
p4#: 21740
 2013-05-27 12:22:05 +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
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
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
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
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
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
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
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
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
Magne Sjaastad
b63306099e Added riGetCurrentCase used to get caseId from current rimCase in ResInsight 
p4#: 21593
 2013-05-10 14:43:03 +02:00
Magne Sjaastad
e5b7bbc5af Merge pull request #22 from OPM/internal 
Internal
 2013-04-12 04:06:49 -07:00
Magne Sjaastad
70347c281f Do not use deprecated Octave functions 
b5ad0b9170
p4#: 21106
 2013-04-03 09:24:33 +02:00
Roland Kaufmann
f6dd430b87 Path to Octave plugins is taken from conf. program 2013-03-27 00:43:13 +01:00
Roland Kaufmann
e63c609111 Use $ORIGIN to load libs from program directory 
The RPATH attribute won't expand relative directories (such as ".")
neither can it be a semi-colon separated list; the old way of setting
it was wrong and would lead to libraries being loaded from system
directories instead.
 2013-03-27 00:38:59 +01:00
Jacob Støren
b610133117 Octave interface Spec: Added some considerations 
p4#: 20260
 2013-01-28 07:53:48 +01:00
Jacob Støren
78af79ef7a More Octave interface specification 
p4#: 20259
 2013-01-25 17:37:39 +01:00
Jacob Støren
0111681f10 First "Complete" Draft. Still questions, but all relevant suggestions are addressed 
p4#: 20250
 2013-01-25 13:46:29 +01:00
Jacob Støren
1d7984c305 Started to refine the draft octave interface specification 
p4#: 20243
 2013-01-25 09:49:54 +01:00
Jacob Støren
03a3ceb9c1 Start of a specification draft 
p4#: 20242
 2013-01-25 07:30:30 +01:00
Magne Sjaastad
e9c3634c37 Include sources so the files show up in cmake generated project 
p4#: 20219
 2013-01-23 08:41:42 +01:00
Magne Sjaastad
f144134701 Use simplified compile of Octave plugins on non-Windows 
p4#: 19012
 2012-10-04 12:28:31 +02:00
Magne Sjaastad
1622df540b When compiling 64-bit Windows, establish 32-bit Visual Studio 2010 environment and compile Octave plugin using this environment. 
p4#: 19011
 2012-10-04 12:12:58 +02:00
Magne Sjaastad
2e9f842072 Use CMAKE to change working directory to Octave binary directory before compiling Octave plugins. This way dependent libraries are found without manipulating path. 
p4#: 19006
 2012-10-03 14:53:51 +02:00
Magne Sjaastad
c4e5d9e842 Do not include Octave plugin for Windows 64-bit, as no precompiled Octave 64-bit is available. 
p4#: 18838
 2012-09-20 15:15:43 +02:00
Magne Sjaastad
27d8808c5c Version 0.8.6 2012-08-31 19:12:47 +02:00
Roland Kaufmann
127abb9532 Remove object files which is generated from source 2012-07-06 14:57:16 +02:00
unknown
2c9695e594 Updated to version 0.8.0 2012-06-26 16:10:41 +02:00
Alf B. Rustad
dfe97efb1b Initial commit of ResInsight version 0.4.8 2012-05-18 09:45:23 +02:00