OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,121 Commits 28 Branches 61 Tags
440499fbfdf2c093e67c77845cb7c1822cc02662
Commit Graph

179 Commits

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