Commit Graph

2829 Commits

Author SHA1 Message Date
Magne Sjaastad
15f71c29fa #1977 Curve Calculator : Hide Edit header, hide new/delete variable buttons 2017-10-13 13:47:01 +02:00
Magne Sjaastad
9d0e59c60f #1977 Curve Calculator : Trigger parsing and evaluation of expression 2017-10-13 13:04:54 +02:00
Bjørn Erik Jensen
2b89b595f3 #1976 RFT Plot. Fixed matching of wellpaths and simulation wells 2017-10-13 11:19:02 +02:00
Bjørn Erik Jensen
5bab568a85 RFT Plot. Clear plot when changing well or branch 2017-10-13 11:19:02 +02:00
Rebecca Cox
44a5605936 #1982 RFT Plot: calculate TVD from MD and WellPath 2017-10-12 17:05:52 +02:00
Rebecca Cox
c9d8afc803 #1980 PLT Plot: Map data cells and MD in RFTCurves 2017-10-12 13:37:03 +02:00
Rebecca Cox
e3666a21fe #1980 PLT Plot: Add argument for isExtractioncurve in setValuesWithTVD 2017-10-12 12:43:55 +02:00
Rebecca Cox
b8245c310c RFT: case name derived from windows path 2017-10-12 12:43:55 +02:00
Bjørn Erik Jensen
0542f4ab40 RFT Plot. Clean up includes 2017-10-12 11:44:21 +02:00
Bjørn Erik Jensen
389234715c Well branches. Simple well branch cache 2017-10-12 11:05:28 +02:00
Magne Sjaastad
650e29d6d5 #1977 Curve Calculator : Add button box to dialogs 2017-10-12 10:52:30 +02:00
Magne Sjaastad
4b8186652f #1967 Curve Calculator : Add calculation objects and containers 2017-10-12 10:52:30 +02:00
Magne Sjaastad
4046665044 #1977 Curve Calculator : Add RiuSummaryCurveDefinition and friends 2017-10-12 10:52:30 +02:00
Bjørn Erik Jensen
a33a2411ef Fix Linux build warnings 2017-10-12 10:00:32 +02:00
Bjørn Erik Jensen
574effd6f2 RFT Plot. Do not show cases with no time steps. Do not show source editor headers when no cases 2017-10-12 08:10:28 +02:00
Bjørn Erik Jensen
6c51938000 #1976 RFT/PLT Plot. Associate well path and sim well when loading models and files 2017-10-11 15:23:14 +02:00
Bjørn Erik Jensen
dcb1c40414 #1976 RFT/PLT Plot. Associate sim well and well path. RFT branch index impl 2017-10-11 13:53:05 +02:00
Rebecca Cox
ac10f21597 #1970 WLP: Update property and timestep on UI change of well name 2017-10-10 08:46:20 +02:00
Rebecca Cox
da118ac1da #1971 WLP: Context command to create a new well log RFT curve from a selected well 2017-10-09 14:32:15 +02:00
Bjørn Erik Jensen
0cb97b9c74 #1983 RFT Plot. Apply colors and symbols to curves 2017-10-09 10:51:07 +02:00
Rebecca Cox
8e80245544 #1970 WLP: Move command to dyncast of wellLogTrack in contextCommandBuilder 2017-10-06 15:15:37 +02:00
Rebecca Cox
d6d3ee4f28 #1970 WLP: Add new plot command to context builder 2017-10-06 14:55:20 +02:00
Rebecca Cox
21f07d186f #1947 RFT/PLT Plot: Update curve auto name 2017-10-06 14:38:27 +02:00
Bjørn Erik Jensen
02940992be #1842 RFT Plot. Display RFT curve 2017-10-06 14:20:01 +02:00
Rebecca Cox
aeb854b895 #1947 RFT/PLT Plot: Use AppEnum for wellLogChannel and remove qwtPlot field in rftCurve 2017-10-06 13:35:56 +02:00
Jacob Støren
62b8da837f Remove field accessor method. Adjusted whitespace 2017-10-06 13:34:45 +02:00
Jacob Støren
9bb5dcf011 Make wellLogFile field private in RimWellPath. Some whitespace changes 2017-10-06 13:24:45 +02:00
Rebecca Cox
b604f85d8e #1947 RFT/PLT Plot: Fix bug. Empty depth list 2017-10-06 09:32:27 +02:00
Unknown
4a2a80ba20 #1947 RFT/PLT Plot: Remove depth from value options of curve 2017-10-06 09:14:12 +02:00
Unknown
7db64e099e #1947 RFT/PLT Plot: Fix calculateVaueOptions 2017-10-06 09:14:12 +02:00
Bjørn Erik Jensen
b6c74ee559 #1842 RFT Plot. Command enabling criteria. Minor refactoring 2017-10-05 16:27:39 +02:00
Bjørn Erik Jensen
d5034d8011 #1842 RFT Plot. Populate editors from saved curves 2017-10-05 16:27:39 +02:00
Bjørn Erik Jensen
883b815fac #1842 RFT Plot. Grid data curves 2017-10-05 16:27:39 +02:00
Bjørn Erik Jensen
d090f8ac2d #1842 RFT Plot. First visible RFT curve 2017-10-05 16:26:39 +02:00
Bjørn Erik Jensen
947d31bfcc RimTools. Expose date format string 2017-10-05 16:26:39 +02:00
Bjørn Erik Jensen
1a5c63af39 #1842 RFT Plot. Handle selections 2017-10-05 16:26:39 +02:00
Bjørn Erik Jensen
2add09ea33 #1842 RFT Plot. Show plot when new RFT plot command is triggered 2017-10-05 16:26:39 +02:00
Bjørn Erik Jensen
141bfd27d7 #1842 RFT Plot. Implement property view and RFT plot commands 2017-10-05 16:26:39 +02:00
Bjørn Erik Jensen
536225eb7e #1842 RFT plot. Removed unnecessary fields in RFT plot 2017-10-05 16:26:39 +02:00
Unknown
9c3b199e7e #1947 RFT/PLT Plot: Add uiordering and change Address from std to qt variables 2017-10-05 13:49:54 +02:00
Jacob Støren
b8cef666e0 Whitespace cleanup 2017-10-05 13:42:40 +02:00
Unknown
234c9f8cb7 Code clean up 2017-10-05 11:13:15 +02:00
Unknown
9b54c26c4b #1947 RFT/PLT Plot: Add fieldChangedByUi function 2017-10-05 11:08:30 +02:00
Unknown
e3c330d612 #1947 RFT/PLT Plot: Add QWT curve 2017-10-05 10:49:26 +02:00
Unknown
fd785044eb #1947 RFT/PLT Plot: Add reader access in curve 2017-10-05 09:29:19 +02:00
Magne Sjaastad
132c109ff2 Observed Data : Select in tree view and expand imported object 2017-10-04 07:36:30 +02:00
Magne Sjaastad
54063aece2 #1957 Observed Data : Add handling of custom well name 2017-10-03 22:07:07 +02:00
Magne Sjaastad
b36fcb5f09 #1954 Observed Data : Display imported variables as text in property editor 2017-10-03 15:31:45 +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
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
Unknown
d9bee55116 Observed data: Rename Observed data to Observed Time History Data in GUI 2017-09-29 11:39:07 +02:00
Bjørn Erik Jensen
9db96cbb1b #1943 Curve creator. RimProject::allSummaryCases also returns observed data 2017-09-28 14:42:13 +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
Rebecca Cox
faf5f59be6 #1820 Observed data: Add close command of observed data 2017-09-27 15:07:32 +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
Bjørn Erik Jensen
70a41709cf #1842 RFT plot. Initial commit. Under construction... 2017-09-27 12:39:35 +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
Jacob Støren
64445e65b9 Moved Summary Plots collection above Well Log Plots 2017-09-26 10:50:09 +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
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
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
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
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
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
Bjørn Erik Jensen
a72f2ea421 #1917 Plot project tree. Clean up summary plot popup menu. 2017-09-21 10:47:55 +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
b03da807ea Merge fixes related to #1901 Perforation COMPDAT export errors 2017-09-20 11:05:59 +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
dc1844f5d5 #1901 Use the more robust WellLogExtraction system for perforation interval intersection calculations. 2017-09-19 17:20:49 +02:00
Rebecca Cox
11172d648c #1813 Observed data: Add pragma once 2017-09-19 15:25:48 +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
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
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
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
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
Bjørn Erik Jensen
da9421485e #1853 Curve Creator. Plot tree view displays curves only 2017-09-19 09:29:24 +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
65692eddab #1886 Curve creator. Implemented editor apply button behavior 2017-09-18 10:45:31 +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
6855d63394 #1889 Curve Creator : Produce option items in summary plot collection 2017-09-15 13:42:43 +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
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
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
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
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
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
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
c60465b380 #1840 Summary case: Delete a summary collection with or without its contents 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
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
Magne Sjaastad
cb7a5253ff #1708 Fishbones: Fix issue with random angle on Linux 2017-09-08 08:21:44 +02:00
Magne Sjaastad
fb1b6cc628 CppCheck : Remove unused variables 2017-09-07 22:05:20 +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
Unknown
a910697f6a #1728 Remove curve filter curves for chosen case(s) 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
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
0d5c62f4e7 #1863 Avoid switching result when flooded pv is not selected as result variable 2017-09-05 12:03:17 +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
astridkbjorke
3112c10ec1 #1787 Making test feature to be able to run the calculator 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
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
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
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
609bf4037b #1768 Move RifReaderSettings to private member of RiaPreferences 2017-08-29 11:03:45 +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
d4663fe6df #1767 Add const access to RifReaderInterface 2017-08-28 15:16:12 +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
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
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
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
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
8c8a2a6492 #1042 #990 Use step function in summary plot 2017-08-22 15:24:49 +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
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
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
Bjørnar Grip Fjær
23ecdffe01 #1785 Store/restore generated data from Octave in project cache 2017-08-21 09:12:05 +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
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
8404ce265d #1782 Show Y-axes for ASCII data curves 2017-08-17 14:25:20 +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
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
030ad9cec4 #1126 Add "Accumulated Saturation by Time of Flight"-plot 2017-08-15 16:00:32 +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
5eb4eafb6e Merge branch 'dev' into hdf-prototype 2017-08-14 10:47:44 +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
c1fe8a7e6c #1691 Rename to RigEclipseResultInfo 2017-08-11 15:10:08 +02:00
Magne Sjaastad
89684c243f #1755 Use namespace RiaDefines instead of class 2017-08-11 14:28:42 +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
Bjørnar Grip Fjær
a47c5b5d84 #1690 Summary: Import clipboard data from Excel as new curves 2017-08-11 13:57:11 +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
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
Magne Sjaastad
a3ba1991db #1739 Ellipse Fracture : Recompute the fracture grid when opening project 2017-08-04 14:35:16 +02:00
Magne Sjaastad
c481a275ee Merge branch 'dev' into pre-proto 2017-08-04 10:37:35 +02:00
Magne Sjaastad
1adba2caf7 #1724 Removed unused code 2017-08-04 10:21:07 +02:00
astridkbjorke
50eb8b7225 #1617 Adding conductivity scaling factor to StimPlan fracture templates, and scaling the conductivity values in file with this value. 2017-08-03 13:40:35 +02:00
Magne Sjaastad
bf3636a9df #1732 Update path to StimPlan xml if required 2017-08-03 13:21:19 +02:00
astridkbjorke
d55c362bf0 #1714 Adding point at fracture position to the vector of wellPathPoints used in calculation of intersection between fracture and wellpath. 2017-08-02 11:37:46 +02:00
Bjørnar Grip Fjær
7e44fe185e #1704 Include top and base layers in fracture containment 2017-08-02 10:50:11 +02:00
Magne Sjaastad
ffdafcfb97 #1708 Fishbones : Fix use of rand() for orientation of subs on Linux 2017-08-01 14:36:13 +02:00
Bjørnar Grip Fjær
7179aaeac9 Merge branch 'dev' into pre-proto 2017-08-01 12:44:11 +02:00
astridkbjorke
29e40b6dbb #1655 Adding skin factor for main bore for fishbone calculations, and using this value in transmissibility calculations. 2017-07-31 11:49:52 +02:00
Bjørnar Grip Fjær
2c88d4bee9 #1665 Add setTimeStep command to command file interface 2017-07-27 10:39:59 +02:00
astridkbjorke
45f47dac0c Changing name of parameter from "Start of History" to "All timesteps" 2017-07-07 14:05:20 +02:00
Jacob Støren
ec4362b247 #1692 Put SourSimRL Results in a separate result type
#1693 Started to separate code for SourSim and Eclipse results data.
2017-07-07 13:31:14 +02:00
astridkbjorke
bf15e48b29 Changing name of fishbone-wellpath-collection from "Well path" to "Imported Laterals" 2017-07-05 10:32:02 +02:00
astridkbjorke
bcbb5202df #1678 Bugfix to set property for polygon for stimplan fractures, to avoid potentially confusing error messages for stimplan files without conductivity. 2017-07-03 11:36:58 +02:00
astridkbjorke
0dfc76dd3e #1678 Setting fracture template unit for stimplan based on unit on grid (ft or m) instead of unit for conductivity (which may be missing in the file). 2017-07-03 11:00:06 +02:00
astridkbjorke
032630f6e9 #1634 Calculating smallest positive value and using this value for the min range value when using logarithmic scale 2017-06-30 16:16:27 +02:00
Magne Sjaastad
78a779424f #1677 Store dialog data in project file 2017-06-30 16:14:15 +02:00
astridkbjorke
d6ae3b4a53 #1634 Updating tooltip on user defined min value to make it clear that only positive values are valid for log scale. 2017-06-30 16:05:46 +02:00