OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-15 18:13:33 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,012 Commits 26 Branches 61 Tags 309 MiB
7b0d1fbd2f
Commit Graph

489 Commits

Author SHA1 Message Date
Roland Kaufmann
eac27f149a Enable in-package substitute of tr1/tuple 
In clang 6.0 the tr1/tuple header is not present, and this cause a
compilation error inside of the gtest framework. However, if we set a
define, it will use its own substitute of tr1/tuple, which is sufficient
for the unit tests.
 2015-01-01 19:46:25 +01:00
Roland Kaufmann
b25290bebd Complete instantiated types 
RivReservoirPartMgr uses a Collection of RivGridPartMgr. The Collection
indirectly causes the release() method of the Object base class of
RivGridPartMgr to be called as part of its destructor, but this is not
allowed for incomplete types and RivGridPartMgr is only forward-declared
at the time of the instantiation (in RivReservoirPartMgr).

A similar problem occurs in the use of RigStatisticsDataCache in the
type RigCaseCellResultsData.
 2015-01-01 19:46:24 +01:00
Magne Sjaastad
babe812ebc Fixed memory leak 2014-10-27 12:25:52 +01:00
Magne Sjaastad
a8ce90e404 Always compute grid faults 2014-09-26 08:15:22 +02:00
Magne Sjaastad
b046a0354d Converted assert to if statement when no NNC data is present 2014-09-24 13:28:08 +02: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
Jacob Støren
6e55ca82e2 Fixed Problem regarding negative riTrans values 
The reason was a bit sloppy detection of whether the surface normals was
pointing outwards or inwards in a cell.
The cells can be turned inside out due to depth/Z or mapaxis conditions.
 2014-09-23 12:26:08 +02:00
Jacob Støren
c9065eeed9 Made mean calculation handle inf and nan 2014-09-09 15:20:16 +02:00
Jacob Støren
ed202cc7cf Combined TRAN results: Now set to 0.0 on border to inactive cells / grid border 2014-09-09 14:02:03 +02:00
Magne Sjaastad
980207f4a7 Rename : Removed s from TRANS to TRAN to be in line with Eclipse naming 2014-09-09 07:12:43 +02:00
Magne Sjaastad
4fdb06e0e0 Moved code from header to source 2014-09-04 09:28:39 +02:00
Jacob Støren
5377742bbc riTRANSXYZ: Fixed negative values due to bug in polygon calculations 2014-08-28 11:25:20 +02:00
Magne Sjaastad
b7bc732b32 Bugfix : Do not compute SOIL if present on disk 2014-08-28 10:35:05 +02:00
Magne Sjaastad
ffbfb8bdf0 Read units type from file and set CDARCHY value based on units type 2014-08-27 14:05:35 +02:00
Jacob Støren
d76dd6a588 Added riTRANSXYZbyArea (and X, Y, Z ) 2014-08-27 11:41:40 +02:00
Magne Sjaastad
e40e3c40f1 Bugfix MULTXYZ : Clamp HUGE_VAL to 1.0 2014-08-27 09:54:12 +02:00
Jacob Støren
03a9bf459d Added riMULTXYZ and X,Y,Z 2014-08-26 15:39:21 +02:00
Magne Sjaastad
0bd0d6d7a7 Linux fix: Added include of cmath and reorganized includes 2014-08-26 14:46:48 +02:00
Jacob Støren
28f5639607 riTRANSXYZ: Removed unused code 2014-08-26 13:36:38 +02:00
Jacob Støren
27571a839a Linux compile fix 2014-08-26 13:35:49 +02:00
Jacob Støren
670ca4ced5 riTRANSXYZ: nnc calculations in place 
Making this feaure complete.
Had to add the concept of several results sets to the nnc data
 2014-08-26 12:16:22 +02:00
Jacob Støren
11c01af61a riTRANSXYZ: First version working 
Not yet extensively tested, but seems ok for complete match faces
 2014-08-22 13:39:24 +02:00
Jacob Støren
57a049d39f riTRANSXYZ: Moving the calculation to ReservoirCellResultsStorage 
Create stored native riTRANX,Y,Z results instead of doing everyting in
one go.
This makes the statistics calculation work automatically instead of
beeing custoized and require a compplete calculation of its own.
 2014-08-22 13:39:23 +02:00
Jacob Støren
9e22c90a4a Renamed cellindex to gridLocalCellIndex 2014-08-22 13:39:21 +02:00
Magne Sjaastad
03df28282c Show NNCs with no common area in folder below Faults 2014-08-22 09:28:25 +02:00
Magne Sjaastad
e4e3cca05f Moved creation of placeholder results to to RimCase 2014-08-21 08:39:19 +02:00
Magne Sjaastad
f61f7f1fd1 Result statistics: Fixed computation of scalar values close to zero 2014-08-20 11:55:11 +02:00
Jacob Støren
b7693f449b Fixed missing result names when auto SOIL is off 2014-08-20 11:32:50 +02:00
Jacob Støren
83965a4f7b riTRANXYZ: Started to add it to the rest of the system 2014-08-20 09:51:55 +02:00
Jacob Støren
a3af100189 riTRANXYZ: Added to build system. First implementation. 2014-08-20 08:12:19 +02:00
Magne Sjaastad
cdf2b07118 Removed use of cvfStructGridScalarDataAccess 2014-08-19 14:56:20 +02:00
Magne Sjaastad
f98a909e51 Removed obsolete code and renamed functions 2014-08-19 14:02:21 +02:00
Magne Sjaastad
a2f4887d56 Added riMULTXYZ to statistics and result factory 2014-08-19 13:20:44 +02:00
Magne Sjaastad
e6358a1289 Added MULTXYZ result accessor 2014-08-19 11:57: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
Jacob Støren
06df5ba1da riTRANXYZ: removed strange character 2014-08-18 18:32:55 +02:00
Jacob Støren
147fbffe55 riTRANXYZ: Paving the way: Renaming, Removing obsolete code, Store fault index for each cell face, Added prototype code for the calculation 2014-08-18 18:30:52 +02:00
Magne Sjaastad
ab483fee81 Made ternary result accessor more robust 2014-08-14 12:12:07 +02:00
Magne Sjaastad
245573e03c Cell edge visualization can now handle individual per face center values 2014-08-14 10:56:44 +02:00
Magne Sjaastad
0941834da9 Added RigHugeValResultAccessor 
Linux: Added include of cmath for define of HUGE_VAL
 2014-08-14 10:56:43 +02:00
Magne Sjaastad
24a464ecf9 Use texture based ternary visualization 2014-08-14 10:56:38 +02:00
Magne Sjaastad
68bc378abe Minor fixes for result accessors 2014-08-14 10:56:36 +02:00
Magne Sjaastad
85d4de6746 Added RigResultAccessor2d 2014-08-14 10:56:35 +02:00
Magne Sjaastad
1b3be87074 Moved include from header to cpp 2014-08-14 10:56:33 +02:00
Magne Sjaastad
8451ffc2fb Added include to RigResultAccessor in factory 2014-08-14 10:56:32 +02:00
Magne Sjaastad
ca7f61d3ff Added overload to result accessor factory 2014-08-14 10:56:31 +02:00
Magne Sjaastad
24ff71d23e Prefix function to be deleted to easily spot the function in code 2014-08-14 10:56:30 +02:00
Magne Sjaastad
e2f2cf4f24 Removed asserts and simplified code 2014-08-14 10:56:28 +02:00
Jacob Støren
38d2000e29 Wip: New generalized texturing in play 
Only on GridParts
 2014-08-14 10:56:27 +02:00
Jacob Støren
33ab16f7d7 New classes for the generalized texturing 2014-08-14 10:56:27 +02:00
Jacob Støren
e1b67b15e0 Rename of GlobalCell to ReservoirCell 2014-08-14 10:56:26 +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
6cdd9cfdc5 Renamed globalGridCellIndex to reservoirCellIndex 2014-08-14 10:56:24 +02:00
Jacob Støren
16f762984e Renamed more stuff to gridLocalCellIndex 2014-08-14 10:56:24 +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
Jacob Støren
6fcc50de20 cellEdgeAccessor : Use FixedArray instead of collection 2014-08-14 10:56:22 +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
7a3d90daa4 Removed fvector and replaced with FixedArray. 
Needs replacing with std::array when we get to c++11
 2014-08-14 10:56:21 +02:00
Jacob Støren
0f26b6e22f Trimmed CombTransResultAccessor interface 
setTransResultAccessors
 2014-08-14 10:56:21 +02:00
Magne Sjaastad
b4d8067a74 Removed setCellScalar and resultName from Resultaccessor 2014-08-14 10:56:20 +02:00
Jacob Støren
322823754b Replaced dataAccessObject with resultAccessor 2014-08-14 10:56:20 +02:00
Magne Sjaastad
824ea81b99 Added RigResultModifier 2014-08-14 10:56:19 +02:00
Jacob Støren
7ebe9b17b9 Renamed files to reflect new classnames 2014-08-14 10:56:18 +02:00
Jacob Støren
1514b98c7a More renaming : AccessObject-Accessor 
And CellFaceAccessor to CellEdgeAccessor
 2014-08-14 10:56:17 +02:00
Jacob Støren
2bfcfc16b1 Class Rename: ResultAccessObject to ResultAccessor 2014-08-14 10:56:17 +02:00
Jacob Støren
cac1cc8040 Prototyping of new resultAccessor/texture system 
To make it simlier to add all the combined results MULTXYZ/riMULTXYZ etc
 2014-08-14 10:56:16 +02:00
Magne Sjaastad
70a98ab8fd Linux fix: No default cast from QString to QString& 2014-08-14 10:56:16 +02:00
Jacob Støren
e31d3c8807 Added comments and asserts related to neg. faces 
Negative face results is not applicable for this result access object,
as they are never used (by intention)
 2014-08-14 10:56:15 +02:00
Jacob Støren
aff8d8fd2a Moved needed code to above "delete" mark 2014-08-14 10:56:14 +02:00
Magne Sjaastad
57494c4bfe Added ResultAccessObject for combined transmissibility 2014-08-14 10:56:13 +02:00
Magne Sjaastad
cba742d44c Linux: Added include of cmath for define of HUGE_VAL 2014-08-14 10:56:12 +02:00
Magne Sjaastad
1d3ba4637d Added RigCellFaceResultAccessObject 2014-08-14 10:56:11 +02:00
Magne Sjaastad
cb8edaffde Added data access objects for native results 2014-08-14 10:56:11 +02:00
Magne Sjaastad
fa7e505262 Added RigResultAccessObject 2014-08-14 10:56:10 +02:00
Magne Sjaastad
75541e92fb Renamed to RigResultAccessObjectFactory 2014-08-14 10:56:10 +02:00
Magne Sjaastad
eec7f59c49 Rename 2014-08-14 10:56:09 +02:00
Magne Sjaastad
9925556579 Added hide fault to context menu in 3D view 2014-08-14 10:55:54 +02:00
Magne Sjaastad
b13c2621da Linux fixes: Added missing includes 2014-08-14 10:55:50 +02:00
Jacob Støren
e1c55e4452 Comb Trans: Fixed max/min and close to zero calc 2014-06-20 14:05:28 +02:00
Magne Sjaastad
3608c36291 Added test to guard for invalid cell index 2014-04-25 12:13:09 +02:00
Magne Sjaastad
dbe54ff9bf Performance: Reverted OpenMP, as the function needs rewrite 2014-04-24 10:25:22 +02:00
Magne Sjaastad
d3456ffcc9 Performance: Use OpenMP for fault calculations 2014-04-24 09:53:40 +02:00
Magne Sjaastad
366c3cd2e8 Performance: Use OpenMP for static data 2014-04-24 09:52:46 +02:00
Magne Sjaastad
62a2c9e3ce Fixed mock models 2014-04-24 08:32:43 +02:00
Magne Sjaastad
7b68c3cb6b Fix after merge conflicts take two 2014-04-14 10:24:15 +02:00
Magne Sjaastad
ce33c00219 Files fixed after merge conflicts 2014-04-14 09:25:27 +02:00
Magne Sjaastad
874b05b119 Added isCoarseningActive 2014-04-14 09:18:25 +02:00
Magne Sjaastad
60ff9c5a2b Performance: Added OpenMP to mock models 2014-04-14 09:16:06 +02:00
Magne Sjaastad
7ffe48bff9 Added flag to control adding of well data 2014-04-14 09:14:39 +02:00
Magne Sjaastad
9aa32e4a88 Added isCoarseningActive 2014-04-03 10:58:29 +02:00
Magne Sjaastad
b12e09c86d Updated defaults and modified GUI labels 2014-01-22 14:05:20 +01:00
Magne Sjaastad
4f079549f3 Removed trace output 2014-01-08 13:33:57 +01:00
Jacob Støren
909831ad34 NNC: Removed some debug output 2013-12-19 10:50:51 +01:00
Jacob Støren
cf7de9d588 Removed Geometry faults toggle, and disabled calculation 2013-12-19 10:50:45 +01:00
Jacob Støren
b7f305b142 Faults: Face culling handles flipaxis 2013-12-19 08:48:36 +01:00
Jacob Støren
8b52a43360 NNC: Typo in message 2013-12-18 09:20:53 +01:00
Jacob Støren
1639240240 Faults: Readded geometry fault generation 2013-12-17 13:28:13 +01:00
Jacob Støren
344ac7a146 Faults Guarded Fault neighbour calculation 2013-12-17 13:28:10 +01:00
Magne Sjaastad
f6510210b0 Fix for null pointer 2013-12-17 11:52:53 +01:00
Magne Sjaastad
3cf1a0f32a Use helper function to get transmissibility scalar results 2013-12-17 11:52:44 +01:00
Magne Sjaastad
e824b8f7b0 Added special handling of combined transmissibility 2013-12-17 11:52:40 +01:00
Jacob Støren
a39fe493f2 NNC: Fixed assert oposite face of NO_FACE 2013-12-16 15:56:57 +01:00
Jacob Støren
2a31035fb4 NNC: Added som diagnostics output 2013-12-16 14:26:07 +01:00
JacobStoren
880ab554f9 Linux compile fixes. Had to pull out the unused NNC search map. 2013-12-16 13:48:51 +01:00
Jacob Støren
7e2d860bba NNC: Tried to fix Linux typename compile issue 2013-12-16 11:40:50 +01:00
Jacob Støren
440499fbfd NNC: Add connection to both faults if different 2013-12-16 11:26:29 +01:00
Jacob Støren
e75bd8adfb NNC: Distribute the NNC on the correct faults 
Making the NNC search map obsolete
 2013-12-14 09:48:10 +01:00
JacobStoren
d4f5dd6803 Fix of linux Compile warnings 2013-12-14 09:38:55 +01:00
Jacob Støren
bf6fba191e Moved Faluts to MainGrid. New fault calculation 
Now finding the uncovered geometrical faults and adds them to a separate
generated fault.
 2013-12-12 22:18:20 +01:00
Jacob Støren
e175a5c96f Refactored to use Cell::faceIndices 2013-12-12 22:18:14 +01:00
Jacob Støren
e171aa66ac NNC processing first cut 2013-12-12 22:18:11 +01:00
Jacob Støren
1be9f1996f Moved GeometryTools w tests to ReservoirDataModel 2013-12-12 22:18:06 +01:00
Jacob Støren
04ccadd2f1 NNC import started 2013-12-12 22:18:03 +01:00
Jacob Støren
81176258bc RigCell: Added faceIndices and faceNormal methods 2013-12-12 22:18:00 +01:00
Magne Sjaastad
d53e9aa9c1 Added global cell indices to faults and added optimalizations 2013-12-10 07:44:49 +01:00
Magne Sjaastad
c8a4db6571 Added faults to mock models 2013-12-10 07:44:48 +01:00
Magne Sjaastad
6179d84b87 Use cell indices in RigBase 2013-12-10 07:44:45 +01:00
Jacob Støren
776ed7755e Improved FixedArray 2013-12-06 14:22:01 +01:00
Magne Sjaastad
19737aa99a Use const access for FixedArray. Added sorting of faults 2013-12-05 09:59:05 +01:00
Magne Sjaastad
f85b8aad08 Updated header 2013-12-04 09:39:50 +01:00
Magne Sjaastad
12918ec107 Faults: Reading from Eclipse text files and basic visualization 
Added reading of faults directly from Eclipse text files
Added named faults in project tree
Added fault geompetry parts
Added test data
 2013-12-03 20:30:32 +01:00
Magne Sjaastad
e47f2e6317 Performance: Added OpenMP to mock models 2013-11-08 10:34:05 +01:00
sigurdp
fbfbdfca84 Integrate Fwk updates from ResInsight/Perforce 
Integrated Fwk updates in Resinsight branch up to changelist 173.
Summary of changes:
* Rewrite of cvf::OverlayItem to allow fixed user controlled positioning
of the items.
* Removed pure virtual functions OverlayItem::maximumSize() and
OverlayItem::minimumSize().
* Use caf::AboutDialog instead of modified cvfqt::BasicAboutDialog.
* Removed lapack from link line due to fail on Ubuntu 12.04 when lapack
isn't installed.
* Fix in OpenGLContext::saveOpenGLState() to avoid application
corruption when running on RedHat with VMWare.
* Removed unused font manager.
* Console assert handler only calls __debugbreak() if debugger is
present. Otherwise, calls abort(). Done after trouble running gtest
death tests.
* Made component access functions in Color3f, Color3ub, Color4f,
Color4ub inline.
* Added conversion functions between TextureImage and QImage to
cvfqt::Utils class.
* Optimized TextureImage::setPixel() - relies on new inlined
component-wise access functions for Color4ub.
* Added TextureImage::clear() and non-const version of
TextureImage::ptr().
 2013-10-31 14:57:52 +01:00
Magne Sjaastad
2315ab9014 Added flag to control adding of well data 2013-10-28 10:31:46 +01:00
Jacob Støren
567f16ad43 Removed Wellhead cell visualization if cell is not active 
Issue #63
 2013-09-30 15:22:48 +02:00
Jacob Støren
a5a1dfe701 Fixed Win Compile error. Missing include 2013-09-30 11:02:17 +02:00
Ceetron
26d5a7c5b0 Legend: Fixed legend numbers being completely wrong. 
The abs() function is only integer on linux RH5.
Caused legend numbers to be truncated (0 typically)
 2013-09-27 14:43:11 +02:00
sigurdp
bcc33397a3 Adapted cmake files to new directory structure 2013-09-20 16:21:46 +02:00
Jacob Støren
0c19d50582 ResInsight: Move cafUiTreeItem.h 
p4#: 22497
 2013-09-20 09:28:36 +02:00
Magne Sjaastad
18a05b7bff Fixed compiler warning 
p4#: 22392
 2013-09-12 13:56:01 +02:00
Magne Sjaastad
5dbc15998f Fixed several compiler warning on Linux 
p4#: 22370
 2013-09-10 08:47:28 +02:00
Magne Sjaastad
7a9c488cdc Added Id to mock model 
p4#: 22367
 2013-09-10 07:15:45 +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
Magne Sjaastad
303f832fac Fixed duplicate use of variable i 
p4#: 22361
 2013-09-09 11:48:23 +02:00
Jacob Støren
97bb848b1d Fix of GH#43 Assertion Fail for localGridIndex 
The grid number associated with an ert grid was an ID and not an index.
In addition: Fixed unrobustness handling wells with no data.
Now the /Troll/MSW_LGR/2BRANCHES-CCEWELLPATH-NEW-SCH-TUNED-AR3.EGRID file loads( Have tested only two timesteps ).
p4#: 22321
 2013-09-05 13:03:53 +02:00
Jacob Støren
e72318f348 Octave Interface: Added riGetWellCells 
p4#: 22310
 2013-09-04 12:57:36 +02:00
Jacob Støren
79c016b6b6 Wells: Improved output in Result info window when picking a well-cell 
p4#: 22241
 2013-08-28 15:36:29 +02:00
Jacob Støren
2c985a1c2b MSW: Now using a stable offset for the small branches start point. 
Pulling the split point towards the first cell corner.
p4#: 22238
 2013-08-28 10:21:33 +02:00
Jacob Støren
3f2037b783 MswRollUp: Handle previous well result points that is inside current cell 
This is an intermediate commit and does not compile
p4#: 22229
 2013-08-26 15:22:55 +02:00
Jacob Støren
d5aa8e4f30 MswRollUp: Principal fixes to the MSW algorithms 
Add point contributions even when it is undefined to store the segment below id, which is needed for the traversal.
The undefined positions comes from bottom end segments without connections.
Also cleaned up the the static well calculation
This is an intermediate commit and does not compile
p4#: 22226
 2013-08-26 15:10:34 +02:00
Jacob Støren
441ac1e3d9 MswRollUp: Start of fix of static well calculation 
This is an intermediate commit and does not compile
p4#: 22221
 2013-08-26 14:34:22 +02:00
Jacob Støren
9f2bc4f1d0 MswRollUp: Made neighbour calculations handle cells on edge 
This is an intermediate commit and does not compile
p4#: 22219
 2013-08-26 14:22:20 +02:00
Jacob Støren
e6dce28fa3 MswRollUp: Started to clean up the MSW code. 
This is an intermediate commit and does not compile
p4#: 22216
 2013-08-26 14:15:27 +02:00
Jacob Støren
27cac28b74 MswRollUp: Centerline calculation restoring and improvement 
This is an intermediate commit and does not compile
p4#: 22215
 2013-08-26 14:09:25 +02:00
Jacob Støren
f392f4457d MswRollUp: Splitted normal well and MSW handling. Got the Normal path to work fairly well. Some strangeties at the end of the pipes though 
This is an intermediate commit and does not compile
p4#: 22214
 2013-08-26 14:03:01 +02:00
Jacob Støren
b63f51921d MswRollUp: Updated Ert to experimental MSW branch. Updated ResInsight code to handle API changes 
067fa99faa
This is an intermediate commit and does not compile
p4#: 22212
 2013-08-26 13:56:42 +02:00
Jacob Støren
4f7b3e703c Fixed Memory bug regarding statistics calcualtion 
The results memory on each timestep was not freed resulting in all the data from all the cases for all timesteps in memory at the same time ...
In addition, the data was read accidentaly before the timeloop for all the source cases for all timesteps.
So, should perform better now, but there still are some memory allocated in the start, that i cant quite account for.
p4#: 22011
 2013-06-26 23:34:03 +02:00
Jacob Støren
4be58edf78 MSW code reverted. Regrettfully the work has to be reconsidered. 
Both ERT and the resinsight code is rolled back to before MSW was introduced as refined.
p4#: 21999
 2013-06-25 15:53:19 +02:00
Magne Sjaastad
f02d4b160e Use branch index and branch cell index to identify branch head 
Removed obsolete code
p4#: 21974
 2013-06-24 14:02:01 +02:00
Magne Sjaastad
12a0040473 Added well branch number and segment number to result info view 
p4#: 21968
 2013-06-21 16:20:11 +02:00
Magne Sjaastad
c8a537e180 Check for valid index before accessing data 
p4#: 21957
 2013-06-18 12:55:49 +02:00
Magne Sjaastad
16cd7a04ae Multi Segment Wells: Read in connection between a well branch and the branch head. 
Compute intersection point between branch top well cell and branch head in the main branch.
p4#: 21954
 2013-06-18 09:41:02 +02:00
Magne Sjaastad
7a24b2664e Updated ERT to handle multi segment wells 
Updated input code in ResInsight accordingly

ERT version on GitHub
067fa99faa
p4#: 21920
 2013-06-13 22:12:02 +02:00
Magne Sjaastad
0021e2f861 Improved logarithmic color legends for zero and negative values 
p4#: 21804
 2013-06-03 13:08:11 +02:00
Magne Sjaastad
ea4491e987 Added framework used to handle utm area of interest 
p4#: 21775
 2013-05-31 13:57:16 +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
f509e1803f Active CellInfo: Added concept of Cell Result Count 
p4#: 21721
 2013-05-26 11:59:59 +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
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
Jacob Støren
d947f68f83 Octave Interface: GetActiveCellProperty now handles coarsening 
p4#: 21683
 2013-05-21 14:35:47 +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
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
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
Magne Sjaastad
269f66b0bd Removed obsolete function 
p4#: 21551
 2013-05-06 13:09:47 +02:00
Magne Sjaastad
71187d5bbc Unit test for interpolation 
p4#: 21496
 2013-04-30 13:08:04 +02:00
Magne Sjaastad
6ef5205343 Added interpolation of observed values to statistics computation 
p4#: 21492
 2013-04-30 11:36:50 +02:00
Magne Sjaastad
ca856f7603 Updated ERT to 315ceeee250808ea6a6530233dd5125f9f76f06c 
Support of reading LGR dimensions
Close file handles between access to files, keep ERT file-related cache to speed up reading of many files multiple times
p4#: 21477
 2013-04-29 13:13:42 +02:00
Jacob Støren
3806ff9baf Well cell transparency: Turned off well cell transparency when no well pipe is visible. 
For results visulaization, cell edge and faults faces.
Not yet done for visualization without result colors.
p4#: 21462
 2013-04-26 16:46:38 +02:00
Magne Sjaastad
4b8e30e649 Added flip X/Y-axis on RimCase, will invert the sign of coordinates for the given flip axis. 
p4#: 21453
 2013-04-26 13:19:34 +02:00
Jacob Støren
10e6fbc5bd Range filter: Add grid type drop-down list to enable LGR-grid range filtering 
TP#3995
p4#: 21408
 2013-04-24 12:00:45 +02:00
Magne Sjaastad
f9985af7e9 Added source groups in CMake to improve file organization in generated projects 
p4#: 21330
 2013-04-18 07:33:45 +02:00
Magne Sjaastad
9b0378f8e0 Added support for selected well data in a statistics case 
Now possible to show well data from selected source case for a statistics case
Added state to RimResultCase to monitor data actually read from disk
p4#: 21258
 2013-04-12 12:03:04 +02:00
Magne Sjaastad
927fa6c5e7 Fixed issue related to computation of SOIL. Mark metadata for derived SOIL with mustBeCalculated. 
p4#: 21220
 2013-04-10 11:37:34 +02:00
CeetronResInsight
1cfd103f30 Linux compile warning fixes 
p4#: 21189
 2013-04-09 07:59:41 +02:00
Jacob Støren
2a6fce1d64 Added missing include (discovered on Ubuntu 12 build server) 
p4#: 21186
 2013-04-09 07:27:55 +02:00
Magne Sjaastad
95d1c98bee Read grid dimensions and verify equality before adding a result case 
Harmonized and refactored creation of RimResultCases
p4#: 21156
 2013-04-07 17:27:45 +02:00
Jacob Støren
0fed66deb2 Moved the statistical calculation algorithm code into a separate file. 
Added unit test to these calculations, and fixed a calculation error.
p4#: 21140
 2013-04-05 10:49:39 +02:00
Jacob Støren
75f089d0d4 Statistics UI is now functional, together with two percentile evaluation methods 
Refurbished the calculation algorithm code somewhat
p4#: 21134
 2013-04-04 16:53:34 +02:00
Magne Sjaastad
cc8568cca6 Fixed inverted test for null pointer 
p4#: 21127
 2013-04-04 12:08:36 +02:00
Magne Sjaastad
e49895ea65 Updated file headers 
p4#: 21104
 2013-04-03 09:09:53 +02: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
27647248ea Rename of files: 
RIBaseDefs	RiaBaseDefs
RIVersionInfo	RiaVersionInfo
RIMain	RiaMain
RIStdInclude	RiaStdInclude
p4#: 21067
 2013-03-22 16:12:00 +01:00
Jacob Støren
e493db37d0 Major renaming of classes. Filenames not done yet. 
RimReservoir		RimCase
RimResultReservoir	RimResultCase
RimInputReservoir	RimInputCase
RigEclipseCase		RigCaseData
RigReservoirCellResults	RigCaseCellResultsData
RigWellResults		RigSingleWellResultsData
RigGridCollection	RigGridManager
p4#: 21064
 2013-03-22 15:43:42 +01:00
Jacob Støren
bd33a64e84 Added a comment 
p4#: 21063
 2013-03-22 15:22:50 +01:00
Magne Sjaastad
d85b0d4619 More checking on null pointers 
p4#: 21052
 2013-03-22 11:46:54 +01:00
Magne Sjaastad
3cd92973af Missed one file in previous rename 
p4#: 21046
 2013-03-22 09:44:41 +01:00
Magne Sjaastad
21065176f2 Rename of functions in RigActiveCellInfo 
p4#: 21045
 2013-03-22 09:32:42 +01:00
Jacob Støren
326cd79754 Result Storage: Finally things have come together, and seems to behave. 
Refactored the loadProject system to make loading of statistical cases work as they should.
Got the update of references regarding grid and unionActive cells work
Introduced a bool to keep track of what cell results to store.
Introduced a clear method in ActiveCellInfo.
Renamed a bit
p4#: 21036
 2013-03-21 15:31:47 +01:00
Magne Sjaastad
a5fb1e1764 One shared active cell info for all statistical cases 
Invalidate existing statisticsCases when adding/removing source cases
Moved computation of active cell union from RigStatistics to RimIdenticalGridCaseGroup
Recompute active cell union when opening project file
p4#: 21023
 2013-03-21 10:31:58 +01:00
Magne Sjaastad
50206b9dc4 Various linux fixes and missing includes 
p4#: 20976
 2013-03-20 06:11:45 +01:00
Magne Sjaastad
f0fa445f7a Set main grid on eclipse case and cell results 
p4#: 20955
 2013-03-19 08:28:25 +01:00
Magne Sjaastad
5db5c14230 Added possibility to read out scalar result index having most time steps 
p4#: 20952
 2013-03-19 08:14:35 +01:00
Jacob Støren
9da6b0a10b Results Storage: Fixed the Previous build error by moving the RigStatistics class. 
Cleaned up a bit in the ApplicationCode/CMakeList.txt
p4#: 20946
 2013-03-18 14:51:31 +01:00
Jacob Støren
f7248f3999 Results Storage: A huge refactorisation to make way for storing generated properties to an internal file. 
This does not yet compile due to a unfortunate mix of perforce, cmake setup and unit_test project shortcomings.
Need to move RigStatistics into ProjectDataModel and rename it before this is running again.
p4#: 20945
 2013-03-18 14:34:29 +01:00
Magne Sjaastad
62e4cac4b0 Added inherited object of MimeData to carry model index list 
p4#: 20926
 2013-03-18 11:40:39 +01:00
Magne Sjaastad
160456106a Use raw pointers instead of ref count 
Added more asserts and cleanup
p4#: 20891
 2013-03-13 14:43:27 +01:00
Magne Sjaastad
d33a27a082 Fixed ref counts 
p4#: 20890
 2013-03-13 14:41:54 +01:00
Jacob Støren
3c446c4018 Removed out-commented code from the ActiveCellInfo refactoring 
p4#: 20886
 2013-03-13 13:42:27 +01:00
Jacob Støren
8a604aca24 Refactored RigActiveCellinfo to only have one set of information. 
Fracture and Matrix separated information thus needs two such obejcts.
There still needs to remove some out-commented code
p4#: 20877
 2013-03-13 11:50:31 +01:00
Magne Sjaastad
449b22c681 Do not use smart pointer in this class 
p4#: 20875
 2013-03-13 11:39:27 +01:00
Magne Sjaastad
99917c60ad Compute SOIL for each time step 
Added support for computing statistics for derived SOIL
p4#: 20873
 2013-03-13 10:29:47 +01:00
Magne Sjaastad
06460424af Check for empty source cases 
p4#: 20871
 2013-03-13 08:03:26 +01:00
Magne Sjaastad
766996a9fd Include static properties when computing statistics 
p4#: 20870
 2013-03-13 07:58:49 +01:00
Jacob Støren
9ab0a397ef Removed the m_isWellCell member from RigCell, to make the grid data completely independent of case / result data 
p4#: 20859
 2013-03-12 10:03:25 +01:00
Magne Sjaastad
94065f29ed Removed obsolete code 
p4#: 20857
 2013-03-12 09:59:33 +01:00
Magne Sjaastad
61e8115141 Fixed indentation issues 
Renamed and added asserts
p4#: 20846
 2013-03-11 14:04:48 +01:00
Jacob Støren
0a5102894b Calculate statistics for all available properties in main case by default 
p4#: 20832
 2013-03-08 10:49:33 +01:00
Magne Sjaastad
9605a1eec9 Added clear method to make sure all objects are destroyed. 
p4#: 20828
 2013-03-08 08:36:30 +01:00
Magne Sjaastad
208e904f57 Rebuild geometry after computing new active cell info, and update views 
p4#: 20821
 2013-03-07 14:57:28 +01:00
Magne Sjaastad
1bf1d5a7cf Rebuild geometry after computing new active cell info, and update views 
p4#: 20821
 2013-03-07 14:56:52 +01:00
Magne Sjaastad
05b6c1ad18 Compute active cell info grid by grid 
p4#: 20817
 2013-03-07 13:20:15 +01:00
Jacob Støren
77d5b810ca Fixed errror regarding LGC and missing results 
p4#: 20794
 2013-03-06 15:13:37 +01:00
Magne Sjaastad
e94264a39f Added support for building of metadata from existing time steps 
Improved statistics calculation for opening single time step files
Close all dynamic access files when a time step statistics is complete
p4#: 20756
 2013-03-05 13:10:26 +01:00
Magne Sjaastad
452b08db3a Added progress info 
p4#: 20755
 2013-03-05 13:03:52 +01:00
Magne Sjaastad
debb8e132f Linux fix 
p4#: 20715
 2013-03-05 08:39:50 +01:00
Magne Sjaastad
7174049aed Use time step dates from first source case when creating a statistical result 
p4#: 20713
 2013-03-05 08:34:45 +01:00
Magne Sjaastad
a6c9d9d0f0 Linux fix 
p4#: 20696
 2013-03-02 15:39:33 +01:00
Magne Sjaastad
a63c656a48 Added RigStatistics 
p4#: 20695
 2013-03-02 15:33:27 +01:00
Magne Sjaastad
42f3f0b2d2 Fixed invalid check 
p4#: 20692
 2013-03-02 15:10:10 +01:00
Magne Sjaastad
27a8088421 Compute global count based on active cell vectors 
p4#: 20688
 2013-03-01 16:13:37 +01:00
Jacob Støren
1181d62b75 Reviewed and simplified DataAccess classes. 
Includes some const changes and some renaming
p4#: 20687
 2013-03-01 16:00:34 +01:00
CeetronResInsight
c0a578678d Linux compile fixes 
p4#: 20663
 2013-02-28 09:59:36 +01:00
Magne Sjaastad
0993a8984d Fixed unit tests 
p4#: 20659
 2013-02-28 08:04:43 +01:00
Jacob Støren
ad082254af Well pipe size now is based on min characteristic I, J cell size 
p4#: 20628
 2013-02-26 14:08:30 +01:00
Magne Sjaastad
1a235529ac Removed active cell info from RigCell 
Set all cells active for mock models
p4#: 20614
 2013-02-25 14:07:59 +01:00
Magne Sjaastad
d8000be32a Use isActiveInMatrixModel instead of activeInMatrixModel 
p4#: 20612
 2013-02-25 13:27:38 +01:00
Magne Sjaastad
8f50b90216 Added grid collection and reuse of MainGrid if the grids are equal 
p4#: 20517
 2013-02-14 13:16:56 +01:00
Magne Sjaastad
b1531c5454 Initial version of RigGridCollection 
p4#: 20514
 2013-02-14 10:08:56 +01:00
Magne Sjaastad
b4a6cccfb0 Added include of math.h 
p4#: 20508
 2013-02-13 14:59:30 +01:00
Magne Sjaastad
b8e663da03 Added list of files in CMakeLists_files.cmake 
Do not use precompiled headers for ReservoirDataModel files
p4#: 20506
 2013-02-13 14:50:37 +01:00
Magne Sjaastad
33a6157906 Cleanup of comments 
p4#: 20504
 2013-02-13 13:50:37 +01:00
Magne Sjaastad
a09dba2670 File rename from RigReservoir to RigEclipseCase 
p4#: 20503
 2013-02-13 13:33:35 +01:00
Magne Sjaastad
ec8817e207 Renamed RigReservoir to RigEclipseCase 
p4#: 20500
 2013-02-13 13:24:39 +01:00
Magne Sjaastad
b1cb8a6716 Moved result value vectors from MainGrid to Reservoir 
p4#: 20499
 2013-02-13 13:10:54 +01:00
Magne Sjaastad
f14c03f172 Fixed index bug in data access 
p4#: 20498
 2013-02-13 11:47:29 +01:00
Magne Sjaastad
a0d6890aa3 Removed obsolete code 
p4#: 20492
 2013-02-13 11:24:36 +01:00
Magne Sjaastad
e99c1cbfb1 Moved computation of geometry bounding box from main grid to reservoir 
p4#: 20490
 2013-02-13 11:04:45 +01:00
Magne Sjaastad
1a17875dc1 Restructured data access objects, added factory method 
p4#: 20471
 2013-02-12 14:46:45 +01:00
Magne Sjaastad
d45aded7f7 Removed more functions from MainGrid 
p4#: 20468
 2013-02-12 14:00:39 +01:00
Magne Sjaastad
6c7dc10791 Removed functions from MainGrid 
p4#: 20459
 2013-02-12 12:55:58 +01:00
Magne Sjaastad
ea2c890b95 Moved active cell computation from main grid to socket server 
p4#: 20458
 2013-02-12 12:05:41 +01:00
Magne Sjaastad
6101209d40 Moved functionality from main grid to active cell info 
p4#: 20457
 2013-02-12 11:50:23 +01:00
Magne Sjaastad
996f2fc7eb Release active cell info if no fracture cells is present. 
p4#: 20456
 2013-02-12 11:43:36 +01:00
Magne Sjaastad
99f5299030 Release active cell info if no fracture cells is present. 
p4#: 20456
 2013-02-12 11:26:33 +01:00
Magne Sjaastad
2b4edf39d1 Use active cell info structure 
p4#: 20455
 2013-02-12 11:15:36 +01:00