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 |
|
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
|
cb06ce11bb
|
#1682 Respect disable result lighting for NNC results
|
2017-08-04 16:30:21 +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 |
|
astridkbjorke
|
c222612ae0
|
#1737 Adding unit test re-creating problem with finding well-fracture-overlap for along-oriented fracture
|
2017-08-04 15:14:46 +02:00 |
|
Magne Sjaastad
|
a3ba1991db
|
#1739 Ellipse Fracture : Recompute the fracture grid when opening project
|
2017-08-04 14:35:16 +02:00 |
|
Bjørnar Grip Fjær
|
5e48494c9b
|
#1719 Fix issue with commands without parameters in command file
|
2017-08-04 13:58:32 +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
|
3c5016cb8c
|
#1724 Fix merge issues
|
2017-08-04 10:45:04 +02:00 |
|
Magne Sjaastad
|
c481a275ee
|
Merge branch 'dev' into pre-proto
|
2017-08-04 10:37:35 +02:00 |
|
Magne Sjaastad
|
88186619db
|
#1724 Apply fix on dev branch
|
2017-08-04 10:31:55 +02:00 |
|
Magne Sjaastad
|
6ddfab6823
|
#1724 Removed unused code
|
2017-08-04 10:24:30 +02:00 |
|
Magne Sjaastad
|
1adba2caf7
|
#1724 Removed unused code
|
2017-08-04 10:21:07 +02:00 |
|
Magne Sjaastad
|
e35bcf1f58
|
#1724 Fix mapping from picked triangle index to segment index
|
2017-08-04 10:07:53 +02:00 |
|
Bjørnar Grip Fjær
|
a59735de87
|
#1730 Move snapshot features to separate files
|
2017-08-03 16:22:02 +02:00 |
|
Bjørnar Grip Fjær
|
f437f8dc84
|
#1734 Command File : Use caseId as variable name instead of case
|
2017-08-03 15:01:13 +02:00 |
|
Bjørnar Grip Fjær
|
cf2df771d4
|
#1675 Selected cell interface for Octave
|
2017-08-03 14:35:46 +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 |
|
Magne Sjaastad
|
9cd7dcdd91
|
#1665 Add processEvents() when waiting for external octave process
|
2017-08-03 11:31:15 +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 |
|
astridkbjorke
|
ef8fc3dbc6
|
#1716 Fix spelling
|
2017-08-02 13:29:45 +02:00 |
|
astridkbjorke
|
fcfe0eb4a9
|
#1716 Fixing error in Peaceman formula
|
2017-08-02 13:10:08 +02:00 |
|
astridkbjorke
|
313752bb7c
|
#1721 Updating value used if trig calculation of azimuth value for simWell cannot be used due to 0 y component (well oriented East-West)
|
2017-08-02 11:37:46 +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 |
|