Commit Graph

5272 Commits

Author SHA1 Message Date
Magne Sjaastad
b36fcb5f09 #1954 Observed Data : Display imported variables as text in property editor 2017-10-03 15:31:45 +02:00
Magne Sjaastad
6ca1ef6653 Reorganized includes 2017-10-03 14:50:06 +02:00
Magne Sjaastad
db981e2eee #1962 : Observed Data : Add helper class for QDateTime and use from parsers 2017-10-03 14:14:16 +02:00
Magne Sjaastad
f3f78995fa #1959 Observed Data : Support custom ordering of header rows 2017-10-03 11:55:06 +02:00
Magne Sjaastad
4c61696f4e #1959 Observed Data : Use seekg after parsing header 2017-10-03 11:55:06 +02:00
Magne Sjaastad
2fc1d20f45 #1959 : Improve detection of comment lines in header 2017-10-03 11:55:06 +02:00
Bjørn Erik Jensen
5375da3fc8 Date string parser. Add missing include to fix Linux build 2017-10-03 11:17:43 +02:00
Bjørn Erik Jensen
0516330b4d Tools. Implement RiaDateStringParser. Parses various date string formats into a QDate 2017-10-03 11:05:23 +02:00
Jacob Støren
c8b329ddc3 Update libecl to 2e36798b43. For better memory usage reading wells 2017-10-02 17:11:36 +02:00
Magne Sjaastad
a362891d7e #1940 Curve Creator : Make sure the curve tree is updated 2017-10-02 14:49:24 +02:00
Magne Sjaastad
2d50a68286 Observed Data : Rename to RifEclipseUserDataParserTools 2017-10-02 14:06:43 +02:00
Magne Sjaastad
62c8219a27 #1953 : Update curve visibility when unchecking RimSummaryCurveCollection 2017-10-02 13:32:02 +02:00
Magne Sjaastad
840abd5a5c Summary Plot : Show EditSummaryPlot on context menu for SummaryCurveCollection 2017-10-02 13:03:45 +02:00
Magne Sjaastad
0fd2df9f57 Edit Summary Plot: Improve isCommandEnabled 2017-10-02 12:48:01 +02:00
Magne Sjaastad
eec974c53d #1940 Curve Creator : Always recreate curve creator to ensure stable init 2017-10-02 12:46:40 +02:00
Jacob Støren
fd1b8c83ff #1944 Use line style None, and force symbols on for observed data 2017-10-02 08:53:29 +02:00
Arne Morten Kvarving
ab4619bf74 fixed: add missing cmath include statements
highlighted by building with gcc6
2017-09-29 18:24:28 +02:00
Jacob Støren
1c2466fa85 #1951 Use a valid default start date 2017-09-29 15:11:21 +02:00
Rebecca Cox
05e3774d36 #1915 Curve creator: Remove option to make default curve filter in preferences 2017-09-29 13:23:23 +02:00
Unknown
e1c58fd1c3 #1945 Curve creator: Remove "Contribute to legend" option 2017-09-29 12:47:10 +02:00
Unknown
d9bee55116 Observed data: Rename Observed data to Observed Time History Data in GUI 2017-09-29 11:39:07 +02:00
Unknown
1ae470a415 #1946 Observed Data: Add Command to File->Import menu in main window 2017-09-29 11:38:19 +02:00
Unknown
500aaed00b 1941 Observed data: Set UTC time spec for parsed QDateTime object 2017-09-29 11:17:33 +02:00
Bjørn Erik Jensen
9db96cbb1b #1943 Curve creator. RimProject::allSummaryCases also returns observed data 2017-09-28 14:42:13 +02:00
Unknown
8a139f7ebe #1939 Curve creator: Created or edited plots is toggled on Apply/OK 2017-09-28 11:17:00 +02:00
Unknown
068bf64717 #1916 Plot project tree: Select first case of selection after grouping, and leave new group expanded 2017-09-28 10:46:26 +02:00
Unknown
29ac350b8f #1939 Curve creator: Select newly created or edited plot on Apply/OK. Will only be visible if plot is toggled 2017-09-28 10:18:16 +02:00
Magne Sjaastad
8bae516af7 #1941 : Obseved Data : Add support for parsing of start date 2017-09-28 09:06:40 +02:00
Magne Sjaastad
9364efa4b7 #1941 Observed Data : Add RiaDateTimeTools 2017-09-28 08:04:27 +02:00
Jacob Støren
00ef13094a Revert hard setting of linestyle NONE fro observed data. Must be more graceful 2017-09-27 19:43:11 +02:00
Bjørn Erik Jensen
fddabb61e2 Curve creator. Set line style NONE for observed data curves (II). Remove test code. 2017-09-27 15:33:46 +02:00
Magne Sjaastad
330f8a43b3 #1918 Observed Data : Scale time based on time unit 2017-09-27 15:28:34 +02:00
Magne Sjaastad
67c1ee2dbb #1918 Observed Data : Rename 2017-09-27 15:19:04 +02:00
Magne Sjaastad
cdd1a96f44 #1934 Observed Data : Support for vector based files 2017-09-27 15:17:42 +02:00
Jacob Støren
53ec396449 #1927 Avoid enabling of command if text is not at least 12 char long 2017-09-27 15:13:35 +02:00
Rebecca Cox
faf5f59be6 #1820 Observed data: Add close command of observed data 2017-09-27 15:07:32 +02:00
Bjørn Erik Jensen
4f238a74b0 Curve creator. Set line style NONE for observed data curves 2017-09-27 14:58:01 +02:00
Rebecca Cox
31133f31c0 #1938 Curve creator: Close all widgets on closing of curve creator 2017-09-27 14:35:33 +02:00
Rebecca Cox
4019e76ae1 #1938 Curve creator: Show Plot Data will not raise main plot window 2017-09-27 14:35:33 +02:00
Magne Sjaastad
074795300c #1918 Observed Data :Remove dummy placeholder 2017-09-27 14:26:46 +02:00
Magne Sjaastad
dc23c63b97 #1918 : Observed Data : Rename of several files 2017-09-27 14:21:58 +02:00
Jacob Støren
a24ce670cf Fix two compiler warnings 2017-09-27 13:44:45 +02:00
Bjørn Erik Jensen
70a41709cf #1842 RFT plot. Initial commit. Under construction... 2017-09-27 12:39:35 +02:00
Rebecca Cox
88902e8f03 #1933 Observed data: Sets restOfHeader correctly 2017-09-27 09:32:10 +02:00
Magne Sjaastad
802a9154e4 #1912 Curve Creator : Avoid selection in main project tree when clicking on curve 2017-09-27 08:12:01 +02:00
Magne Sjaastad
1b96ab747d Cleaned up includes 2017-09-27 07:24:48 +02:00
Rebecca Cox
d8ebe508a2 #1933 Observed data: Speed up reading observed data file 2017-09-26 15:44:02 +02:00
Rebecca Cox
b8f18dd4c8 #1933 Observed data: set isAVector correctly 2017-09-26 14:06:36 +02:00
Rebecca Cox
2dda47014c #1933 Observed data: Handle lack of unit name in file 2017-09-26 13:31:05 +02:00
Rebecca Cox
93971e541c #1922 Observed data: Update column parser to handle keywords 2017-09-26 13:14:00 +02:00
Rebecca Cox
745bed2573 #1933 Observed data: change int to size_t and clean up 2017-09-26 11:06:09 +02:00
Jacob Støren
c0f978f006 Improved splitter handle images 2017-09-26 10:50:09 +02:00
Jacob Støren
64445e65b9 Moved Summary Plots collection above Well Log Plots 2017-09-26 10:50:09 +02:00
Bjørn Erik Jensen
4efe9ca944 Observed data. Fixed editor display for observed data 2017-09-26 10:39:36 +02:00
Rebecca Cox
e15d26cddb #1933 Observed data: Add scaleFactor to ColumnInfo 2017-09-26 10:12:05 +02:00
Rebecca Cox
563a426ed5 #1839 Observed data: Add SummaryAddress to ColumnInfo 2017-09-26 09:38:29 +02:00
Rebecca Cox
b311d8827c #1839 Observed data: Remove unused includes 2017-09-26 09:38:29 +02:00
Magne Sjaastad
c7fb2351b1 Cleaned up includes 2017-09-26 08:28:04 +02:00
Magne Sjaastad
e62d5e4277 Cleaned up includes 2017-09-26 08:25:49 +02:00
Bjørn Erik Jensen
4dde03c1ac Curve creator. Fixed observed data address filtering 2017-09-26 08:25:36 +02:00
Bjørn Erik Jensen
8554b7eab0 #1930 Curve creator. GUI adjustments (II) 2017-09-25 15:39:13 +02:00
Rebecca Cox
e7896e59cf #1839 Observed data: Unit test for keyword VECTOR parser 2017-09-25 14:38:32 +02:00
Rebecca Cox
8f14016eed #1839 Observed data: Parser for data with keyword VECTOR 2017-09-25 14:38:32 +02:00
Magne Sjaastad
ef56591555 #1934 #1839 Observed Data : Add parsing of column based summary data 2017-09-25 14:37:45 +02:00
Bjørn Erik Jensen
05c07693b6 #1930 Curve creator. GUI adjustments 2017-09-25 14:33:21 +02:00
Rebecca Cox
5d52ba2a83 #1839 Observed data: Unit test for RSMSPEC tools 2017-09-25 09:07:43 +02:00
Rebecca Cox
32fe3d41a4 #1839 Observed data: Move RSMSPEC static methods to tools method 2017-09-25 09:07:14 +02:00
Rebecca Cox
cb2bb6d835 #1839 Observed data: Add unit test for column based RSMSPEC parser 2017-09-24 18:04:19 +02:00
Rebecca Cox
6e4c28605e #1839 Observed data: Add column based rsmspec parser 2017-09-24 18:04:19 +02:00
Rebecca Cox
797c040057 #1816 Observed data: Remove superfluous functions in column ascii parser 2017-09-24 18:04:19 +02:00
Jacob Støren
1309424835 #1923 Avoid plot update for each curve when updating the Curve Creator target plot 2017-09-23 09:12:49 +02:00
Jacob Støren
0bb47cba88 #1923 Add no-plot-update versions of update methods in curve system. onLoadDataAndUpdate is improved for summary curve but not always called with the "no update" flag set 2017-09-23 08:47:04 +02:00
Jacob Støren
f9b26ce104 #1923 Replace int-based vector selection list with a summaryaddress based one
This removes a loop over all the adresses in the summary case for each curve, and makes the highlight of the selection more stable
2017-09-23 08:26:21 +02:00
Bjørn Erik Jensen
b28bcaa4e4 #1927 Paste Ascii data command. Create an empty summary plot 2017-09-22 15:38:40 +02:00
Magne Sjaastad
eb8dbb1b86 #1839 Observed Data : Added const to RifSummaryReaderInterface 2017-09-22 15:02:15 +02:00
Magne Sjaastad
eb744f381d #1816 : Observed Data : Add mock data to RifReaderObservedData 2017-09-22 15:02:15 +02:00
Magne Sjaastad
363224e39a #1839 Observed Data : Move summary files into summary folder 2017-09-22 15:02:15 +02:00
Magne Sjaastad
8f158510f9 #1918 Observed Data : Stripped down SummaryReaderInterface 2017-09-22 15:02:15 +02:00
Magne Sjaastad
30a77e4f68 #1918 Observed Data : Cleaned up includes 2017-09-22 15:02:14 +02:00
Magne Sjaastad
aba74bcdfd #1918 Observed Data : Remove RigSummaryCaseData 2017-09-22 15:02:14 +02:00
Magne Sjaastad
32fa6d4920 #1918 Observed Data : Removed RigCase RigSummaryCaseData from RimSummaryCase 2017-09-22 15:02:14 +02:00
Bjørn Erik Jensen
2bad74b4aa #1928 Curve Creator. Appearance label fix. Move group boxes 2017-09-22 14:40:06 +02:00
Magne Sjaastad
edd39b6ff1 #1926 Fishbones Export : Guard input values to std::vector::reserve() 2017-09-22 13:10:12 +02:00
Bjørn Erik Jensen
d83c468033 #1919 Curve Creator. Fix summary category initial selection 2017-09-22 12:53:54 +02:00
Bjørn Erik Jensen
0ae5c344d3 #1922 Curve creator. Set dialog window title 2017-09-22 12:02:13 +02:00
Bjørn Erik Jensen
f4148dfe7a #1920 Curve creator. Adjust target plot combobox width to contents 2017-09-22 11:49:00 +02:00
Bjørn Erik Jensen
70ede18dc1 #1924 Curve creator. Fix auto appearance behavior 2017-09-22 11:02:49 +02:00
Bjørn Erik Jensen
8e2f97ffea #1921. Fix typo 2017-09-22 10:02:58 +02:00
Bjørn Erik Jensen
1590a2a26e #1921 Curve Creator. Add curve name config 2017-09-22 09:54:55 +02:00
Magne Sjaastad
2773c00f25 #1918 Observed Data : Use RifEclipseSummaryAddress when asking for timesteps 2017-09-21 19:38:09 +02:00
Bjørn Erik Jensen
e7f19ff89d #1914 Curve creator. Bring curve creator dialog to front on new plot and edit plot commands 2017-09-21 15:48:00 +02:00
Bjørn Erik Jensen
00fc2a2eaa #1853 Summary curve filter. Remove unused includes and friend declarations 2017-09-21 15:18:28 +02:00
Magne Sjaastad
7e2b0d20b5 Remove unused code and clean up includes 2017-09-21 15:12:03 +02:00
Magne Sjaastad
940b452054 Remove #pragma once from cpp file 2017-09-21 15:10:36 +02:00
Bjørn Erik Jensen
4977d63c55 Summary plot. Remove include to fix Linux build failure 2017-09-21 14:55:16 +02:00
Bjørn Erik Jensen
e3a169e7b8 #1853 Convert project. Move all existing curves in a plot to summary curve collection. 2017-09-21 14:26:57 +02:00
Rebecca Cox
2966412bce #1816 Observed data: Only one timesteps-vector in ascii parser 2017-09-21 12:21:52 +02:00
Rebecca Cox
62d9978504 #1816 Move functions from SummaryReaderInterface to EclipseSummaryReader 2017-09-21 12:21:52 +02:00
Rebecca Cox
68a101fe2d #1816 Use new parser on pasting data to summary plot 2017-09-21 12:21:52 +02:00
Rebecca Cox
c7c06c311b #1816 Observed data: Add time step index to summary address 2017-09-21 12:21:52 +02:00
Magne Sjaastad
3157346292 Preferences : Show Class Names is now available in Release 2017-09-21 12:05:45 +02:00
Bjørn Erik Jensen
4c6c3ae564 #1913 New summary plot. Always show 'new plot' in target plots drop down 2017-09-21 11:00:03 +02:00
Bjørn Erik Jensen
a72f2ea421 #1917 Plot project tree. Clean up summary plot popup menu. 2017-09-21 10:47:55 +02:00
Bjørn Erik Jensen
292ea3c67f #1913 New summary plot. Command brings up curve creator and creates new plot on Apply/OK 2017-09-21 09:50:03 +02:00
Rebecca Cox
9d56cee1be #1816 Observed data: In parser, split header on cellseparator, not tab 2017-09-21 09:00:51 +02:00
Rebecca Cox
e26d978da4 #1816 Observed data: Add unit test for ascii parser 2017-09-21 09:00:51 +02:00
Rebecca Cox
bea3bd12b8 #1816 Observed data: Add ascii parser 2017-09-21 09:00:51 +02:00
Rebecca Cox
d0d8a7d4be #1816 Observed data: Reader interface will be used throughout the code 2017-09-21 09:00:51 +02:00
Jacob Støren
7429b21fff #1910 Use NTG for transmissibility calculations of Perforations and fishbones and as std eclipse calculation as basis for WPIMULT 2017-09-20 15:25:02 +02:00
Bjørn Erik Jensen
b0554516dd #1897 Curve creator. Use only one region editor for region to region category 2017-09-20 13:06:55 +02:00
Bjørn Erik Jensen
89bc438921 #1815 Curve creator. Fix bug related to observed data summaries 2017-09-20 12:55:16 +02:00
Jacob Støren
1326912b7c Merge branch 'dev' of https://github.com/OPM/ResInsight.git 2017-09-20 12:34:08 +02:00
Bjørn Erik Jensen
b430982b2f #1895 Curve creator. Filter curves by selecting summary category/categories 2017-09-20 11:42:56 +02:00
Bjørn Erik Jensen
dd8549d3d1 #1815 Curve Creator. Display observed data in summaries editor 2017-09-20 11:20:45 +02:00
Jacob Støren
b03da807ea Merge fixes related to #1901 Perforation COMPDAT export errors 2017-09-20 11:05:59 +02:00
Jacob Støren
50a88dff4a #1901 Fix error in peaceman radius calculation. Used int values 1/2 and 1/4 as exponent, which ends in 0. 2017-09-20 11:02:19 +02:00
Magne Sjaastad
9fee4d0511 #1895 : Curve Creator : Use TreeSelectionEditor for Summary Types 2017-09-20 10:44:14 +02:00
Magne Sjaastad
86fa56aedc #1895 Curve Creator : Rename to currentSummaryCategory 2017-09-20 10:15:18 +02:00
Bjørn Erik Jensen
e369b8a131 Cleanup. Remove commented code 2017-09-20 08:23:48 +02:00
Bjørn Erik Jensen
8d23ae478a Curve creator. Fixed label 2017-09-20 08:06:41 +02:00
Bjørn Erik Jensen
a0dae9209e #1815 Observed data. Add folder 'Observed Data' in case editor 2017-09-20 08:06:41 +02:00
Bjørn Erik Jensen
952bfeefe8 #1851 Curve Creator. Appearance editor with apply button 2017-09-20 08:06:41 +02:00
Jacob Støren
8334c36eff #1901 Use correct PERMY and PERMZ in wellpath perforation completion data export 2017-09-19 17:26:13 +02:00
Jacob Støren
dc1844f5d5 #1901 Use the more robust WellLogExtraction system for perforation interval intersection calculations. 2017-09-19 17:20:49 +02:00
Jacob Støren
3f099861a0 #1901 RigEclipseData::ownerCase() is made const 2017-09-19 17:12:46 +02:00
Rebecca Cox
11172d648c #1813 Observed data: Add pragma once 2017-09-19 15:25:48 +02:00
Jacob Støren
19354b1a8b #1901 Whitespace changes to improve readability 2017-09-19 15:22:14 +02:00
Rebecca Cox
fe1dfebea2 #1813 Observed data: Remove right click options if any object in selection is an observed data 2017-09-19 14:47:36 +02:00
Rebecca Cox
1eecef9f72 #1813 Observed data: Change ui names 2017-09-19 14:19:44 +02:00
Rebecca Cox
da2775d184 #1813 Observed data: Add pdmfields identifier type and name 2017-09-19 14:19:44 +02:00
Rebecca Cox
99e1f75633 #1813 Observed data: remove isObservedData as PDM field 2017-09-19 14:19:44 +02:00
Rebecca Cox
4e82aaf502 #1813 Observed data: Remove right click options for observed data 2017-09-19 14:19:44 +02:00
Rebecca Cox
28c86b08d7 #1813 Observed data: Move uniqueShortName to RimOilField to include observedData 2017-09-19 14:19:44 +02:00
Rebecca Cox
12c8051266 #1813 Observed data: Change order in context menu 2017-09-19 14:19:44 +02:00
Rebecca Cox
16f8b9771f #1815 Observed data: Add function to return vector of all observed data 2017-09-19 14:19:44 +02:00
Rebecca Cox
dd45f7c453 #1818 Observed Data: Command to Import observed data 2017-09-19 14:19:44 +02:00
Rebecca Cox
d23675b466 #1818 Observed data: Create command to import observed data from file 2017-09-19 14:19:44 +02:00
Rebecca Cox
ae7430a697 #1813 Observed data: Functions to add observed data to collection 2017-09-19 14:19:44 +02:00
Rebecca Cox
7bb7e4c5f9 #1813: Move file functions back to ObservedData 2017-09-19 14:19:44 +02:00
Rebecca Cox
3aa9abf4bc #1813: Move file functions from ObservedData to ObservedDataFile 2017-09-19 14:19:44 +02:00
Rebecca Cox
520befcad0 #1813 Observed data: Make RimObservedDataFile derived from RimObservedData. remove Ascii data model object 2017-09-19 14:19:44 +02:00
Rebecca Cox
b4f2b2accf #1813 Observed data: Derive RimObservedData from RimSummaryCase 2017-09-19 14:19:44 +02:00
Rebecca Cox
1ac50e178e #1813 Observed data: Make summary reader interface and make observed data reader object 2017-09-19 14:19:44 +02:00
Rebecca Cox
1a6e3447a7 #1813 Observed data: Rename Observed data child array 2017-09-19 14:19:44 +02:00
Rebecca Cox
3a0b0db8d1 #1813 Ascii data model object 2017-09-19 14:19:44 +02:00
Rebecca Cox
6d3d89bfe0 #1813 Observed data: Geometry data model object 2017-09-19 14:19:44 +02:00
Rebecca Cox
b87bbc12b2 #1813 Observed data: headers above functions 2017-09-19 14:19:44 +02:00
Rebecca Cox
e1263888b4 #1813 Observed data: Observed data folder as an oilfield child 2017-09-19 14:19:44 +02:00
Rebecca Cox
aca3436e7b #1813 Observed data: Create empty classes 2017-09-19 14:19:44 +02:00
Magne Sjaastad
f9a026ad56 Curve Creator : Show curves above appearance 2017-09-19 11:11:01 +02:00
Bjørn Erik Jensen
da9421485e #1853 Curve Creator. Plot tree view displays curves only 2017-09-19 09:29:24 +02:00
Jacob Støren
d1c41fa77d #1901 Avoid returning multiple intersections for the same point in the same cell 2017-09-18 16:29:05 +02:00
Jacob Støren
d4315f7ccf #1901 Fix wrong calculation of perforation points along wellpath 2017-09-18 16:24:29 +02:00
Bjørn Erik Jensen
17e01cd11c #1886 Curve creator. Set visibility to false for curves that should not be displayed 2017-09-18 16:11:44 +02:00
Bjørn Erik Jensen
6892273188 #1841 Curve creator. Improved case selection. Case grouping 2017-09-18 14:49:31 +02:00
Bjørn Erik Jensen
3c3c8fe44b #1886 Curve creator. Renaming 2017-09-18 11:54:38 +02:00
Bjørn Erik Jensen
65692eddab #1886 Curve creator. Implemented editor apply button behavior 2017-09-18 10:45:31 +02:00
Magne Sjaastad
d94eddc1ef #1889 Curve Creator : Close dialog when closing project 2017-09-18 07:46:29 +02:00
Magne Sjaastad
d27dc2be76 #1886 Curve Creator : Add new plot button 2017-09-15 16:15:54 +02:00
Magne Sjaastad
f8ad2f7581 #1889 Curve Creator : Close dialog when close button is pressed 2017-09-15 14:42:48 +02:00
Bjørn Erik Jensen
66d08aeb8d #1886 Curve creator. Copy curves back to target plot 2017-09-15 14:34:33 +02:00
Magne Sjaastad
5eeefc2511 #1889 Curve Creator : Add field editors at bottom of dialog 2017-09-15 13:47:15 +02:00
Magne Sjaastad
c00fb2d1f9 #1889 Curve Creator : Add stretch to bottom field layout 2017-09-15 13:42:43 +02:00
Magne Sjaastad
6855d63394 #1889 Curve Creator : Produce option items in summary plot collection 2017-09-15 13:42:43 +02:00
Bjørn Erik Jensen
9f47226049 #1886 Curve creator. Set target plot from edit summary curve command 2017-09-15 13:37:52 +02:00
Bjørn Erik Jensen
388dcd3552 #1886 curve creator. Populate curve creator and copy curves back to target plot 2017-09-15 11:49:09 +02:00
Bjørn Erik Jensen
0a824d351c #1886 Eclipse address. Add methods for uiText formatting and parsing 2017-09-15 11:47:16 +02:00
Magne Sjaastad
35bb8d9366 #1889 Curve Creator : Remove obsolete files 2017-09-15 10:58:12 +02:00
Magne Sjaastad
f1f5ead0ba #1889 Curve Creator : Add dialog with splitter 2017-09-15 10:48:38 +02:00
Bjørn Erik Jensen
f3dc48c59a #1888 Curve appearance. Get curves from curve collection instead of other curve list 2017-09-15 08:36:04 +02:00
Bjørn Erik Jensen
ca7ebe16e6 #1888 Curve appearance. Added curly braces and minor refactoring 2017-09-15 08:30:29 +02:00
Bjørn Erik Jensen
a049b5755f CurveCreator : Fix compiler issue on Linux 2017-09-14 15:58:02 +02:00
Bjørn Erik Jensen
7e60fa632f #1888 Curve appearance. Add and delete curves dynamically in preview plot due to current selection 2017-09-14 15:42:08 +02:00
Rebecca Cox
0044fb9e50 #1887 Curve Creator: Make the new SummaryCurveCollection operational 2017-09-14 13:57:27 +02:00
Magne Sjaastad
1ec9e72ce2 #1891 StimPlan : Add support for "Conductivity-propped" 2017-09-14 13:48:33 +02:00
Bjørn Erik Jensen
db233a970f #1888 Curve appearance. Baseline: Curve creator behaves as the old summary curve filter regarding auto appearance 2017-09-14 13:14:06 +02:00
Bjørn Erik Jensen
ba88e81824 #1890 Curve creator. Update curves when changing either case selection or one of the dynamic fields 2017-09-14 08:29:34 +02:00
Magne Sjaastad
66adff30a0 Fix several issues related to signed/unsigned compare 2017-09-14 07:50:41 +02:00
Magne Sjaastad
981333bcd4 CurveCreator : Fix compiler issue on Linux 2017-09-14 07:43:56 +02:00
Jacob Støren
473643fca4 #1847 Add plot and curve list to the Curve Creator
Cleaned up RicSummaryCurveCreator.h
2017-09-13 18:55:58 +02:00
Jacob Støren
ebcced932a #1847 Add a temporary field to show the adresses of the selected curves 2017-09-13 17:18:15 +02:00
Bjørn Erik Jensen
d5c293e8ad #1847 Summary curves. Preview for filtering addresses to display 2017-09-13 16:42:01 +02:00
Bjørn Erik Jensen
e5e28d70aa #1847 Summary curves. Add new contructor to RifEclipseSummaryAddress 2017-09-13 16:40:24 +02:00
Jacob Støren
46ddee749c #1852 Adjusted field names etc in the UI 2017-09-13 16:38:54 +02:00
Magne Sjaastad
6e4494dca1 #1852 Curve Creator : Show fields in four columns 2017-09-13 15:22:16 +02:00
Magne Sjaastad
87364429f8 #1852 Curve Creator : Add RicSummaryCurveCreatorUi 2017-09-13 13:55:33 +02:00
Magne Sjaastad
526e1cafbc #1852 Curve Creator : Add custom object editor 2017-09-13 13:55:33 +02:00
Jacob Støren
7f07962187 #1693 Reroute all access to RigCaseCellResultsData away from RimReservoirCellResultsStorage 2017-09-13 11:50:27 +02:00
Jacob Støren
bb098a241b #1693 Rename of result() to resultStorage() as step to remove the access to RigCaseCellResultsData through RimReservoirCellResultsStorage 2017-09-13 11:50:27 +02:00
Rebecca Cox
3f7f175564 #1840 Summary case: Event filter choses one cut feature directly 2017-09-13 11:15:28 +02:00
Rebecca Cox
334a9c5bc4 #1840 Summary case: Cut paste with key shortcut and multiselection for copying/cutting with key shortcut 2017-09-13 11:15:28 +02:00
Rebecca Cox
018aea4f58 Add guard against null pointer access 2017-09-13 11:15:28 +02:00
Rebecca Cox
071082a7df #1840 Summary case: clear clipboard on paste, not only set mime data to nullptr 2017-09-13 11:15:28 +02:00
Rebecca Cox
e97a8ccb87 #1829 Summary: Update name and plot when changing case in a summary curve 2017-09-13 11:15:28 +02:00
Rebecca Cox
ee25b8424d #1840 Summary case: Cut paste of summary cases 2017-09-13 11:15:28 +02:00
Rebecca Cox
6dc14c09b1 #1840: Summary case: Drag and drop between folders 2017-09-13 11:15:28 +02:00
Bjørn Erik Jensen
31d753ca36 #1847 Summary curves. Minor imporvements. Removed code commited by accident 2017-09-13 10:14:18 +02:00
Bjørn Erik Jensen
b101457ff9 #1847 Summary curves. Renaming and simplifications 2017-09-13 07:52:46 +02:00
Bjørn Erik Jensen
f68760fec7 #1847 Summary curves. More work on the RicSummaryCurveCreator 2017-09-13 07:52:46 +02:00
Bjørn Erik Jensen
6583f62ca4 Rename method createCurves to createDefaultCurves 2017-09-13 07:52:46 +02:00
Bjørn Erik Jensen
b5f2233407 #1847 Summary curves. Create first version of RicSummaryCurveCreator 2017-09-13 07:52:46 +02:00
Jacob Støren
337ad4d356 #1693 Remove and move stuff away from RimReservoirCellResultsStorage
To make its sole responsibility to store/restore generated results to/from cache file
2017-09-11 11:58:42 +02:00
Jacob Støren
1999d2b6e4 #1693 Removed "close" from eclipse reader interface as it never did anything 2017-09-11 11:58:42 +02:00
Rebecca Cox
414823827a #1840 Summary case: Rename and code clean up 2017-09-11 10:45:26 +02:00
Rebecca Cox
d1561936b3 #1840 Summary case: Simplified code based on user input 2017-09-11 10:45:26 +02:00
Rebecca Cox
c60465b380 #1840 Summary case: Delete a summary collection with or without its contents 2017-09-11 10:45:26 +02:00
Rebecca Cox
788ac2c8a8 #1727 Reload summary case: A new file reader will be created on reload 2017-09-11 10:45:26 +02:00
Rebecca Cox
b7ac93a905 #1751 #1840 Summary case: Edit name of collection 2017-09-11 10:45:26 +02:00
Rebecca Cox
36dec3062a #1751 #1840 Summary case: Remove extra lines in code 2017-09-11 10:45:26 +02:00
Rebecca Cox
5341581bf6 #1751 #1840 Summary case: Remove option to group cases within another case 2017-09-11 10:45:26 +02:00
Rebecca Cox
6a82534ce8 #1751 #1840 Summary case: New folder icon 2017-09-11 10:45:26 +02:00
Rebecca Cox
063542af1b #1751 #1840 Curves are connected to their case 2017-09-11 10:45:26 +02:00
Rebecca Cox
88d37f6e7c #1751 #1840 Summary case: Feature for deleting all items in a case collection 2017-09-11 10:45:26 +02:00
Rebecca Cox
8991cfef0d #1751 #1840 Summary case: Add group to summary case. Curves will loose their case 2017-09-11 10:45:26 +02:00
Jacob Støren
75f350db10 #1693 Move a lot of code from RimReservoirCellResultsStorage to RigCaseCellResultsData 2017-09-08 14:43:52 +02:00
Jacob Støren
d638f536d8 #1879 Guard filename generation for cases without timesteps 2017-09-08 14:43:52 +02:00
Jacob Støren
cd9b22d4cf #1874 Avoid invalid summary addresses from libecl 2017-09-08 14:43:52 +02:00
Magne Sjaastad
cb7a5253ff #1708 Fishbones: Fix issue with random angle on Linux 2017-09-08 08:21:44 +02:00
Magne Sjaastad
9815cbe1ff CppCheck : Remove unused function and added whitespace 2017-09-07 22:26:27 +02:00
Magne Sjaastad
fb1b6cc628 CppCheck : Remove unused variables 2017-09-07 22:05:20 +02:00
Magne Sjaastad
b82cf1377d CppCheck : Remove unused variables 2017-09-07 21:30:33 +02:00
Magne Sjaastad
ad64340b75 CppCheck : Added copyright header, fixed includes and removed unused variable 2017-09-07 21:28:40 +02:00
Magne Sjaastad
228c8d1f87 CppCheck : Add const reference and remove unused variable 2017-09-07 21:24:06 +02:00
Magne Sjaastad
6338166708 CppCheck : Init all members in constructor 2017-09-07 21:10:11 +02:00
Magne Sjaastad
d8beee3eb1 CppCheck : Remove unused constructor and init all members in constructor 2017-09-07 21:06:45 +02:00
Magne Sjaastad
03df2c2540 CppCheck : Add missing initialization in constructor 2017-09-07 20:59:09 +02:00
Magne Sjaastad
908545c669 CppCheck : Add missing initialization of pointer 2017-09-07 20:55:02 +02:00
Magne Sjaastad
6c3a0d91b4 CppCheck : Add missing init in constructor 2017-09-07 20:46:30 +02:00
Magne Sjaastad
7764f812e4 CppCheck : Intialize all variables in constructor 2017-09-07 20:43:01 +02:00
Magne Sjaastad
8ecfaa2ea7 CppCheck : Avoid potential null pointer access 2017-09-07 20:33:17 +02:00
Jacob Støren
642348ffed #1804, #1803 Add icons to Flow Char and Tof Acc Sat plots 2017-09-07 14:23:50 +02:00
Magne Sjaastad
3c107e6f9e #1868 CellRangeFilter : Show correct label text when range filter is created 2017-09-07 09:42:54 +02:00
Magne Sjaastad
beea898dc6 #1866 AppFwk : Move QTreeView state serializer to cafUserInterface 2017-09-07 09:34:14 +02:00
Magne Sjaastad
e634ff664e #1866 AppFwk : Rename to QTreeViewStateSerializer 2017-09-07 09:34:06 +02:00
Magne Sjaastad
5e6547c0c5 #1830 AppFwk : Move members to private and use getter functions 2017-09-07 09:33:33 +02:00
Rebecca Cox
dd845e3dc7 #1751 Rename RimSummaryCaseCollection to RimSummaryCaseMainCollection 2017-09-06 16:32:52 +02:00
Rebecca Cox
600da3731a #1727 Summary Plot: Add Reload option for group and for individual summary cases 2017-09-06 14:09:15 +02:00
Rebecca Cox
7ecf21c402 #1727 Summary plot: Clear time steps list on summary file open method 2017-09-06 14:08:03 +02:00
Jacob Støren
a63b9611de Improved robustness of Flooded PV calculation with respect to PORV and SWCR resultCellCount 2017-09-06 12:50:22 +02:00
Unknown
a910697f6a #1728 Remove curve filter curves for chosen case(s) 2017-09-06 08:37:28 +02:00
Unknown
f09ec5a7c9 #1728: Change text on feature label 2017-09-06 08:37:28 +02:00
Unknown
a4aa06b75c #1728 Can close all summary cases within one collection 2017-09-06 08:37:28 +02:00
Unknown
e1ab73da30 #1728 Relace tab with spaces 2017-09-06 08:37:28 +02:00
Unknown
c136186be8 #1728 Make function removeCurve private 2017-09-06 08:37:28 +02:00
Unknown
1ae9978214 #1728 Curves assisiated with closed summary case(s) are deleted 2017-09-06 08:37:28 +02:00
Unknown
7455415f88 #1859 SummaryPlot: Missing redraw of qwtPlot when deleting curves 2017-09-06 08:37:28 +02:00
rebcox1
946351c853 #1728 Add close summary command. Dependent curves yet not deleted 2017-09-06 08:37:28 +02:00
Jacob Støren
f2b26be5d8 #1854 Add forgotten negative signs on negative inflow. Now matches results from octavescript where applicable 2017-09-05 13:34:06 +02:00
Jacob Støren
0d5c62f4e7 #1863 Avoid switching result when flooded pv is not selected as result variable 2017-09-05 12:03:17 +02:00
Jacob Støren
31bddebc65 #1863 Avoid calculating flooded pv for all timesteps, each timestep.
#1854 Corrected sign for nnc flow into cell
2017-09-05 12:01:59 +02:00
Bjørnar Grip Fjær
a335fd0f21 #1788 Create preliminary user interface to show Flooded PV 2017-08-31 16:23:39 +02:00
Bjørnar Grip Fjær
c5ed9ccaa6 Ensure dock windows are completely closed and opened when exporting snapshots through command file interface 2017-08-31 16:23:39 +02:00
Bjørnar Grip Fjær
373de4935a Add property type to exportProperty command in command file interface 2017-08-31 16:23:39 +02:00
astridkbjorke
3a44cbb986 #1787 Removing code for returning cumulative inflow, only used for testing 2017-08-31 15:30:29 +02:00
astridkbjorke
ad14863a36 #1787 Removing mainGrid from constructor, scaling porevolume by (1-swcr), if swcr is available in file 2017-08-31 14:28:35 +02:00
astridkbjorke
f0f189b311 #1787 Correcting which timestep is used for calculation of total flow into cell 2017-08-31 12:45:05 +02:00
astridkbjorke
0ab95bc1f2 #1787 Sorting out issue with indexing - resultindex vs global index 2017-08-31 12:45:05 +02:00
Magne Sjaastad
52d7897160 #1821 SourSimRL : Use type when creating result accessor 2017-08-31 09:54:05 +02:00
Magne Sjaastad
950d3bafa9 #1831 SourSimRL : Use a small delta when comparing timesteps 2017-08-31 09:12:48 +02:00
Magne Sjaastad
0bbcfb352a #1831 SourSimRL : Use millisecs to represent fraction of day 2017-08-31 09:08:46 +02:00
Magne Sjaastad
724fb89189 #1831 Simplified adding fraction of day to QDateTime 2017-08-31 09:03:01 +02:00
Magne Sjaastad
42ffe686d5 #1831 SourSimRL : Include millisec when displaying mismatch in time steps 2017-08-31 08:05:01 +02:00
astridkbjorke
47790dfad9 #1787 Returning reference to vector 2017-08-30 11:04:50 +02:00
astridkbjorke
d9589c836a #1787 Removing hardcoding of tracername to dummy value. Changing to have vector of QString for tracernames for calculator. 2017-08-30 10:50:55 +02:00
astridkbjorke
97796329e9 #1787 Fixing issues with data not present at all time steps. 2017-08-30 10:10:50 +02:00
astridkbjorke
3112c10ec1 #1787 Making test feature to be able to run the calculator 2017-08-30 08:59:05 +02:00
astridkbjorke
55ca85625f #1787 Removing test not in use 2017-08-30 08:59:05 +02:00
astridkbjorke
28d1437bc8 #1787 Using cellResultIndex instead of globalCellIndex to get cell values from flowResults. Also checking that neighbour cell is not an LGR. 2017-08-30 08:59:05 +02:00
astridkbjorke
71cd963945 #1787 Adding functions returning calculated number of flooded pore volumes 2017-08-30 08:59:05 +02:00
astridkbjorke
dc41644452 #1787 Removing code from constructor to separate calculate function 2017-08-30 08:59:05 +02:00
astridkbjorke
ae8729f7f7 #1787 checking which hostGrid a cell belongs to, and use this instead of maingrid to find i,j,k 2017-08-30 08:59:05 +02:00
astridkbjorke
7e52a1b01c #1787 Adding nnc flow rates 2017-08-30 08:59:05 +02:00
astridkbjorke
bfe4875de5 #1787 Renamings + moving code to get flowrates to outside the timestep-loop 2017-08-30 08:59:05 +02:00
astridkbjorke
77f784ce8a #1787 Calculating number-of-cell-PV flooded. Still assuming only maingrid and no NNC 2017-08-30 08:59:05 +02:00
astridkbjorke
8027f3d5c4 #1787 Adding files for calculator of number of flooded pore volumes. Starting calculating by only considering neighbour cells. 2017-08-30 08:59:05 +02:00
Magne Sjaastad
3192f8fef4 #1812 Fracture: Split label text in two lines for Azimuth Fracture 2017-08-30 08:34:42 +02:00
Magne Sjaastad
cfddaa98ca #1767 Guard for use of index out of bounds 2017-08-30 08:05:13 +02:00
Magne Sjaastad
0d57d3ec8d #1834 Show message in log when skipping simuliation well data 2017-08-30 08:03:31 +02:00
Magne Sjaastad
d1dbb89757 #1831 SourSimRL: Missing hour minute information from HDF file
Read days as a double value, multiply by seconds in a day and use addSeconds to get corret time (including seconds) from HDF
2017-08-30 07:11:13 +02:00
Bjørnar Grip Fjær
c736e10ad5 #1836 Add region selection threshold fields 2017-08-29 16:21:19 +02:00
Bjørnar Grip Fjær
fa943226bc #1835 Tof Acc Sat Plot: Add a max TOF range field 2017-08-29 15:32:11 +02:00
Bjørnar Grip Fjær
d50e40854a #1837 Ensure flow diagnostics are calculated when changing cell result phases 2017-08-29 15:23:24 +02:00
Magne Sjaastad
e66383be35 Whitespace 2017-08-29 14:43:51 +02:00
Magne Sjaastad
ec2142f87a #1832 Added tooltip text 2017-08-29 14:38:57 +02:00
Bjørnar Grip Fjær
1c483c7420 #1697 Export of visible cells to FLUXNUM / MULTNUM .GRDECL file 2017-08-29 14:30:01 +02:00
Magne Sjaastad
279080fc4a #1834 Many Timesteps: Add preference option to control import of well data 2017-08-29 14:28:17 +02:00
Magne Sjaastad
921b7fcb60 #1767 Do not show time step filter UI if no time steps are present 2017-08-29 13:01:55 +02:00
Magne Sjaastad
6629447fa1 #1768 Add flag in preferences to control use of Result Index File 2017-08-29 11:03:45 +02:00
Magne Sjaastad
56312a4883 Initialize pointer to nullptr 2017-08-29 11:03:45 +02:00
Magne Sjaastad
609bf4037b #1768 Move RifReaderSettings to private member of RiaPreferences 2017-08-29 11:03:45 +02:00
Magne Sjaastad
a9381b862f #1768 Use index file if present and write index file after open 2017-08-29 11:03:45 +02:00
Magne Sjaastad
d19c256333 #1768 Create index file name based on result file name 2017-08-29 11:03:45 +02:00
Bjørnar Grip Fjær
a6c526c5ba Fix Linux build error in argument parser 2017-08-29 10:40:10 +02:00
Bjørnar Grip Fjær
d3eaf9c73a #1828 Add check for existence of results when calculating TOF Acc Sat Plot 2017-08-29 10:25:00 +02:00
Bjørnar Grip Fjær
d5e8e85bea #1793 Ensure case name is included in filename when exporting well segments 2017-08-29 09:39:53 +02:00
Bjørnar Grip Fjær
2a5a03bc93 #1793 Ensure current case name is included when exporting property through command file 2017-08-29 09:39:53 +02:00
Bjørnar Grip Fjær
869f4c8b75 #1793 Add looping of list of case filenames when executing command file 2017-08-29 09:39:53 +02:00
Magne Sjaastad
086eae50b1 #1767 Minor UI adjustments and whitespace 2017-08-29 07:30:07 +02:00
Magne Sjaastad
380b939897 #1767 Add UI for selection of subset of time steps 2017-08-28 15:22:43 +02:00
Magne Sjaastad
c443aefa5e #1767 Add allTimeSteps() to get all time steps from file 2017-08-28 15:17:03 +02:00
Magne Sjaastad
d4663fe6df #1767 Add const access to RifReaderInterface 2017-08-28 15:16:12 +02:00
Magne Sjaastad
e4afb24421 #1768 Guard against access of null pointer 2017-08-25 15:08:23 +02:00
Jacob Støren
b4cbe9fdd2 #1825 Fix problem of linestyle and symbols beeing reused uneccessary 2017-08-25 10:37:49 +02:00
Magne Sjaastad
fad088f1b2 Use static cast from size_t to int 2017-08-25 09:17:31 +02:00
Magne Sjaastad
7708a0c936 Include interface file when HDF is not included 2017-08-25 09:13:28 +02:00
Magne Sjaastad
a823fb5ebc #1767 Use default mouse cursor when displaying time step selection UI 2017-08-25 07:06:32 +02:00
Magne Sjaastad
538d308922 #1769 Rename to findOrCreateScalarResultIndex 2017-08-25 06:58:47 +02:00
Magne Sjaastad
7fe2eb6750 #1766 Add RicImportEclipseCaseTimeStepFilterFeature to import menu 2017-08-25 06:53:17 +02:00
Magne Sjaastad
cb506cf86d #1769 Add time step filtering when importing model
Move import code from RiaApplication to command feature
Show time step selection UI when importing Eclipse data
Support time step reading of HDF data
2017-08-25 06:51:56 +02:00
Magne Sjaastad
d344cf11a2 Add pragma once and fixed includes 2017-08-24 15:13:30 +02:00
astridkbjorke
e428bf33f9 #1792 Avoiding issue with negative transmissibility from fracture to well due to small discretization by forcing peaceman radius r0 > wellRadius. 2017-08-24 14:01:43 +02:00
astridkbjorke
c7dcf9f4d0 #1792 Giving error message if cells from LGR are found in export. Compdat-values for cells not part of LGR exported. 2017-08-24 14:01:43 +02:00
Bjørnar Grip Fjær
78760d569e #1807 Ensure flow characteristics plot is updated when view geometry changes when using visible cells filtering 2017-08-24 13:28:17 +02:00
Bjørnar Grip Fjær
dbee70b222 #1807 Adjust tracer communication in flow characteristics plot to include cells with 0-value 2017-08-24 10:58:52 +02:00
Bjørnar Grip Fjær
f4ca6395cd Turn off fault when showing flow characteristics region 2017-08-24 09:53:27 +02:00
Bjørnar Grip Fjær
5ead49e01e #1807 Add option to use visible cells in view as region selection in flow characteristics plot 2017-08-24 09:28:05 +02:00
Bjørnar Grip Fjær
ee5a2530fd Fix naming of command to store flow characteristics plot 2017-08-24 09:28:05 +02:00
Jacob Støren
7f63e8d688 Linux compile fix 2017-08-23 11:02:58 +02:00
astridkbjorke
5134a461d9 #1776 Updating calculation of length of stimplan-eclipse-overlap polygon for sl/pi-term in matrix-to-fracture transmissibility to avoid possible NaN values in export. Length is now calculated in x direction in the fracture coordinate system. 2017-08-23 09:46:00 +02:00
Magne Sjaastad
0bb892541a #1808 System : Show geomech feature name in about dialog 2017-08-23 07:29:36 +02:00
Magne Sjaastad
7da886db11 #1794 System : Move packaging config to ResInsight project 2017-08-23 07:21:00 +02:00
Magne Sjaastad
f5ffbc1f1a #1810 Improve copy and install of DLLs on Windows 2017-08-22 22:31:13 +02:00
Bjørnar Grip Fjær
8c8a2a6492 #1042 #990 Use step function in summary plot 2017-08-22 15:24:49 +02:00
Magne Sjaastad
e9bab1c94b #1808 System : Show feature name in about dialog 2017-08-22 14:48:12 +02:00
Magne Sjaastad
87c19f927d #1794 System : Put fracture tests inside correct #ifdef 2017-08-22 14:46:21 +02:00
Bjørnar Grip Fjær
ca8a20d250 Rename "Filter" to "Tracer Filter" in flow characteristics plot 2017-08-22 14:02:26 +02:00
Bjørnar Grip Fjær
0cff37f23f #1783 Copy/Paste of Excel-pasted curves 2017-08-22 13:31:21 +02:00
Bjørnar Grip Fjær
a9b316febb #1797 TOF-Acc Sat Plot: Add mouse tracking with data info 2017-08-22 13:11:50 +02:00
Bjørnar Grip Fjær
6e1e55ffba #1796 Ensure TOF-Acc Sat. plot is replotted when new samples are set 2017-08-22 12:45:20 +02:00
Bjørnar Grip Fjær
7ff1b8e128 #1798 Switch to TOF result variable when changing phase to anything other than "All" 2017-08-22 12:04:10 +02:00
Bjørnar Grip Fjær
f009a63efd Fix error exception if Show Region dialog is cancelled in flow characteristics plot 2017-08-22 11:48:37 +02:00
Bjørnar Grip Fjær
1983696a34 Move case selection to top of flow characteristics plot property editor 2017-08-22 11:48:37 +02:00
Bjørnar Grip Fjær
279ffe1730 #1799 Ensure tracers and time steps have values when entering flow characteristics plot initially 2017-08-22 11:48:37 +02:00
Magne Sjaastad
86365357f4 #1794 Add missing #ifdefs for USE_PROTOTYPE_FEATURE_FRACTURES 2017-08-22 11:38:31 +02:00
Magne Sjaastad
56a04de2ff Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-22 09:36:05 +02:00
Magne Sjaastad
de6e6858fa #1794 Include Clipper library inside ifdef USE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 22:05:15 +02:00
Magne Sjaastad
2d11a34928 #1794 Remove unused features related to delete of fracture objects 2017-08-21 21:02:43 +02:00
Magne Sjaastad
26149f1b5e #1794 Several fixes to make fracture configuration compile 2017-08-21 20:54:48 +02:00
Magne Sjaastad
4718caed9a #1794 Put all fracture command ids inside ifdefs 2017-08-21 20:44:28 +02:00
Magne Sjaastad
553b3bf63e #1794 Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 15:24:20 +02:00
Bjørnar Grip Fjær
9392821f8f #1801 Flow Characteristics Plot: Sort wells according to Status and name 2017-08-21 13:37:35 +02:00
Bjørnar Grip Fjær
ba660767f5 #1802 Hide plot title controls from TOF accumulated phase fractions plot 2017-08-21 13:29:11 +02:00
Bjørnar Grip Fjær
6c0f4fa0c0 #1806 Ensure time steps are calculated when opening project with saved flow characteristics plot 2017-08-21 13:09:06 +02:00
Bjørnar Grip Fjær
cf87e7f312 #1805 Add options group to flow characteristics plot 2017-08-21 11:51:34 +02:00
Bjørnar Grip Fjær
8bc59162e6 #1805 Hide "Show Region" when all active cells is selected in flow characteristics plot 2017-08-21 11:49:54 +02:00
Bjørnar Grip Fjær
44fa306ce1 #1805 Make * indicate calculated time step in flow characteristics plot 2017-08-21 11:48:41 +02:00
Bjørnar Grip Fjær
3658811ed2 #1805 Better naming of cell filter options in flow characteristics plot 2017-08-21 11:42:08 +02:00
Bjørnar Grip Fjær
172eb2ed14 #1805 Rename "Cell Selection" to "Cell Filter" in flow characteristics plot 2017-08-21 11:39:11 +02:00
Bjørnar Grip Fjær
a293ef9c59 #1805 Rename time step selection options in flow characteristics plot 2017-08-21 11:37:45 +02:00
Bjørnar Grip Fjær
b603225c97 #1805 Right adjusting push buttons in flow characteristics plot 2017-08-21 11:35:58 +02:00
Bjørnar Grip Fjær
04fe59bc07 #1805 Create time steps UI group for flow characteristics plot 2017-08-21 11:29:34 +02:00
Bjørnar Grip Fjær
37e25da692 #1805 Flow Characteristics Plot: Make "Selected" time steps default 2017-08-21 11:25:40 +02:00
Bjørnar Grip Fjær
ff8494e764 #1774 Add paste from excel to context meny of summary plots and summary plot collection 2017-08-21 11:18:21 +02:00
Magne Sjaastad
51c30448e9 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-21 10:42:11 +02:00
Bjørnar Grip Fjær
13266a9535 #1784 Set curve appearance when pasting ASCII curves 2017-08-21 10:11:15 +02:00
Magne Sjaastad
4eed4b4261 #1794 Exclude some files to be able to use Cotire 2017-08-21 10:01:07 +02:00
Bjørnar Grip Fjær
23ecdffe01 #1785 Store/restore generated data from Octave in project cache 2017-08-21 09:12:05 +02:00
Magne Sjaastad
4d0dde088b #1795 Fix copy of Qt DLLS
Use one list of all DLLs to copy (both Qt and Odb). For some reason, the Qt copy did not work
2017-08-18 15:29:19 +02:00
Magne Sjaastad
34f3a0686d System : Exclude ResInsight.qrc 2017-08-18 13:21:39 +02:00
Magne Sjaastad
0d4e566e93 System : Use list to define cotire excludes 2017-08-18 12:40:42 +02:00
Magne Sjaastad
bfb1daec42 System : Removed obsolete cotire excludes 2017-08-18 10:21:28 +02:00
Bjørnar Grip Fjær
6b0a59b864 #1784 Add option for curve prefix when pasting ASCII data 2017-08-18 09:59:00 +02:00
Bjørnar Grip Fjær
bbb3e937d3 #1784 Add plot title option when pasting new summary curve 2017-08-18 09:42:04 +02:00
Bjørnar Grip Fjær
aa2123d05d #1773 Update view and property editor when closing soursim data 2017-08-17 15:36:08 +02:00
Bjørnar Grip Fjær
37fdadeb69 #1775 Do not include SourSimRL result category if no active sourres file 2017-08-17 15:02:30 +02:00
Magne Sjaastad
6fee321771 Disable tests accessing local paths 2017-08-17 14:40:52 +02:00
Bjørnar Grip Fjær
5c930a740f #1781 Rename "Delete SourSim Data" to "Close SourSim Data" 2017-08-17 14:39:30 +02:00
Bjørnar Grip Fjær
32bbe724ce #1779 Allow delete of ASCII Data curves 2017-08-17 14:33:52 +02:00
Bjørnar Grip Fjær
8404ce265d #1782 Show Y-axes for ASCII data curves 2017-08-17 14:25:20 +02:00
Magne Sjaastad
f89c1e052c MSVC : Disable warning for ResInsight 2017-08-17 14:06:57 +02:00
Bjørnar Grip Fjær
41502cb9b7 #1377 Add view selection to Show Region button in flow characteristics plot 2017-08-17 13:49:51 +02:00
Bjørnar Grip Fjær
189378a1b0 #1772 Add command to store flow characteristics plots 2017-08-17 12:52:18 +02:00
Bjørnar Grip Fjær
65ce0d3788 #1377 Flow Characteristics Plot: Calculate for a defined set of cells 2017-08-17 11:25:13 +02:00
Magne Sjaastad
6ddf8aae27 #1786 Use EXTERNAL_LINK_LIBRARIES for external binaries 2017-08-17 09:12:27 +02:00
Magne Sjaastad
534572345d #1786 Add build option RESINSIGHT_USE_HDF5, default off
Moved HDF config to top level cmake file
2017-08-17 08:39:02 +02:00
Magne Sjaastad
a961221c2c Merge remote-tracking branch 'origin/hdf-prototype' into dev 2017-08-17 07:30:01 +02:00
Bjørnar Grip Fjær
9d36517b1d #1778 Hide non-TOF options when not using all phases 2017-08-16 10:10:12 +02:00
Bjørnar Grip Fjær
323417364d #1126 Ensure cumulative saturation TOF plot data is only loaded when visible 2017-08-16 09:39:34 +02:00
Bjørnar Grip Fjær
2c2c82643d #1126 Adjust colors for cumulative saturation by TOF plot 2017-08-16 09:30:40 +02:00
Bjørnar Grip Fjær
db675aa6d8 #1126 Adjust cumulative saturation by TOF plot title size 2017-08-15 16:38:32 +02:00
Bjørnar Grip Fjær
030ad9cec4 #1126 Add "Accumulated Saturation by Time of Flight"-plot 2017-08-15 16:00:32 +02:00
Magne Sjaastad
c0e3349632 Merge remote-tracking branch 'origin/dev' into hdf-prototype 2017-08-15 15:34:23 +02:00
Magne Sjaastad
16a1caf4c0 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-15 15:26:36 +02:00
Magne Sjaastad
4bda27c627 #1771 Add missing allocation of well path 2017-08-15 15:20:08 +02:00
Jacob Støren
6912ee0081 #1765 Fix of mapping between well timesteps and result timesteps, handling holes in both well and result timesteps. 2017-08-15 14:51:18 +02:00
Bjørnar Grip Fjær
0314a045e7 Fix issue with flow diagnostics loading with assertion error 2017-08-15 10:12:02 +02:00
Magne Sjaastad
362eb249b5 #1756 Allow 'Include Fractures' to be un-checked 2017-08-14 22:30:22 +02:00
Magne Sjaastad
7dfcfde1d1 #1744 Load and update data for fractures when loading project file 2017-08-14 22:16:03 +02:00
Magne Sjaastad
f756d1d2cb #1764 Use helper function to load data and create result accessor 2017-08-14 19:27:44 +02:00
Magne Sjaastad
3cf4bb25dc #1764 If no NTG values are defined on file, use 1.0 as NTG value 2017-08-14 19:03:01 +02:00
Magne Sjaastad
5eb4eafb6e Merge branch 'dev' into hdf-prototype 2017-08-14 10:47:44 +02:00
Magne Sjaastad
f6c785cd07 Do not compare signed with unsigned 2017-08-11 16:36:14 +02:00
Magne Sjaastad
3644f4eb76 Do not compare signed with unsigned 2017-08-11 16:17:40 +02:00
Magne Sjaastad
0ba1746755 Merge branch 'dev' into pre-proto 2017-08-11 16:14:00 +02:00
Bjørnar Grip Fjær
e6fda31255 #1761 Use eclipse case directory as default path when selecting SourSim file 2017-08-11 16:08:21 +02:00
Bjørnar Grip Fjær
93502706be #1762 SourSimRL: Use *.sourres as filter in file open dialog 2017-08-11 15:59:19 +02:00
Bjørnar Grip Fjær
6747289a89 #1763 Hide soursim file field and result category if HDF5 support is not compiled in 2017-08-11 15:49:38 +02:00
Bjørnar Grip Fjær
63bb85b998 #1387 Command to delete existing sour sim data from ResInsight 2017-08-11 15:37:46 +02:00
Magne Sjaastad
a99eae7c24 Linux : Fix compiler issues 2017-08-11 15:22:40 +02:00
Magne Sjaastad
f096f78a55 Linux : Fix compile issue 2017-08-11 15:18:20 +02:00
Magne Sjaastad
c1fe8a7e6c #1691 Rename to RigEclipseResultInfo 2017-08-11 15:10:08 +02:00
Magne Sjaastad
21fd00389c Fixes after merge 2017-08-11 14:55:01 +02:00
Magne Sjaastad
839e3e1d00 #1755 Use namespace instead of class to encapsulate structures 2017-08-11 14:28:43 +02:00
Magne Sjaastad
89684c243f #1755 Use namespace RiaDefines instead of class 2017-08-11 14:28:42 +02:00
Magne Sjaastad
8f3a7a5867 #1691 Map from filtered time step indices to well result indices 2017-08-11 14:27:58 +02:00
Magne Sjaastad
68e52e1838 #1755 Cleaned up includes 2017-08-11 14:27:57 +02:00
Magne Sjaastad
c4aa625d33 #1755 Move porosity model enum to separate file 2017-08-11 14:27:56 +02:00
Magne Sjaastad
56afc497b3 Add missing includes 2017-08-11 14:27:23 +02:00
Magne Sjaastad
88bbea6339 #1755 Remove porosity enum from RifReaderInterface 2017-08-11 14:27:22 +02:00
Magne Sjaastad
ad09441da1 #1691 Add RigTimeStepInfo 2017-08-11 14:26:16 +02:00
Magne Sjaastad
6b90a94458 #1691 Rename to RigResultInfo 2017-08-11 14:26:15 +02:00
Magne Sjaastad
3253c8968e #1691 Move RigResultInfo into separate file 2017-08-11 14:26:15 +02:00
Magne Sjaastad
78da4c6469 #1691 Add time step filter to RimCase and use from RimEclipseResultCase 2017-08-11 14:24:54 +02:00
Magne Sjaastad
624f14da46 Prefix enum values with RIF_
FLOAT causes Cotire compile to fail
2017-08-11 14:24:54 +02:00
Magne Sjaastad
5775c3bb20 Remove duplicate definitions of file names 2017-08-11 14:24:54 +02:00
Magne Sjaastad
66c28d8cee #1691 File Interface : Add support for time step filtering 2017-08-11 14:24:54 +02:00
Magne Sjaastad
9223282db4 #1691 Remove caching of time step related data 2017-08-11 14:24:54 +02:00
Magne Sjaastad
b1e9e84784 #1691 Removed unused function and cleaned up includes and whitespace 2017-08-11 14:24:54 +02:00
Bjørnar Grip Fjær
2ec68d08fb #1690 Add import settings to pasting ASCII data to summary plot 2017-08-11 13:57:11 +02:00
Bjørnar Grip Fjær
a47c5b5d84 #1690 Summary: Import clipboard data from Excel as new curves 2017-08-11 13:57:11 +02:00
astridkbjorke
abd058da8b #1126 Update after merge - using ALL for PhaseSelection 2017-08-11 11:26:35 +02:00
astridkbjorke
ef1208e2f5 #1126 Adding RigTofAccumulatedPhaseFractionsCalculatorTester with function calling sortTofAndCalculateAccPhaseFraction, so that this function can be set private. 2017-08-11 10:31:13 +02:00
astridkbjorke
ebab0b50a3 #1126 moving finding data and calling sortTofAndCalculateAccPhaseFraction to constructor 2017-08-11 10:31:13 +02:00
astridkbjorke
db6d471e9c #1126 Fixing constructor 2017-08-11 10:31:13 +02:00
astridkbjorke
2ce81e9045 #1126 Updating inserting to map to use insert. Adding access functions for calculated data and constructor for class (not finished) 2017-08-11 10:31:13 +02:00
astridkbjorke
e19a63dcff #1126 Adding test with same TOF-value for two cells 2017-08-11 10:31:13 +02:00
astridkbjorke
35cc413f4d #1126 Adding handling of multiple cells with same tof. No test yet. 2017-08-11 10:31:13 +02:00
astridkbjorke
4f2d3c7f5b #1126 Fixing missing/wrong filenames in cmake-files, and error in last check-in 2017-08-11 10:31:13 +02:00
astridkbjorke
42245b22af #1126 Adding unit test 2017-08-11 10:31:13 +02:00
astridkbjorke
40addb9a10 #1126 Adding (dummy) unit test. Calling the sortTofAndCalculateAccPhaseFraction function, but no check of values calculated yet 2017-08-11 10:31:13 +02:00
astridkbjorke
a61882d092 #1126 Adding first implementation of calculator for TOF-accumulated phaase fraction. Not yet tested or called from any code. 2017-08-11 10:31:13 +02:00
Bjørnar Grip Fjær
efb79ac753 #1202 Flow: Handle separate phase solutions 2017-08-10 15:08:30 +02:00
Bjørnar Grip Fjær
03480c38c4 #1698 Enable Flow Diagnostics cell result when fluxes are not present in Eclipse restart file 2017-08-10 11:17:19 +02:00
Bjørnar Grip Fjær
747721a7f8 #1698 Use opm-flowdiagnostics calculation of fluxes if not present in Eclipse restart file 2017-08-10 10:09:24 +02:00
Bjørnar Grip Fjær
7598d8c196 #1696 Threshold option for aquifer cells 2017-08-09 14:10:39 +02:00
Magne Sjaastad
d5d5cedbf5 #1686 Remove explicit include of Ert
Ert includes are implicit defined by tartget_link_library
2017-08-09 08:31:18 +02:00
Bjørnar Grip Fjær
eee4a65497 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-08 14:24:42 +02:00
Bjørnar Grip Fjær
6c5f974d8e #1743 Use well name for completion export for fractures as well 2017-08-08 14:11:05 +02:00
Bjørnar Grip Fjær
39c3338024 #1742 Allow different wells in same grid when exporting completions to different files per well 2017-08-08 13:56:07 +02:00
Magne Sjaastad
acd7b4784d #1747 Build System : Make variable available to both current and parent scope 2017-08-08 13:51:32 +02:00
Bjørnar Grip Fjær
7e3e538a43 #1662 Octave interface to push generated NNC values back into ResInsight 2017-08-08 13:13:05 +02:00
Jacob Støren
2d9f48d715 Whitespace and typo 2017-08-08 13:12:18 +02:00
Magne Sjaastad
fb158b29bd #1747 Build System : Include hdf5 in package name 2017-08-08 13:07:49 +02:00
Magne Sjaastad
1655585f1e #1676 Remove option RESINSIGHT_ENABLE_HDF5
Always link HDF library files if HDF is available. Windows : Use root folder to HDF as path for include and library files
2017-08-08 09:05:47 +02:00
Magne Sjaastad
bc4edf6db3 #1676 #1388 Windows : Add path to HDF5 files and link with HDF5 static libs 2017-08-08 07:19:15 +02:00
Magne Sjaastad
ca1e08a1a4 #1676 Disable HDF5 by default 2017-08-08 07:07:28 +02:00
Bjørnar Grip Fjær
a3e6ae0dae Fix build warning with size_t to int conversion 2017-08-07 15:30:22 +02:00
Bjørnar Grip Fjær
79c48338a7 #1741 Add octave interface command to get names of available NNC properties 2017-08-07 15:30:16 +02:00
astridkbjorke
09363b2fec #1737 Making small adjustment to polygon to avoid having well path line going though perforation length polygon vertex, due to problems in clipper for this case. 2017-08-07 13:14:22 +02:00
Bjørnar Grip Fjær
156401d0db #1703 Add interpolation when well path clipping to ensure well path is actually visible 2017-08-07 11:41:13 +02:00