Commit Graph

1206 Commits

Author SHA1 Message Date
Rebecca Cox
7d908394db #1996 Renaming. Remove unused includes and rename local variables 2017-10-17 09:52:31 +02:00
Rebecca Cox
d748803159 #1996 Rename RimEclipseWell -> RimSimWellInView 2017-10-17 09:52:31 +02:00
Magne Sjaastad
ccd839c182 #1977 Curve Calculator : Use smaller and right aligned buttons 2017-10-13 16:22:39 +02:00
Magne Sjaastad
82aee8f5bf #1977 Curve Calculator : Create calculation description from addresses 2017-10-13 14:33:26 +02:00
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
Magne Sjaastad
2dd18cec6e #1977 Curve Calculator : Remove parent pointer from constructor 2017-10-12 21:07:35 +02:00
Magne Sjaastad
ad92b93e06 #1977 Curve Calculator : Rename to RicSummaryCurveCalculatorEditor 2017-10-12 21:07:35 +02:00
Magne Sjaastad
650e29d6d5 #1977 Curve Calculator : Add button box to dialogs 2017-10-12 10:52:30 +02:00
Magne Sjaastad
6fd9bec353 #1977 Curve Calculator : Main dialog with expression editor 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
886c1ea256 #1981 RFT Plot. Disabled several commands 2017-10-10 11:18:53 +02:00
Rebecca Cox
dae8d775be Linux build failed. Replace slash 2017-10-09 15:33:01 +02:00
Rebecca Cox
69d4bb69c6 #1979 Observed Data: Add sensible filters on Import observed data file dialog 2017-10-09 15:23:50 +02:00
Rebecca Cox
634108de8c Add wellLog Tools class and move static methods from newCurve-commands 2017-10-09 14:32:15 +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
0e832fad06 #1978 Curve Creator. Separate selections of observed data and simulated data 2017-10-09 08:54:49 +02:00
Rebecca Cox
984fbc66ac #1970 WLP: Command to create an empty RFT-curve 2017-10-06 14:54:38 +02:00
Jacob Støren
9bb5dcf011 Make wellLogFile field private in RimWellPath. Some whitespace changes 2017-10-06 13:24:45 +02:00
Jacob Støren
6f82f0f614 Rename and whitespace changes 2017-10-06 12:36:21 +02:00
Bjørn Erik Jensen
5f050448f9 Move method to CPP file 2017-10-06 07:41:48 +02:00
Bjørn Erik Jensen
fba1d068e9 Forward declare class 2017-10-05 16:53:14 +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
d283e3aa8c Curve creator. Minor refactoring 2017-10-05 16:27: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
Magne Sjaastad
a362891d7e #1940 Curve Creator : Make sure the curve tree is updated 2017-10-02 14:49:24 +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
Arne Morten Kvarving
ab4619bf74 fixed: add missing cmath include statements
highlighted by building with gcc6
2017-09-29 18:24:28 +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
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
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
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
Bjørn Erik Jensen
70a41709cf #1842 RFT plot. Initial commit. Under construction... 2017-09-27 12:39:35 +02:00
Bjørn Erik Jensen
4efe9ca944 Observed data. Fixed editor display for observed data 2017-09-26 10:39:36 +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
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
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
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
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
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
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
Rebecca Cox
68a101fe2d #1816 Use new parser on pasting data to summary plot 2017-09-21 12:21:52 +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
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
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
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
4e82aaf502 #1813 Observed data: Remove right click options for 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
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
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
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
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
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
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
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
ee25b8424d #1840 Summary case: Cut paste of summary cases 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
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
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
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
d638f536d8 #1879 Guard filename generation for cases without timesteps 2017-09-08 14:43:52 +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
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
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
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
1ae9978214 #1728 Curves assisiated with closed summary case(s) are deleted 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
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
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
3112c10ec1 #1787 Making test feature to be able to run the calculator 2017-08-30 08:59:05 +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
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
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
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
ee5a2530fd Fix naming of command to store flow characteristics plot 2017-08-24 09:28:05 +02:00
Magne Sjaastad
0bb892541a #1808 System : Show geomech feature name in about dialog 2017-08-23 07:29:36 +02:00
Magne Sjaastad
e9bab1c94b #1808 System : Show feature name in about dialog 2017-08-22 14:48:12 +02:00
Bjørnar Grip Fjær
0cff37f23f #1783 Copy/Paste of Excel-pasted curves 2017-08-22 13:31:21 +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
2d11a34928 #1794 Remove unused features related to delete of fracture objects 2017-08-21 21:02:43 +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
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
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
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
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
Magne Sjaastad
362eb249b5 #1756 Allow 'Include Fractures' to be un-checked 2017-08-14 22:30:22 +02:00
Magne Sjaastad
5eb4eafb6e Merge branch 'dev' into hdf-prototype 2017-08-14 10:47:44 +02:00
Magne Sjaastad
0ba1746755 Merge branch 'dev' into pre-proto 2017-08-11 16:14:00 +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
f096f78a55 Linux : Fix compile issue 2017-08-11 15:18:20 +02:00
Magne Sjaastad
89684c243f #1755 Use namespace RiaDefines instead of class 2017-08-11 14:28:42 +02:00
Magne Sjaastad
c4aa625d33 #1755 Move porosity model enum to separate file 2017-08-11 14:27:56 +02:00
Magne Sjaastad
88bbea6339 #1755 Remove porosity enum from RifReaderInterface 2017-08-11 14:27:22 +02:00
Magne Sjaastad
624f14da46 Prefix enum values with RIF_
FLOAT causes Cotire compile to fail
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
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
Bjørnar Grip Fjær
6ce36b666c #1723 Do not create completions file for wells and completion types that have no data 2017-08-04 16:42:35 +02:00
Bjørnar Grip Fjær
861aa292b2 #1706 Ensure new fractures are created with unique names 2017-08-04 15:47:47 +02:00
Bjørnar Grip Fjær
37456bfa9b #1730 Include more information in snapshot filenames 2017-08-04 11:25:42 +02:00
Magne Sjaastad
c481a275ee Merge branch 'dev' into pre-proto 2017-08-04 10:37:35 +02:00
Bjørnar Grip Fjær
a59735de87 #1730 Move snapshot features to separate files 2017-08-03 16:22:02 +02:00
astridkbjorke
f2c20db534 #1707 Removing check on wheter fracture cell is in contained area or not when calculating flow in fracture and into well. This will allow flow in the fracture and into the well also in eclipse layers excluded by the fracture containment feature, and in areas without any eclipse cells (gaps in grid). 2017-08-03 11:10:07 +02:00
Bjørnar Grip Fjær
aa1d7775a4 #1709 Be more explicit when an error occurs when combining completion data 2017-08-01 14:31:47 +02:00
Bjørnar Grip Fjær
63c58d0481 #1705 Export fractures to own file when exporting completions to separate files based on completion type 2017-08-01 13:09:42 +02:00
Bjørnar Grip Fjær
7179aaeac9 Merge branch 'dev' into pre-proto 2017-08-01 12:44:11 +02:00
astridkbjorke
5b34414977 #1713 Using time step from view instead of that from export-setting when exporting connection factors for simWell-fracture 2017-07-31 15:10:07 +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
da4f6d72be #1665 Add exportMsw command to command file interface 2017-07-27 10:29:45 +02:00
Bjørnar Grip Fjær
8e444d5cbe #1665 Add exportWellPathComplections command to command file interface 2017-07-27 10:28:41 +02:00
astridkbjorke
68ec65602a #1687 Updating default file name for export of fishbone laterals. 2017-07-05 09:59:19 +02:00
astridkbjorke
546a6457cc #1652 Creating export folder if it does not already exist. 2017-07-03 15:02:24 +02:00
astridkbjorke
5b62184e2f #1678 Giving an error message and not calculating transmissibiliities if using a stimPlan file without conductivity and finite conductivity in fracture. 2017-07-03 13:55:59 +02:00
Magne Sjaastad
78a779424f #1677 Store dialog data in project file 2017-06-30 16:14:15 +02:00
Magne Sjaastad
f8f57d3184 #1670 Use PtrField instead of PdmPointer 2017-06-30 16:13:38 +02:00
Magne Sjaastad
917ee860d2 #1670 Minor UI adjustments 2017-06-30 12:49:12 +02:00
Magne Sjaastad
b2b4ab95ba #1670 Add command feature "Export CARFIN" 2017-06-29 22:37:00 +02:00
Magne Sjaastad
407547d454 #1670 Add cell range UI 2017-06-29 22:37:00 +02:00
Magne Sjaastad
15e805fba3 #1670 Move commands to ExportCommands folder 2017-06-29 22:37:00 +02:00
Bjørnar Grip Fjær
03aa6c8eb7 #1667 MSW Export : Move parameters from export dialog to project 2017-06-28 20:51:16 +02:00
Magne Sjaastad
70d3c501a4 #1668 Use "Export" instead of "OK" in export dialogs 2017-06-28 10:13:59 +02:00
Magne Sjaastad
286ec08b05 #1668 Use title "Export Well Segments" 2017-06-28 10:11:56 +02:00
astridkbjorke
63b478b18d #1650 Only use linear transmissibility for fractures along well pipe (and no radial transmissibility to end points). 2017-06-26 14:12:17 +02:00
astridkbjorke
9f3dad9465 #1654 In WELSEGS export, using liner diameter as diameter for main bore and ICD, computed effective diameter for laterals. 2017-06-26 11:45:20 +02:00
astridkbjorke
50a0dcd499 #1589 Setting includeFractures to false and read-only when using setting "Use Default Connection Factors and WPImult (excludes fractures)" 2017-06-23 15:45:22 +02:00
astridkbjorke
6febf1dfbf Additional fix after merge 2017-06-23 13:21:47 +02:00
astridkbjorke
ea08cc58fb Merge from dev 2017-06-23 13:21:34 +02:00
astridkbjorke
3960c9db90 #1550 Making separate group for MSW parameter in FishbonesCollection to avoid confusion about what parameters are used for. 2017-06-23 10:15:34 +02:00
astridkbjorke
42e41355c1 Fixing printing endMD in perforation interval metadata when exporting compdat values. 2017-06-22 15:20:16 +02:00
astridkbjorke
c8e5e327d9 #1550 Only including contributions for main bore with fishbones if there actually are fishbones on this well. 2017-06-22 15:19:03 +02:00
astridkbjorke
df8f45c649 #1633 Removing option for selected and checked wells, now only option is selected wells if selecting well paths. 2017-06-22 14:35:28 +02:00
astridkbjorke
53917c6195 #1633 Updating options for which wells to include in export to depend on whether a wellPathCollection or WellPaths have been chosen. Also fixing last-save directory to remain at the directory last used. 2017-06-22 14:35:28 +02:00
Jacob Støren
33b037a80b #1440 Merge dev into pre-proto (WellPath viz restructure and constness)
Had to do quite a bit constness fiddeling to make the merge work
2017-06-22 10:42:07 +02:00
Magne Sjaastad
4c7f9d4d31 Merge branch 'master' into dev 2017-06-21 17:42:28 +02:00
Jacob Støren
845b1acbbd Merge branch 'dev' into well-path-restructure 2017-06-21 17:16:17 +02:00
Jacob Støren
b2a1f5690b #1440 Remove all real caching in the well path geometry system
Had no effect anyway.
Rename method to scheduleRedrawAffectedViews()
2017-06-21 17:13:19 +02:00
Bjørnar Grip Fjær
8f06115730 Merge branch 'dev' into pre-proto 2017-06-21 16:38:57 +02:00
Bjørnar Grip Fjær
53ee396c03 #1635 Use scientific numbers for transmissibility in completion data export 2017-06-21 16:25:41 +02:00
astridkbjorke
8d28981664 #1589 Remove option removeLateralsInMainBoreCells, instead implement option for "Exclude main bore" for fishbone export. Also grouping export options. 2017-06-21 15:55:35 +02:00
astridkbjorke
21f0857791 #1589 Replace bools "Calculate Trans" and "Include WPImult" with choice of calc trans or use wpimult and default connection factors 2017-06-21 15:55:35 +02:00
Bjørnar Grip Fjær
17593fba92 #1602 Include sim well fractures when calculating completion type results 2017-06-21 11:06:38 +02:00
Bjørnar Grip Fjær
4f8f77945c Add method for checking if fracture has non-zero conductivity 2017-06-20 16:40:51 +02:00
Jacob Støren
5a02cf1498 #1574 Make export of fractures to compdat now respects the containment settings 2017-06-20 16:37:25 +02:00
Bjørnar Grip Fjær
d63fdf0c80 #1593 Use well path unit type on fractures 2017-06-20 14:46:58 +02:00
astridkbjorke
5a466db9af #1630 Update metadata for completions 2017-06-20 13:49:33 +02:00
astridkbjorke
5bcc226aba #1561 Setting wpimult in RigCompletionData to double, setting celldirection in completionData for implicit trans and wpi mult calculation 2017-06-20 13:49:33 +02:00