Commit Graph

5742 Commits

Author SHA1 Message Date
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
b09797bb84 Merge branch 'hdf-prototype' of https://github.com/OPM/ResInsight into hdf-prototype 2017-08-14 10:51:22 +02:00
Magne Sjaastad
5eb4eafb6e Merge branch 'dev' into hdf-prototype 2017-08-14 10:47:44 +02:00
Bjørnar Grip Fjær
993a7c2038 #1760 Add markdown formatted documentation for new Octave interface commands 2017-08-14 10:24:12 +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
Magne Sjaastad
7cf1c82142 Add system documentation for Eclipse binary file import 2017-08-09 15:03:12 +02:00