Magne Sjaastad
f73e964d23
Curve Definition Selection : Make robust for invalid or missing input
2017-11-21 09:43:34 +01:00
Magne Sjaastad
018549d15a
#2143 Import of NNC : Move import of dynamic NNC data to RifEclipseOutputFileTools
2017-11-14 10:43:14 +01:00
Magne Sjaastad
1c0d8c0dd0
#2143 Guard agains access of null pointer when reading NNC
2017-11-14 10:35:18 +01:00
Jacob Støren
c670878b33
#2139 , #2126 Add available times convenience access in RftReader, Rename enum in RifEclipseRftAddress
2017-11-13 15:23:38 +01:00
Jacob Støren
8bea278d20
#2139 , #2126 Add convenience access in RifDataSourceForRftPlt
2017-11-13 15:23:38 +01:00
Jacob Støren
c02538b8bd
Rename of RifWellRftAddress to RifDataSourceForRftPlt
2017-11-13 15:23:38 +01:00
Jacob Støren
cc4041b09b
#2135 Rewrote obfuscated less operator and sort OBSERVED PLT sources first
2017-11-12 23:53:59 +01:00
Magne Sjaastad
5db08c7b76
#2097 Reservoir Phase Detection : Find available phases from result files
2017-11-10 09:43:51 +01:00
Jacob Støren
dfa0ade9fe
#2116 Convert the PLT plot gas rate from RFT file to oil equivalents
2017-11-09 15:20:15 +01:00
Magne Sjaastad
c19bc103c2
Observed Data : Use reserve instead of wrong use of resize
2017-11-08 08:58:57 +01:00
Magne Sjaastad
ea87c84d8c
Observed Data : Improve performance when accessing curve values
2017-11-08 07:44:06 +01:00
Magne Sjaastad
e9a938ce78
#2003 Observed Data : Compare first time step when merging
2017-11-07 12:33:22 +01:00
Magne Sjaastad
b022492bc1
#2003 Observed Data : Improve detection of scientific number
2017-11-07 11:16:33 +01:00
Magne Sjaastad
179c15ef5c
#2003 Observed Data : Adjust minimum required headers based on presence of units and scaling
2017-11-07 11:16:33 +01:00
Magne Sjaastad
d45ca19af4
#2003 Observed Data : Use epoch as start date when no date is present
2017-11-07 11:16:33 +01:00
Magne Sjaastad
222bf38d58
#2066 Observed Data : Detect scaling
2017-11-07 11:16:33 +01:00
Magne Sjaastad
5ab56bb2fb
#2066 Observed Data : Improve detection of required header lines
2017-11-07 11:16:33 +01:00
Magne Sjaastad
9d06ef857e
#2003 Observed Data : Use time with highest available resolution
2017-11-07 11:16:33 +01:00
Magne Sjaastad
97d67f2d49
#2003 Observed Data : Refactor creation of time steps
2017-11-07 11:16:33 +01:00
Magne Sjaastad
d7f70f5c9f
Remove duplicate function
2017-11-07 11:16:33 +01:00
Magne Sjaastad
6b18493599
#2003 Observed Data : Collect detection of string types
2017-11-07 11:16:33 +01:00
Bjørn Erik Jensen
71bb26a292
Column based user data parser. Fix Linux warning
2017-11-06 12:37:23 +01:00
Magne Sjaastad
f53acbdce2
#2003 Observed Data : Handle STEPTYPE with potentially missing text for first row
2017-11-06 10:53:46 +01:00
Magne Sjaastad
296bacf7f6
#2003 Observed Data : Merge tables if DATE is present and size is equal
2017-11-03 17:44:48 +01:00
Magne Sjaastad
7d3a547ad6
#2003 Observed Data : If YEARX is present, use this as basis for the time step
2017-11-03 17:42:16 +01:00
Magne Sjaastad
f50760bb35
#2003 Observed Data : Add basic support for fixed width in parser
2017-11-03 17:42:16 +01:00
Magne Sjaastad
50b2717ed2
#2003 Move conversion from string to double into RiaStdStringTools
2017-11-03 17:42:16 +01:00
Magne Sjaastad
713998fb38
#2003 Move conversion from string to integer into RiaStdStringTools
2017-11-03 17:42:16 +01:00
Magne Sjaastad
265c0ebb70
#2003 Observed Data : Add file parsing of fixed column width
2017-11-03 17:42:16 +01:00
Magne Sjaastad
f844c6fdb9
Fix invalid assert
2017-11-03 17:42:16 +01:00
Magne Sjaastad
9b7cfdd913
#2066 Observed Data : Improve error reporting
2017-11-03 08:24:25 +01:00
Magne Sjaastad
ea53018f54
#2016 Observed Data : Remove well override from reader interface
2017-11-03 07:40:18 +01:00
Magne Sjaastad
fee00918e9
#2066 Observed Data : Major rewrite of varying column width parsing
...
Add TableInfo to hold a table with several ColumnInfo objects
Improved detection of RifEclipseSummaryAddress from all variants
2017-11-02 19:00:27 +01:00
Rebecca Cox
4b1e64381d
Rename local variable
2017-10-31 15:06:22 +01:00
Rebecca Cox
36b9e0e28f
Remove depth as option in property selector
2017-10-31 15:06:22 +01:00
Rebecca Cox
ee52bc6e39
Use RiaQDateTimeTools to create QDateTime
2017-10-31 15:06:22 +01:00
Magne Sjaastad
dbc401ef71
#2067 NNC : Guard for null pointer access during import
2017-10-31 09:56:21 +01:00
Rebecca Cox
88b8bdf5c2
#2060 Rft Curve: Variable option menu grows and grows
2017-10-27 16:00:47 +02:00
Bjørn Erik Jensen
3ef2ec3f33
#1948 PLT plot. Save editor selections to project file
2017-10-27 09:43:35 +02:00
Bjørn Erik Jensen
cb78ad8c31
#1948 PLT plot. Prepare for saving PLT plot editor selections to project file
2017-10-26 10:35:23 +02:00
Magne Sjaastad
8cde20d662
#2033 SourSim : Guard for invalid index and show more error reports
2017-10-23 20:12:21 +02:00
Magne Sjaastad
bd8abba779
#2022 Curve Calculator : Add enum Calculated
2017-10-18 12:47:10 +02:00
Rebecca Cox
f0cb458550
#1996 Renaming. cmakefile and fix compile issues
2017-10-17 09:52:31 +02:00
Rebecca Cox
6674f6087a
#1984 Ensure QDateTime spec set to UTC
2017-10-17 09:52:31 +02:00
Rebecca Cox
44be1bfd6b
#1996 Rename RigSingleWellResultsData -> RigSimWellData
2017-10-17 09:52:31 +02:00
Rebecca Cox
546e31a7c0
Linux build failed. Replace slash
2017-10-12 13:56:08 +02:00
Rebecca Cox
306e32dba1
Forward declare vecIjk
2017-10-12 12:43:55 +02:00
Rebecca Cox
9aaf56b4ef
Observed data parser: Avoid infinite loop on parsing of invalid file
2017-10-12 12:43:55 +02:00
Rebecca Cox
2799d86c01
#1980 PLT Plot: Make cells available in .RFT reader
2017-10-12 12:43:55 +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
18552cf2f6
RifEclipseOutputFileTools. Let DateTime tools class create DateTime object with correct time spec
2017-10-09 13:43:56 +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
Magne Sjaastad
a5e684ffee
#1974 Dyn NNC : Read dyn NNC if flux data is available
2017-10-06 10:54:18 +02:00
Unknown
4a2a80ba20
#1947 RFT/PLT Plot: Remove depth from value options of curve
2017-10-06 09:14:12 +02:00
Unknown
66b9bb34b5
#1947 RFT/PLT Plot: Use const string in rftAddress for wellLogChannelName
2017-10-06 09:14:12 +02:00
Unknown
e23783c1ed
#1947 RFT/PLT Plot: Create const string in rftAddress for wellLogChannelName
2017-10-06 09:14:12 +02:00
Bjørn Erik Jensen
a6e2a00122
Date string parser. Fix build error. Set UTC time spec
2017-10-05 16:27: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
Magne Sjaastad
cc59b85ee9
#1966 : Use DATE if DATE is the only column present
2017-10-05 10:11:30 +02:00
Magne Sjaastad
56cd53a5f0
#1966 Observed Data : Use first item in DATE column as startdate for YEARS
2017-10-05 10:11:30 +02:00
Unknown
fd785044eb
#1947 RFT/PLT Plot: Add reader access in curve
2017-10-05 09:29:19 +02:00
Unknown
24d59d7f84
#1947 RFT/PLT Plot: Open RFT file on usage
2017-10-04 16:13:17 +02:00
Unknown
b2e6192dc1
#1947 RFT/PLT Plot: Add .RFT file reader
2017-10-04 14:59:51 +02:00
Jacob Støren
f654cd2bcc
#1960 Code adjustments
2017-10-04 11:18:38 +02:00
Jacob Støren
777a231606
#1960 Cache timestep times etc in the unified restart reader
2017-10-04 11:18:38 +02:00
Jacob Støren
9fc3443050
#1960 Use set<> to check if a timestep is already present instead of linear search
2017-10-04 11:18:38 +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
657f271cd1
Remove obsolete and unused code
2017-10-03 22:11:05 +02:00
Magne Sjaastad
54063aece2
#1957 Observed Data : Add handling of custom well name
2017-10-03 22:07:07 +02:00
Magne Sjaastad
2546dc631a
#1957 Observed Data : Add setters for well name and well group name
2017-10-03 22:05:33 +02:00
Magne Sjaastad
db981e2eee
#1962 : Observed Data : Add helper class for QDateTime and use from parsers
2017-10-03 14:14:16 +02:00
Magne Sjaastad
f3f78995fa
#1959 Observed Data : Support custom ordering of header rows
2017-10-03 11:55:06 +02:00
Magne Sjaastad
4c61696f4e
#1959 Observed Data : Use seekg after parsing header
2017-10-03 11:55:06 +02:00
Magne Sjaastad
2fc1d20f45
#1959 : Improve detection of comment lines in header
2017-10-03 11:55:06 +02:00
Jacob Støren
c8b329ddc3
Update libecl to 2e36798b43. For better memory usage reading wells
2017-10-02 17:11:36 +02:00
Magne Sjaastad
2d50a68286
Observed Data : Rename to RifEclipseUserDataParserTools
2017-10-02 14:06:43 +02:00
Jacob Støren
1c2466fa85
#1951 Use a valid default start date
2017-09-29 15:11:21 +02:00
Unknown
500aaed00b
1941 Observed data: Set UTC time spec for parsed QDateTime object
2017-09-29 11:17:33 +02:00
Magne Sjaastad
8bae516af7
#1941 : Obseved Data : Add support for parsing of start date
2017-09-28 09:06:40 +02:00
Magne Sjaastad
9364efa4b7
#1941 Observed Data : Add RiaDateTimeTools
2017-09-28 08:04:27 +02:00
Magne Sjaastad
330f8a43b3
#1918 Observed Data : Scale time based on time unit
2017-09-27 15:28:34 +02:00
Magne Sjaastad
cdd1a96f44
#1934 Observed Data : Support for vector based files
2017-09-27 15:17:42 +02:00
Magne Sjaastad
dc23c63b97
#1918 : Observed Data : Rename of several files
2017-09-27 14:21:58 +02:00
Jacob Støren
a24ce670cf
Fix two compiler warnings
2017-09-27 13:44:45 +02:00
Rebecca Cox
88902e8f03
#1933 Observed data: Sets restOfHeader correctly
2017-09-27 09:32:10 +02:00
Rebecca Cox
d8ebe508a2
#1933 Observed data: Speed up reading observed data file
2017-09-26 15:44:02 +02:00
Rebecca Cox
b8f18dd4c8
#1933 Observed data: set isAVector correctly
2017-09-26 14:06:36 +02:00
Rebecca Cox
2dda47014c
#1933 Observed data: Handle lack of unit name in file
2017-09-26 13:31:05 +02:00
Rebecca Cox
93971e541c
#1922 Observed data: Update column parser to handle keywords
2017-09-26 13:14:00 +02:00
Rebecca Cox
745bed2573
#1933 Observed data: change int to size_t and clean up
2017-09-26 11:06:09 +02:00
Rebecca Cox
e15d26cddb
#1933 Observed data: Add scaleFactor to ColumnInfo
2017-09-26 10:12:05 +02:00
Rebecca Cox
563a426ed5
#1839 Observed data: Add SummaryAddress to ColumnInfo
2017-09-26 09:38:29 +02:00
Rebecca Cox
b311d8827c
#1839 Observed data: Remove unused includes
2017-09-26 09:38:29 +02:00
Rebecca Cox
8f14016eed
#1839 Observed data: Parser for data with keyword VECTOR
2017-09-25 14:38:32 +02:00
Magne Sjaastad
ef56591555
#1934 #1839 Observed Data : Add parsing of column based summary data
2017-09-25 14:37:45 +02:00
Rebecca Cox
32fe3d41a4
#1839 Observed data: Move RSMSPEC static methods to tools method
2017-09-25 09:07:14 +02:00
Rebecca Cox
6e4c28605e
#1839 Observed data: Add column based rsmspec parser
2017-09-24 18:04:19 +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
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
8f158510f9
#1918 Observed Data : Stripped down SummaryReaderInterface
2017-09-22 15:02:15 +02:00
Magne Sjaastad
2773c00f25
#1918 Observed Data : Use RifEclipseSummaryAddress when asking for timesteps
2017-09-21 19:38:09 +02:00
Rebecca Cox
2966412bce
#1816 Observed data: Only one timesteps-vector in ascii parser
2017-09-21 12:21:52 +02:00
Rebecca Cox
62d9978504
#1816 Move functions from SummaryReaderInterface to EclipseSummaryReader
2017-09-21 12:21:52 +02:00
Rebecca Cox
c7c06c311b
#1816 Observed data: Add time step index to summary address
2017-09-21 12:21:52 +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
bea3bd12b8
#1816 Observed data: Add ascii parser
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
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
Rebecca Cox
1ac50e178e
#1813 Observed data: Make summary reader interface and make observed data reader object
2017-09-19 14:19:44 +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
0a824d351c
#1886 Eclipse address. Add methods for uiText formatting and parsing
2017-09-15 11:47:16 +02:00
Bjørn Erik Jensen
e5e28d70aa
#1847 Summary curves. Add new contructor to RifEclipseSummaryAddress
2017-09-13 16:40:24 +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
788ac2c8a8
#1727 Reload summary case: A new file reader will be created on reload
2017-09-11 10:45:26 +02:00
Jacob Støren
cd9b22d4cf
#1874 Avoid invalid summary addresses from libecl
2017-09-08 14:43:52 +02:00
Magne Sjaastad
fb1b6cc628
CppCheck : Remove unused variables
2017-09-07 22:05:20 +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
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
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
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
6629447fa1
#1768 Add flag in preferences to control use of Result Index File
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
Magne Sjaastad
c443aefa5e
#1767 Add allTimeSteps() to get all time steps from file
2017-08-28 15:17:03 +02:00
Magne Sjaastad
e4afb24421
#1768 Guard against access of null pointer
2017-08-25 15:08:23 +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
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
Magne Sjaastad
553b3bf63e
#1794 Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES
2017-08-21 15:24:20 +02:00
Magne Sjaastad
51c30448e9
Merge remote-tracking branch 'origin/dev' into pre-proto
2017-08-21 10:42:11 +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
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
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
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
8f3a7a5867
#1691 Map from filtered time step indices to well result indices
2017-08-11 14:27:58 +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
ad09441da1
#1691 Add RigTimeStepInfo
2017-08-11 14:26:16 +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
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
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
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
Jacob Støren
f96fdc27e7
Guard dynamic nnc access against missing restart file(s)
2017-07-04 13:50:22 +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
Bjørnar Grip Fjær
44f0234096
#1661 Octave interface for getting static and dynamic NNC result values from ResInsight
2017-06-29 11:19:07 +02:00
Bjørnar Grip Fjær
de414c4277
#1645 Load dynamic NNC results from restart file
2017-06-26 10:25:08 +02:00
Bjørnar Grip Fjær
7b7af2b197
#1641 Use new interface for reading trans values from libecl
2017-06-22 16:03:55 +02:00
Bjørnar Grip Fjær
faf225d8c3
Merge branch 'master' into hdf-prototype
2017-06-22 10:56:36 +02:00
Bjørnar Grip Fjær
581adbc588
Merge branch 'dev' into pre-proto
2017-06-21 16:41:33 +02:00
Bjørnar Grip Fjær
db65917822
#1635 Use capital 'E' in scientific notation
2017-06-21 16:41:07 +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
Bjørnar Grip Fjær
7c99a2573a
Merge branch 'dev' into pre-proto
2017-06-20 13:26:52 +02:00
Bjørnar Grip Fjær
d3f512f783
#1593 Use well path unit system for completions on well path
2017-06-20 10:51:01 +02:00
Jacob Støren
1d405384ee
Remove obsolete code: StimPlaneUpscaling and Transmissibilities
2017-06-14 11:25:43 +02:00
Jacob Støren
f87a186648
#1585 Privatize data members in FractureDefinition
2017-06-14 09:28:56 +02:00
Magne Sjaastad
a8b8e061d7
#1596 Merge dev into pre-proto
2017-06-14 07:25:34 +02:00
Magne Sjaastad
d7ce607000
Add missing include on Linux
2017-06-13 16:04:43 +02:00
Magne Sjaastad
449813df06
Fix signed/unsigned compare
2017-06-13 16:04:29 +02:00
Magne Sjaastad
cf859e7c16
#1596 Rename from RimDefines to RiaDefines
2017-06-13 15:41:52 +02:00
Jacob Støren
11276d8b84
#1585 Move code from StimPlanTemplate to StimPlanXmlReader
2017-06-13 15:07:16 +02:00
Jacob Støren
a2de4efb66
#1585 Remove RigFracture. No caching of transformed triangles related to each fracture instance
2017-06-12 12:52:39 +02:00
Jacob Støren
95dd87f23c
#1585 Moved obsolete RigFracturedEclipseCellExportData to obsoleted code
2017-06-12 09:30:01 +02:00
Jacob Støren
dceae0581e
#1585 Major renaming of fracture related methods and members
2017-06-09 17:21:59 +02:00
Magne Sjaastad
96981d1ab4
Fix mix of signed / unsigned compare
2017-06-09 15:55:47 +02:00
Magne Sjaastad
8064d44e8e
Remove unused class
2017-06-09 13:20:39 +02:00
Jacob Støren
4c873b6925
#1493 Remove old export fracture on selected wellpaths feature
2017-06-01 17:09:04 +02:00
astridkbjorke
e6fea6130b
#1507 Setting up fractureGrid for ellipse fracture template, and adapting transmissibility calculation to be able to handle both ellipse and stimplan fractures. Missing setup of fractureCells for ellipse when loading old project.
2017-06-01 14:06:41 +02:00
Bjørnar Grip Fjær
935299b3df
Merge branch 'fishbones' into pre-proto
2017-06-01 12:32:36 +02:00
Bjørnar Grip Fjær
1aedf92efc
Merge branch 'dev' into fishbones
2017-06-01 09:02:38 +02:00
astridkbjorke
a1738d8e3a
#1487 Renaming functions for calculating transmissibilities. Simplifying names and using fractureCell instead of stimPlanCell in names
2017-05-31 09:16:49 +02:00
astridkbjorke
7f00de3e0b
#1487 Renmaing local variables. Using fractureCell instead of stimPlanCell etc
2017-05-31 08:49:04 +02:00
Bjørnar Grip Fjær
1112f6a2e0
#1532 Rename RifEclipseOutputTableFormatter to RifEclipseDataTableFormatter
2017-05-30 15:00:14 +02:00
astridkbjorke
406bf96f3f
#1487 RigFractureGrid inherits from cvf::Object, and RimStimPlanFractureTemplate fractureGrid() is returning a pointer
2017-05-30 14:57:21 +02:00
Bjørnar Grip Fjær
5cafccdc80
#1523 Completions : Import perforation intervals from file
2017-05-30 11:56:18 +02:00
astridkbjorke
a8b6543c3c
#1487 Renaming RigStimPlanFracTemplateCell to RigFractureCell
2017-05-30 11:52:19 +02:00
astridkbjorke
8cf5f6983f
#1487 Renaming. Removing stimPlan from names in RigFractureGrid
2017-05-30 11:35:52 +02:00
astridkbjorke
0458ac38d7
#1487 Small fixes after merge
2017-05-30 10:00:04 +02:00
Jacob Støren
258ec8a728
#1526 , #1482 Use kSm3 and BOE as units for Gas in Well Alloc Plots
2017-05-29 22:53:44 +02:00
astridkbjorke
8ca5a5a90a
#1487 - pre-proto - Adding class RigFractureGrid, which now holds RigStimPlanFracTemplateCells and functions for accessing these.
2017-05-29 14:16:45 +02:00
Jacob Støren
38315f7bc2
#1506 Fix stimPlan getGlobalIndexFromIJ() errors
...
Misunderstandings of row/column count and CellCounts and point counts. Quite an obfuscation to use j as fast index, and CellCountI = ColumnCount - 2. The names are not quite enlightening.
2017-05-27 17:59:48 +02:00
Jacob Støren
6cdf13a2bc
#1506 Add debug output of total transmissibility info to COMPDAT file
2017-05-27 17:51:34 +02:00
Jacob Støren
e4abc737cd
#1514 , #1506 Fix several wellpath stimplan intersection bugs.
...
First numbers to file achieved, but they are wrong and too few
2017-05-26 17:37:48 +02:00
Jacob Støren
a51c21787d
#1506 Last step in complete transmissibility export WellPaths/Stimplan fractures
...
Untested
2017-05-23 12:02:37 +02:00
Magne Sjaastad
a45aee0cc2
Merge branch 'fishbones' into pre-proto
2017-05-23 10:28:42 +02:00
Jacob Støren
0b0747a8ec
#1506 Fixes linux compile errors and some warnings
2017-05-23 07:35:51 +02:00
Jacob Støren
6cbbed15bf
#1514 Add Wellpath StimPlanGrid intersector. Fix errors in polyline polygon intersection. Add tests for Polyline polygon intersection
2017-05-22 18:11:03 +02:00
Bjørnar Grip Fjær
ee81f49ab1
#1465 Export location of completions, with necessary restructuring
2017-05-22 13:24:06 +02:00
astridkbjorke
cf2cc5b2b5
#1487 - pre-proto - starting to use trans condenser in export function. Adding transmissibilities to condenser and getting output trans from eclipse cells to well. Not yet summarizing values from multiple fractures or printing COMPDAT values.
2017-05-22 12:46:57 +02:00
astridkbjorke
d12e7747bc
#1487 - pre-proto- Removing area factor in calculation for radial tranmissibility to well, and re-ordering functions in RifFractureExport
2017-05-19 15:16:40 +02:00
Jacob Støren
3271f9b32f
#1487 Remove obsolete RigStimPlanFractureCell class
2017-05-19 14:57:37 +02:00
Jacob Støren
ba2f9c335c
#1506 Add pseudocode for COMPDAT export of total transmissibility
2017-05-19 14:14:08 +02:00
Jacob Støren
7e847361d1
#1487 Move darchy constant into RigEclipseCaseData, where it belongs
2017-05-19 11:41:49 +02:00
astridkbjorke
d1b3d619d3
#1487 - pre-proto - Moving RigStimPlanUpscallingCalc to separate file
2017-05-19 11:31:57 +02:00
Bjørnar Grip Fjær
b23996a75f
#1464 Fishbones MSW : Export well segments
2017-05-19 11:28:36 +02:00
astridkbjorke
061ceb06b2
#1487 - pre-proto - move functions related to upscaling from StimPlan to Eclipse grid to a separate class, and making planCellIntersectionPolygons function static
2017-05-19 11:02:11 +02:00
Jacob Støren
5a6508dc93
#1487 Removed use of obsolete equation methods in RigFractureTransCalc
2017-05-19 10:26:07 +02:00
Jacob Støren
fab3e6e361
#1487 Simplify interface for printCOMPDATvalues
2017-05-19 09:15:39 +02:00
Jacob Støren
e1edcb8bcb
#1487 Replace wellpath and simwell with well name in argument list in FractureExport methods.
2017-05-19 08:46:25 +02:00
astridkbjorke
c7354e8548
#1487 - pre-proto - Making functions for calculating relevant transmissibilities static, and using cell sizes, conductivities etc as inputs instead of entire RigStimPlanCell
2017-05-18 15:14:45 +02:00
Jacob Støren
c914071d33
#1487 Rename export method
2017-05-18 14:50:28 +02:00
Jacob Støren
8365d3b0b3
#1487 Rename to RifFractureExportTools
2017-05-18 14:40:47 +02:00
Jacob Støren
d298963d94
#1487 Remove vector<FractureData> from RigFracture
2017-05-16 17:26:40 +02:00
Jacob Støren
cac9a9ed03
#1487 Move the EclToStPlCellTransCalc to a new file
2017-05-16 16:18:56 +02:00
Jacob Støren
ab121fe80a
Prefix calculator with Rig
2017-05-16 16:04:32 +02:00
astridkbjorke
4cb77642f3
#1487- pre-proto - Using EclipseToStimPlanCellTransmissibilityCalculator instead of RigFractureTransCalc for calculating Matrix-to-fracture transmissibilities for stimPlan cells.
2017-05-16 15:37:30 +02:00
astridkbjorke
de2d78828b
1487 - pre-proto - removing const from m_case in EclipseToStimPlanCellTransmissibilityCalculator nad updating function for calculating transmissibilities in fracture to have relevat values as input instead of RigStimPlanFracTemplateCell
2017-05-16 13:55:24 +02:00
Magne Sjaastad
69116784ff
Refactoring to be able to compile on Linux
2017-05-16 13:36:14 +02:00
Magne Sjaastad
43e50bd8d2
Updated copyright headers
2017-05-16 12:49:36 +02:00
astridkbjorke
9c4b0776d3
#1487 - pre-proto - Starting refactoring to prepare for Transmissibility condenser
2017-05-16 10:55:31 +02:00
Bjørnar Grip Fjær
0b872dbf3a
#1462 Add support for exporting WPIMULT
2017-05-16 09:43:41 +02:00
Bjørnar Grip Fjær
46d8f83424
#1462 Export completion data for laterals
2017-05-15 16:04:53 +02:00
Bjørnar Grip Fjær
acb050e9fb
#1489 Create Eclipse output file formatter
2017-05-15 16:04:53 +02:00
astridkbjorke
13df0d33b9
pre-proto - Small update in output formatting
2017-05-15 14:25:04 +02:00
astridkbjorke
deb64c862c
pre-proto - Renaming contributingEclipseCell to globalIndeciesToContributingEclipseCells
2017-05-15 14:25:04 +02:00
astridkbjorke
c6b329ea00
pre-proto - Rename RigStimPlanCell to RigStimPlanFracTemplateCell
2017-05-15 14:20:18 +02:00
astridkbjorke
45321d0821
pre-proto - Rename RigFractureStimPlanCellData to RigStimPlanFractureCell
2017-05-15 14:20:18 +02:00
Jacob Støren
df9e434c74
Use double "s" in Transmissibilities, create cpp file for transmissibility condenser
2017-05-15 14:13:59 +02:00
Magne Sjaastad
57a521f59d
#1475 Add missing includes for Linux
2017-05-15 14:06:40 +02:00
Magne Sjaastad
1a075470cf
#1475 Use caf::Utils::fileExists
2017-05-15 13:40:13 +02:00
Magne Sjaastad
25e6aec94a
Merge branch 'dev' into fishbones
2017-05-15 13:37:09 +02:00
Bjørnar Grip Fjær
bf704caa16
#1475 Move well path import to own module
2017-05-10 12:19:46 +02:00
Jacob Støren
141ce6b54b
#1381 Well Flow Plots show phase split (Oil Gas Water)
...
Flow rates are explained in the plots as Surface/reservoir flow rates. Unit for field is [stb]/day for all fluids
2017-05-08 16:02:42 +02:00
Bjørnar Grip Fjær
0c07493dc1
#1414 New eclipse tab and fixed capitalization in preferences
2017-04-27 13:16:44 +02:00
Bjørnar Grip Fjær
0848e9f8eb
#1433 Fix export property to file for flow diagnostics properties
2017-04-27 10:54:07 +02:00
Magne Sjaastad
be42bbcb98
Add missing include on Linux
2017-04-26 14:19:55 +02:00
Bjørnar Grip Fjær
cf18f5324f
#165 Keep original days since simulation start
2017-04-26 09:41:04 +02:00
astridkbjorke
a5e3e864fb
pre-proto - Cleanups in code. Renamings and adding functions global index in array of RigStimPlanCell for simplified interaction with these
2017-04-25 16:08:44 +02:00
Bjørnar Grip Fjær
63cd817b85
#964 Improve code robustness in defineEditorAttribute
2017-04-25 10:31:56 +02:00
Magne Sjaastad
448f59983e
#1396 Update file reader based on API changes in ERT
2017-04-24 21:54:55 +02:00
Magne Sjaastad
74133bacd0
Improved reporting of timestep mismatch
2017-04-24 13:03:52 +02:00
