Commit Graph

223 Commits

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