Commit Graph

4801 Commits

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