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
4,543 Commits 27 Branches 61 Tags 309 MiB
4ec6dc3796
Commit Graph

265 Commits

Author SHA1 Message Date
Jacob Støren
27f6b980fe #778 Display unit on Y-Axis. Added unit to legend. Cosmetics on Curve Filter Prop-panel 2016-06-22 14:34:56 +02:00
Jacob Støren
5c09935ac5 #782 Avoid creating curves for none existing data. 2016-06-21 15:56:09 +02:00
Jacob Støren
a37449d99d Used the new Ert support to retreive the summary lgr names and ijk values 2016-06-16 16:55:02 +02:00
Jacob Støren
2bb2758523 #755 Used the same order as ERT on the display, - and search strings for Summary Variables 2016-06-10 14:11:22 +02:00
Jacob Støren
80d7ae7262 #755 Curve Gui adjusted according to input from CFB. Now working as intended. 2016-06-10 12:30:20 +02:00
Jacob Støren
e21ddfe74a #755 First simple version of the proposed GUI. Type and Quantity name filter working. 2016-06-09 11:08:12 +02:00
Jacob Støren
336828e48d #755 WIP: Started to adapt to using the smspec node from eclipse. Established Rim prototype of "filter" concept for summary variables 2016-06-09 11:08:12 +02:00
Magne Sjaastad
7742fbe325 Encapsulate the JSON code in a namespace to avoid issues with JSON classes used in opm-parser 2016-06-06 10:43:36 +02:00
Magne Sjaastad
e603773417 Added missing pragma once 2016-06-06 07:13:53 +02:00
Jacob Støren
40388b308b #739 Added summary case classes. Use those from the summary curves. Made save/restore work again for the summary plots. File format for Summary stuff are changed. 2016-05-31 13:48:22 +02:00
Jacob Støren
5732b5008f Cached result variables in the summary reader 
Fixed late field initialization
Additional cleanup and rename
 2016-05-31 13:48:22 +02:00
Magne Sjaastad
1929798532 Moved include_directory from main to ApplicationCode. Include of Eclipse hearder files must now be prefixed with ert/<module_name> 2016-05-26 14:55:59 +02:00
Magne Sjaastad
5640621049 Added EclipseSummaryAddress 2016-05-04 14:11:04 +02:00
Magne Sjaastad
4b33c31a0f (#736) Added support for basic metadata and basic value queries 2016-04-20 08:05:35 +02:00
Jacob Støren
0e8191d6eb (#712) Set well head connection status to closed always as they are no part of the connection table in Eclipse 
This to remedy that ERT returns open as connection status for well heads.
 2016-01-07 14:24:59 +01:00
Jacob Støren
6db74465b6 Removed debug output 2015-12-14 09:53:59 +01:00
Magne Sjaastad
c72e047b23 (#687) Moved FileInterface tests into ApplicationCode/UnitTests 2015-12-03 11:11:07 +01:00
Jacob Støren
7b9f2b41ed CppCheck fixes, Errors Warnings and performance 2015-11-27 16:37:26 +01:00
Magne Sjaastad
9429458d32 Rename from cells to globalCellArray 2015-11-24 14:21:02 +01:00
Magne Sjaastad
4971304bf9 (#597) Fixed how fraction of day is used to adjust time step date 2015-11-23 08:37:45 +01:00
Magne Sjaastad
7a6c4c06b9 System : Removed unused variables 2015-10-26 11:09:57 +01:00
Magne Sjaastad
7d02c794b7 System : Removed elements after unique has been called 2015-10-26 10:18:58 +01:00
Magne Sjaastad
01224dd5e6 System : Removed unused variables 2015-10-26 10:18:57 +01:00
Magne Sjaastad
0405584bb6 System : Replaced tab with four spaces in ApplicationCode and subfolders 2015-10-23 15:46:25 +02:00
Magne Sjaastad
061288f1c3 (#495) Removed use of StdInclude 2015-09-25 15:57:50 +02:00
Magne Sjaastad
90762d0f0f Use uiCapability/xmlCapability instead of capability<caf::PdmUiFieldHandle>()(capability<caf::PdmXmlFieldHandle>() 2015-08-05 13:27:36 +02:00
Magne Sjaastad
737936d846 Major modularization adjustments 
Use uiField() when issuing setUi....() commands
Use PdmChildArrayField instead of PdmPointersFielc
Use PdmChildField instead of PdmField to pdm pointer objects
Use PdmChildArrayField instead of PdmField< std::list< caf::PdmPointer<
type > > >
Use PdmObjectHandle instead of PdmObject
Replaced parentFields(std::vector)  with parentField()
Use PdmUiPropertyViewDialog instead of PdmUiPropertyDialog
 2015-07-31 18:58:23 +02:00
Jacob Støren
24fb7ac584 Hack to be able to read synthetic odb related Eclipse cases 2015-06-10 10:34:05 +02:00
Stein Dale
85f62ec1d4 Moved code to new library: ResultStatisticsCache 
Moved  RigStatisticsCalculator.h/.cpp, RigStatisticsDataCache.h/.cpp,
RigStatisticsMath.h/.cpp to new library ResultStatisticsCache.
ResInsight and some unit tests now link with this new library.
 2015-05-11 13:25:05 +02:00
Jacob Støren
4a21bb4a30 Added RimView, and sorted the libs in folders 2015-04-29 10:50:25 +02:00
Jacob Støren
a5fba8f3f4 Fixes to match new Ert 2015-04-14 15:47:51 +02:00
Jacob Støren
02e47c6679 Guard against reading nnc data if none are available 
See Issue #278. (Not fixing the issue, just improving code)
 2015-02-24 14:57:23 +01:00
Magne Sjaastad
8de0f468ac Fixed invalid foreach syntax 2015-01-09 08:37:22 +01:00
Magne Sjaastad
9ded05212f Merge branch 'pr/268' into dev 2015-01-09 08:05:23 +01:00
Magne Sjaastad
053a9c4d78 Improved parsing of fault face text strings 
See https://github.com/OPM/ResInsight/issues/263
 2015-01-09 07:42:49 +01:00
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
Magne Sjaastad
0dcba178fd Do not show NNC text at all in progress bar when NNC import is disabled 2014-11-06 09:35:39 +01:00
Magne Sjaastad
619b7a211a Fix for dates before 1970 2014-10-29 09:34:57 +01:00
Magne Sjaastad
043584b1b1 Faults : Improved robustness of fault names including space 2014-10-28 11:07:59 +01:00
Magne Sjaastad
2509fa974f Performance : Now possible to disable load of SOIL on load 2014-10-24 11:38:47 +02:00
Magne Sjaastad
a5e4e756af Updated ERT, now possible to read simplified MSW 
Updated ERT to 3ac60303aa2dc58aed9420a24d9a881fec32076b
 2014-10-24 11:19:54 +02:00
Magne Sjaastad
63a5dd24fe Added support for fault face using IJK in addition to XYZ 2014-10-09 20:36:27 +02:00
Magne Sjaastad
b93053b089 Updated ERT to 946e512ac17c1e2469892072a925428c0a012fa1 2014-10-09 20:13:04 +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
Magne Sjaastad
ffbfb8bdf0 Read units type from file and set CDARCHY value based on units type 2014-08-27 14:05:35 +02:00
Magne Sjaastad
b90c230d5c Fault import : Skip reading if same line contains end keyword 2014-08-27 09:21:52 +02:00
Jacob Støren
781d008f07 Faults: Fixed bug introduced by 76d6304 2014-08-26 17:23:22 +02:00
Magne Sjaastad
10c76f2926 Fault import : Handle invalid fault specification gracefully 2014-08-26 14:37:20 +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
9e22c90a4a Renamed cellindex to gridLocalCellIndex 2014-08-22 13:39:21 +02:00
Magne Sjaastad
8451ffc2fb Added include to RigResultAccessor in factory 2014-08-14 10:56:32 +02:00
Magne Sjaastad
cb1407a86b Use RigResultAccessFactory 2014-08-14 10:56:29 +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
0ea794a1a8 Renamed localCellIndex to gridLocalCellIndex 2014-08-14 10:56:23 +02:00
Jacob Støren
322823754b Replaced dataAccessObject with resultAccessor 2014-08-14 10:56:20 +02:00
Magne Sjaastad
09f7868eb5 Preferences : Updated default values 2014-08-14 10:56:04 +02:00
Magne Sjaastad
ce58846584 Updates to tests 2014-08-14 10:55:57 +02:00
Magne Sjaastad
032a263685 Performance: Control how much data to import from file 
User can control if faults, NNCs and simulation wells are to be imported
from file.
 2014-08-14 10:55:56 +02:00
Magne Sjaastad
9fd4c268d8 Adjusted file unit test 2014-08-14 10:55:53 +02:00
Jacob Støren
549e61af77 Fixed some compiler warnings 2014-08-14 10:55:41 +02:00
Magne Sjaastad
7faf950dc7 riGetActiveCellProperty: Fix for input properties 
Only read values for active cells if we have result values for all cells
 2014-06-11 12:06:15 +02:00
Magne Sjaastad
a37b9f6ea2 Consolidated reading of double data from input file 2014-06-11 08:42:47 +02:00
Magne Sjaastad
2e45fc41cb Improved robustness for reading faults 2014-04-25 08:39:42 +02:00
Magne Sjaastad
ae9f72912e Added customized mock model to user interface 2014-04-14 09:16:03 +02:00
Magne Sjaastad
dbc357eb39 Avoid duplicate filenames containing faults 2014-01-08 10:07:42 +01:00
Magne Sjaastad
4391a4ff65 Show fault result mapping in 3D info. Fixed display model update. 2014-01-06 14:02:08 +01:00
Magne Sjaastad
3e6954d7f5 Read multiple FAULTS keywords 
A list of files are cached in the project file. When reading faults from
these files, make sure multiple FAULTS keywords in the same file is
parsed.
 2014-01-03 09:44:13 +01:00
Magne Sjaastad
183203344b Option: Read fault data 2014-01-02 15:10:33 +01:00
Magne Sjaastad
e8137ff78a NNC: Show IJK values in Result Info 2013-12-20 14:29:08 +01:00
Magne Sjaastad
59eeb0894f Faults: Eclipse input case use preferences to control import of faults 2013-12-20 09:18:52 +01:00
Magne Sjaastad
b7141dde50 Preferences: Read faults on import and fault default visibility 2013-12-20 08:48:54 +01:00
Jacob Støren
909831ad34 NNC: Removed some debug output 2013-12-19 10:50:51 +01:00
Jacob Støren
b7f305b142 Faults: Face culling handles flipaxis 2013-12-19 08:48:36 +01:00
Jacob Støren
12e818b3b2 Updated cell topology comments 2013-12-18 15:36:28 +01:00
Magne Sjaastad
b53e21a61d Store filenames for files with faults in project file 2013-12-17 11:52:53 +01:00
Jacob Støren
2a31035fb4 NNC: Added som diagnostics output 2013-12-16 14:26:07 +01:00
Jacob Støren
e171aa66ac NNC processing first cut 2013-12-12 22:18:11 +01:00
Jacob Støren
04ccadd2f1 NNC import started 2013-12-12 22:18:03 +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
Jacob Støren
1cce11f7f9 Add possible support for AllCell result in Result Cases 
See issue #99 and #100
 2013-10-18 14:27:37 +02:00
Magne Sjaastad
1d160d4f8a Use date function from ERT, as ecl_rsthead_date() can handle time step 
defined before 1970. This type of typesteps are often used in synthetic
cases.
 2013-10-08 13:33:02 +02:00
sigurdp
bcc33397a3 Adapted cmake files to new directory structure 2013-09-20 16:21:46 +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
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
5e629795e4 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:22:30 +02:00
Jacob Støren
dbb72475e5 MswRollUp: Final commit: Reapplying changes and bugfixes from trunk in conflicting files. 
The changes are from changelist numbers: 22190, 22189, 22154, 22151, 22141, 22124, 22010
Now It is supposed to compile again.
p4#: 22231
 2013-08-26 21:56:40 +02:00
Jacob Støren
6ca3afa609 MswRollUp: Use only closest connection above and below 
Added a lot of info to the positionContributions
Finally found a fairly ok method to calculate the positions, namely to
use only the closest connection above and below. Did also offset split
point positions somewhat, to make the small branches visible.

This is an intermediate commit and does not compile
p4#: 22230
 2013-08-26 15:28:34 +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
1a285cebe0 MswRollUp: Guarded the interpolation against undefined pos 
This is an intermediate commit and does not compile
p4#: 22227
 2013-08-26 15:16:20 +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
6ecfbdb8ee MswRollUp: Finally implemented through all the interpolation and segment position calculation. Completely untested 
This is an intermediate commit and does not compile
p4#: 22225
 2013-08-26 14:56:34 +02:00
Jacob Støren
d7d5d2942b MswRollUp: Updated Ert to commit 1fea6b00f3 master Fixed an Api change 
This is an intermediate commit and does not compile
p4#: 22222
 2013-08-26 14:44:03 +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
544d98b37e MswRollUp: Adding Branch start cell to start of branch 
This is an intermediate commit and does not compile
p4#: 22217
 2013-08-26 14:16:07 +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