OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 23:46:00 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,757 Commits 28 Branches 61 Tags 290 MiB
eac27f149a
Commit Graph

249 Commits

Author SHA1 Message Date
Magne Sjaastad
363d624d38 Use global cell indices instead of cell ranges 2013-12-10 07:44:46 +01:00
JacobStoren
5ca8911a68 Linux compile fixes 2013-12-09 15:48:55 +01:00
Jacob Støren
63e945fedf Fixed error in test 2013-12-09 09:40:05 +01:00
Jacob Støren
d80611a61c Geometry tools update finalizing with Unit tests 2013-12-06 14:23:51 +01:00
Jacob Støren
819a2ab93e Wip 2013-12-05 11:02:05 +01:00
Jacob Støren
f92ca7fba7 Templatized some geometry tools 2013-12-05 11:02:02 +01:00
Jacob Støren
286bae9e85 Preparations for Templateification 2013-12-05 11:01:59 +01:00
Jacob Støren
d4345bef7d Preparations for Templatification 2013-12-05 11:01:57 +01:00
Jacob Støren
acef0c441d CMakeList error 2013-12-05 11:01:54 +01:00
Jacob Støren
05200fe01f Added MSVC ignores to .gitignore Start point of geometry fixes 2013-12-05 11:01:52 +01:00
JacobStoren
741debebd2 Fixed Linux compile issues 2013-12-05 10:48:57 +01:00
sigurdp
477792e89d Refactored naming of cvfqt:Utils member functions 2013-12-04 17:04:05 +01:00
Magne Sjaastad
2d22d31e12 Use several colors for faults to be able to separate them 2013-12-04 12:13:01 +01:00
Magne Sjaastad
3189437d5a Added color table array 2013-12-04 11:32:33 +01:00
Magne Sjaastad
f85b8aad08 Updated header 2013-12-04 09:39:50 +01:00
magnesj
65d9222d97 Fixes for Linux 2013-12-04 07:20:18 +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
9abc3387aa SSIHUB: Added visibility checkbox next to well path collection 2013-10-22 15:30:12 +02:00
Jacob Støren
5e51ded9a9 Well Label Color: Added label color setting on Well Paths 2013-10-01 11:47:57 +02:00
Jacob Støren
a8f9851896 Well Label Color: Preferences for new views and color setting on well 
collection.
 2013-10-01 11:13:23 +02:00
Jacob Støren
b0b24edeb9 Range/Property/Well Toggle fixes 
* Well cells are now toggled along with pipe geometry by the Well toggle in the tree view.
* TP# 4156 Range filter collection toggle does not work
This last one was really a huge error on several places in the overall logig of what is shown when.
p4#: 22337
 2013-09-06 15:45:21 +02:00
Jacob Støren
46f02f9384 Renaming and comments 
p4#: 22333
 2013-09-06 15:05:41 +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
b807a0e0ee MswRollUp: Removed obsolete code 
This is an intermediate commit and does not compile
p4#: 22220
 2013-08-26 14:27:39 +02:00
Jacob Støren
42408eda74 MswRollUp: Added some guarding to get the Troll_MSW case through. Needs some assert disabling in RigGridBase as well, but it is not included yet 
This is an intermediate commit and does not compile
p4#: 22218
 2013-08-26 14:21:21 +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
Magne Sjaastad
627211685d Wellcollection can control if well head label is positioned at top active cell for IJ column or top Z of active cells bounding box 
p4#: 22190
 2013-08-22 07:55:21 +02:00
Magne Sjaastad
7d3ca2fb25 Avoid modifying x and y when computing z-value for well head pipe 
p4#: 22153
 2013-08-13 10:02:19 +02:00
Magne Sjaastad
562dfb0135 Do not show well cells when wells are turned off 
Renaming
p4#: 22141
 2013-08-08 17:15:17 +02:00
Magne Sjaastad
e747804ef4 Well head arrow is starting at well cell located at top of the K column the well head exists in. 
This way all well heads are visible all the time, even when inactive cells are visible
p4#: 22140
 2013-08-08 17:03:17 +02:00
Magne Sjaastad
8f4e6da98b Include well cells in cell range region evaluation 
p4#: 22131
 2013-08-08 11:26:00 +02:00
Magne Sjaastad
008842a1ee Renamed cell filter field from active to isActive 
Removed the special handling of range filters when only exclude filters are active
p4#: 22123
 2013-08-08 08:49:29 +02:00
Magne Sjaastad
3f61c26f0b Updated file paths in regression tests 
p4#: 22097
 2013-08-06 09:52:01 +02:00
Magne Sjaastad
f2be4dedaf Fix for range filter exclude behaviour 
Use active cells as range include filter when there are range exclude filters present and no include filters
p4#: 22095
 2013-08-05 12:48:11 +02:00
Magne Sjaastad
390abe0f81 Use compare() because endsWith() does not work as expected on Windows 
p4#: 22005
 2013-06-26 12:01:53 +02:00
Jacob Støren
b5688c5cd9 Hack: Well label now rendered "under" transparent cells to workaround random behaviour (on certain hw ?) 
p4#: 22004
 2013-06-26 10:30:48 +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
Jacob Støren
b59ac41509 Test of fix of MSW assert 
p4#: 21978
 2013-06-24 15:15:46 +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
2a2102837a Fixed missing last coordinate for filetered coords 
p4#: 21955
 2013-06-18 11:26:52 +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
Jacob Støren
03ad142261 Removed debug output 
p4#: 21887
 2013-06-12 10:52:46 +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
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
4a0c3d7ca9 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#: 21651
 2013-05-16 12:59:01 +02:00
Jacob Støren
6784a8e596 Fixed Well pipe "peaks". The centerline filtering tolerance was too small. 
p4#: 21580
 2013-05-08 13:14:33 +02:00
Jacob Støren
5c0e55e7c1 Linux compile fixes 
p4#: 21550
 2013-05-06 12:02:32 +02:00
Jacob Støren
cf664210bf Major cleanup/change in the way things are included. 
Needs a Linux compile check.
p4#: 21545
 2013-05-06 10:55:00 +02:00
Jacob Støren
60f86cfc3f Result Selection: Result is not changed before user actively selects in the list. 
Changig type or porosity model only changes what variables are shown as accessible.
This is also applied to property filters.
Dual porosity support is also added to property filtered. Forgotten before.
p4#: 21499
 2013-04-30 13:41:53 +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
Jacob Støren
b14b138dae Range Filter: Added option to not propagate rangefilter onto the subgrids 
p4#: 21445
 2013-04-26 08:53:40 +02:00
Jacob Støren
4ca363cde5 Fixed bug: Missing well cells in lgr when range filtering 
p4#: 21442
 2013-04-25 14:56:46 +02:00
Magne Sjaastad
a5b3c233d2 Update icon state for well collection when toggled off 
p4#: 21430
 2013-04-25 11:09:34 +02:00
Magne Sjaastad
8fc9d06edb Toggle on off visibility of wells in well collection 
p4#: 21419
 2013-04-25 09:07:29 +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
Jacob Støren
6cac031fff Added well pipe visibility filter based on cell visibility. 
Only show pipes with wells with open connections in visible cells
p4#: 21349
 2013-04-22 09:13:37 +02:00
Magne Sjaastad
b5b9a736e2 As creation of a font is time consuming, create one application font instance 
p4#: 21338
 2013-04-19 08:02:36 +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
Jacob Støren
9e588e38c3 Established new base images for regressiontest. Small models. 
p4#: 21290
 2013-04-16 07:34:50 +02:00
Magne Sjaastad
8ed9cee99e Use small font when drawing well head labels 
p4#: 21285
 2013-04-15 13:36:37 +02:00
Jacob Støren
337e0c3226 Added mesh color as preference, and resetting of preferences before doing regression tests 
p4#: 21263
 2013-04-12 13:15:41 +02:00
Magne Sjaastad
e5f9b41c0f Moved font creation into RivReservoirPipesPartMgr 
Added clearGeometryCache
p4#: 21252
 2013-04-12 09:20:40 +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
6a2cbbcf07 Renamed files: 
RimReservoir		RimCase
RimResultReservoir	RimResultCase
RimInputReservoir	RimInputCase
p4#: 21069
 2013-03-22 16:40:41 +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
Magne Sjaastad
21065176f2 Rename of functions in RigActiveCellInfo 
p4#: 21045
 2013-03-22 09:32:42 +01:00
Jacob Støren
3013992518 Fixed error regarding missing well cells in property filtered views 
p4#: 20882
 2013-03-13 13:06:37 +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
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
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
Jacob Støren
39ac12f2f3 Pipe generator: Added some asserts. 
p4#: 20624
 2013-02-26 11:49:28 +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
f04b4b0258 Use data access objects for cell edge visualization 
p4#: 20489
 2013-02-13 10:27:33 +01:00
Magne Sjaastad
1a17875dc1 Restructured data access objects, added factory method 
p4#: 20471
 2013-02-12 14:46:45 +01:00
Jacob Støren
09544f082b Guard against missing well results 
When project file has settings for wells but there are no well results
p4#: 20416
 2013-02-07 13:44:18 +01:00
Jacob Støren
87a120dc39 Static results: Fixed crash when going to timestep > 0 
p4#: 20356
 2013-02-04 13:45:46 +01:00
Magne Sjaastad
644d201b37 Added porosity model to ResultDefinition 
Keep this property hidden from GUI until more testing is done
p4#: 20339
 2013-02-01 14:39:32 +01:00
Magne Sjaastad
578e3f7db3 Use data access object 
p4#: 20336
 2013-02-01 13:34:27 +01:00
Magne Sjaastad
01f3fb8e94 Moved result interface from struct grid to struct grid scalar data access 
Use this concept to configure result data values to use for vizualization. Created data access object for RegGrid.
p4#: 20334
 2013-02-01 12:25:34 +01:00
Magne Sjaastad
ce95f13c10 Added reading of fracture model active index 
Lots of renaming
p4#: 20302
 2013-01-30 14:13:50 +01:00
Magne Sjaastad
1c8bb6e38e Prepare for dual porosity 
Renamed active to matrixActive
p4#: 20286
 2013-01-29 15:09:34 +01:00
Magne Sjaastad
cd9d94f5f9 Prepare for dual porosity data structures. 
Renamed from activeCellIndex to activeMatrixCellIndex
p4#: 20285
 2013-01-29 14:56:55 +01:00
Jacob Støren
268b38aa65 Removed even more compiler warnings. 
p4#: 20220
 2013-01-23 10:56:09 +01:00
Magne Sjaastad
9c1ce7591e Upgraded visualization libraries 
Major refactoring of color legend framework
Added discrete log color legend
p4#: 18989
 2012-10-02 10:17:52 +02:00
Magne Sjaastad
2bbd48588e Fixes for Visual Studio 2012-09-10 11:34:11 +02:00
Alf Birger Rustad
1ef02299c1 Merge pull request #7 from Ivarun/build_fixes 
Build fixes
 2012-09-01 10:37:08 -07:00
Magne Sjaastad
27d8808c5c Version 0.8.6 2012-08-31 19:12:47 +02:00
Ivar Ursin Nikolaisen
85c96b5567 Add libpthread link to unit tests that require it. 2012-08-27 15:22:03 +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