Commit Graph

301 Commits

Author SHA1 Message Date
Bjørn Erik Jensen
d5ec3b1db3 #3057 Resampled plot export. Add more resample periods. Add unit tests 2018-06-18 14:10:11 +02:00
Jacob Støren
c5b5980da3 #3049 Add SolveSpaceLib libslvs with an S-Curve test to ResInsight 2018-06-15 14:47:42 +02:00
Bjørn Erik Jensen
a5f69a59d0 Ensemble statistics. Fix unit tests and some warnings on Linux 2018-06-14 11:01:49 +02:00
Bjørn Erik Jensen
1137a916e0 #2659 Ensemble statistics. Add time history resampler class. Extended RiaQDateTimeTools class 2018-06-12 11:05:53 +02:00
Bjørn Erik Jensen
eebd8bef2d Move RigCurveDataTools and RigTimeHistoryCurveMerger to Application/Tools plus rename 2018-06-08 15:10:45 +02:00
Bjørn Erik Jensen
8d0149b4e9 #3024 Observed summary data. Add unit tests 2018-06-08 10:40:12 +02:00
Bjørn Erik Jensen
135d58b57e #2776 Error bars. Add eclipse string address parsing unit tests 2018-05-28 12:37:28 +02:00
Bjørn Erik Jensen
f7ac8fe6e4 Observed data parsing. Add address creation unit test 2018-05-25 15:35:06 +02:00
Bjørn Erik Jensen
22c71b60dd #1776 CVS data parser. Made parsing more generic. Handle error result columns 2018-05-23 12:33:26 +02:00
Bjørn Erik Jensen
92fd4183a9 #2797 Ensemble curves. Support for text ensemble parameters. Unit test 2018-05-03 09:55:13 +02:00
Magne Sjaastad
4fc6da2c76 #2744 Well Log Extractor : Add failing test for well path inside one cell 2018-04-17 09:35:04 +02:00
Bjørn Erik Jensen
8491fd7f6c #2610 Fix a few Linux build errors 2018-04-06 13:56:26 +02:00
Bjørn Erik Jensen
f7f09c0719 #2610 Import case realization parameters and store those in summary case 2018-04-06 11:58:05 +02:00
Bjørn Erik Jensen
70f99d8da4 #2610 Add ensamble parameters reader unit tests 2018-04-06 11:58:04 +02:00
Magne Sjaastad
716bb3184b System : Replace tab with four spaces 2018-03-12 11:12:39 +01:00
Magne Sjaastad
8e8c168405 #2546 Well Connection Factors : Several changes related to data access
Moved rig classes from command feature into ReservoirDataModel\Completions\
2018-03-12 11:07:46 +01:00
Magne Sjaastad
cec745d08a #2554 Regression Test : Add text file compare tool and display folder in test config 2018-03-07 09:30:15 +01:00
Magne Sjaastad
ec96edf266 #2576 Command File : Add support for comments 2018-03-06 13:19:06 +01:00
Magne Sjaastad
44db864846 System : Remove duplicate file reference 2018-03-06 08:53:26 +01:00
Magne Sjaastad
2d01824ab3 #2560 Unit conversion : Add conversion based on parsing unit text string 2018-03-02 17:03:01 +01:00
Magne Sjaastad
25a1823f35 Merge branch 'dev' into cmake-improvements 2018-02-28 08:47:01 +01:00
Magne Sjaastad
89c090ba24 #2536 Build System : Remove obsolete code for cmake older than "2.8.2" 2018-02-28 08:05:00 +01:00
Magne Sjaastad
f4bae6f796 #2529 Fracture : Remove RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES from CMake files 2018-02-26 21:11:14 +01:00
Magne Sjaastad
72b5f540e5 #2529 Fracture : Remove all #ifdef USE_PROTOTYPE_FEATURE_FRACTURES 2018-02-26 20:54:45 +01:00
Magne Sjaastad
1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +01:00
Jacob Støren
e76f8cfbcc #2337 Add an improved tick mark generator 2018-02-09 14:08:55 +01:00
Jacob Støren
bb53b926bf #2345 Add + and * operators to the tensor class, to make averaging possible. 2018-02-07 13:10:36 +01:00
Bjørn Erik Jensen
0b0e60135c Merge branch '2018.01.01-patch' into dev. #2434 2018-02-05 14:15:50 +01:00
Magne Sjaastad
082b82214d #2444 Batch : Fix support for multiple replaceCase in command file 2018-02-05 11:22:31 +01:00
Magne Sjaastad
24cd47abfc Merge fix for failing test into dev 2018-02-05 08:45:20 +01:00
Magne Sjaastad
5a7133f6e2 Fix disabled test 2018-02-03 09:15:04 +01:00
Magne Sjaastad
c8e002d532 #2374 Fracture : Incomplete results when computing intersected StimPlan cells 2018-02-01 12:58:48 +01:00
Magne Sjaastad
20652a0597 #2423 Export Completions : Move folder one level up 2018-01-31 10:20:47 +01:00
Magne Sjaastad
e989b3afc9 #2423 Export Completions : Move Rig*-files to completion export folder 2018-01-31 10:20:47 +01:00
Rebecca Cox
56188c8f3f #2380 AppFwk: Move fieldsByType to RimProject 2018-01-19 12:52:50 +01:00
Rebecca Cox
ed930da11d #2380 AppFwk: Take vector<T*>* as argument, not vector<PdmField<T*>>* 2018-01-19 08:02:09 +01:00
Rebecca Cox
548c065290 Fix cotire build 2018-01-16 16:24:29 +01:00
Rebecca Cox
4adec8d2bf #2380 AppFwk: Make template function to find all PdmFields of a type 2018-01-16 16:01:42 +01:00
Magne Sjaastad
2457f968cf #2374 Fracture : Incomplete results when computing intersected StimPlan cells 2018-01-16 08:04:49 +01:00
Magne Sjaastad
b70d39cc6c System : Postfix with u to indicate unsigned value (avoid warning on linux) 2018-01-11 14:04:25 +01:00
Bjørn Erik Jensen
effe1f291a RifElementPropertyTableReader-Test. Fix names 2018-01-09 15:44:54 +01:00
Bjørn Erik Jensen
3e11f9fbd6 RifElementPropertyTableReader unit tests 2018-01-09 15:39:17 +01:00
Bjørn Erik Jensen
f632b36993 Implement support for reading test files from unit tests 2018-01-09 15:13:44 +01:00
Magne Sjaastad
96a900fe0f #2310 Add isProjectFileVersionEqualOrOlderThan to RimProject and use from summary plot 2018-01-04 13:12:07 +01:00
Magne Sjaastad
dbc1061a59 #2310 Version compare : Improve interface and add unit test 2018-01-04 12:38:12 +01:00
Magne Sjaastad
e7c8667b24 #2310 Add helper files and unit test for project file version queries 2018-01-03 13:17:29 +01:00
Magne Sjaastad
7992682fcb AppFwk : Add date and version info to field/object keyword extraction 2017-12-18 07:10:05 +01:00
Magne Sjaastad
d15808efe6 AppFwk : Add support for output of object and field keywords 2017-12-15 17:01:33 +01:00
Bjørn Erik Jensen
f11df61ff2 Fix Linux build error 2017-12-12 15:17:04 +01:00
Bjørn Erik Jensen
6d4820a691 CSV import. Replaced old ASCII parser by the new RifCsvUserDataParser 2017-11-28 11:02:46 +01:00
Bjørn Erik Jensen
1acd39898e UserDataParser. Fix unit test 2017-11-23 09:48:36 +01:00
Bjørn Erik Jensen
f87234ad39 Fix unit test compiler errors 2017-11-23 09:28:32 +01:00
Magne Sjaastad
a07205c047 #2165 Fault Import : Update unit tests 2017-11-22 07:33:58 +01:00
Magne Sjaastad
4d6d48dc18 #2153 Curve Creator : Clear results before trying to assign values from curve merging 2017-11-21 09:19:39 +01:00
Magne Sjaastad
686a47587b #2125 Curve Calculations : Add TimeHistoryCurveMerger 2017-11-21 08:10:28 +01:00
Magne Sjaastad
8ee0ddb317 #2125 Curve Calculations : Add tools used to interpolate two curves 2017-11-17 14:29:19 +01:00
Magne Sjaastad
5cbaf3c1eb #2125 Refactor : Return by value instead of incoming parameter 2017-11-17 13:50:25 +01:00
Magne Sjaastad
59c51d7e5e Remove test accessing local file path 2017-11-10 16:14:39 +01:00
Magne Sjaastad
5db08c7b76 #2097 Reservoir Phase Detection : Find available phases from result files 2017-11-10 09:43:51 +01:00
Magne Sjaastad
e9a938ce78 #2003 Observed Data : Compare first time step when merging 2017-11-07 12:33:22 +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
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
265c0ebb70 #2003 Observed Data : Add file parsing of fixed column width 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
b58fd08c8f Unit Tests : Use size_t to avoid warning on Linux 2017-11-02 19:41:20 +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
Magne Sjaastad
ec6d39c497 Fix failing unit test 2017-10-25 14:50:26 +02:00
Magne Sjaastad
95a0c47d1c #2000 Curve Creator : Fix initialization of map, and use std::string 2017-10-25 10:16:59 +02:00
Magne Sjaastad
f943a80f95 #2032 Curve Calculator : Rename 2017-10-23 14:27:04 +02:00
Magne Sjaastad
f61c83a659 #2031 Curve Calculator : Sort variable names by the order they first appear 2017-10-23 13:31:57 +02:00
Magne Sjaastad
dd01863240 #2031 Curve Calculator : Allow assignment without spaces around := 2017-10-23 13:11:38 +02:00
Rebecca Cox
9aaf56b4ef Observed data parser: Avoid infinite loop on parsing of invalid file 2017-10-12 12:43:55 +02:00
Magne Sjaastad
445048c24b #1985 Curve Calculator : Simplify interface to expression parser 2017-10-12 10:52:30 +02:00
Magne Sjaastad
5cd7ffc75e #1985 Expression Parser: Add unit test 2017-10-12 10:52:30 +02:00
Rebecca Cox
fdbbf75a88 Remove test on asctime 2017-10-06 13:35:56 +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
24d59d7f84 #1947 RFT/PLT Plot: Open RFT file on usage 2017-10-04 16:13:17 +02:00
Unknown
f56557f0c3 #1947 RFT/PLT Plot: Add unit test 2017-10-04 15:12:05 +02:00
Unknown
b2e6192dc1 #1947 RFT/PLT Plot: Add .RFT file reader 2017-10-04 14:59:51 +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
54063aece2 #1957 Observed Data : Add handling of custom well name 2017-10-03 22:07:07 +02:00
Magne Sjaastad
f3f78995fa #1959 Observed Data : Support custom ordering of header rows 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
Magne Sjaastad
2d50a68286 Observed Data : Rename to RifEclipseUserDataParserTools 2017-10-02 14:06:43 +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
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
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
563a426ed5 #1839 Observed data: Add SummaryAddress to ColumnInfo 2017-09-26 09:38:29 +02:00
Rebecca Cox
e7896e59cf #1839 Observed data: Unit test for keyword VECTOR parser 2017-09-25 14:38:32 +02:00
Rebecca Cox
5d52ba2a83 #1839 Observed data: Unit test for RSMSPEC tools 2017-09-25 09:07:43 +02:00
Rebecca Cox
cb2bb6d835 #1839 Observed data: Add unit test for column based RSMSPEC parser 2017-09-24 18:04:19 +02:00
Rebecca Cox
e26d978da4 #1816 Observed data: Add unit test for ascii parser 2017-09-21 09:00:51 +02:00
Jacob Støren
75f350db10 #1693 Move a lot of code from RimReservoirCellResultsStorage to RigCaseCellResultsData 2017-09-08 14:43:52 +02:00
astridkbjorke
55ca85625f #1787 Removing test not in use 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
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
87c19f927d #1794 System : Put fracture tests inside correct #ifdef 2017-08-22 14:46:21 +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
6fee321771 Disable tests accessing local paths 2017-08-17 14:40:52 +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
0ba1746755 Merge branch 'dev' into pre-proto 2017-08-11 16:14:00 +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
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
e19a63dcff #1126 Adding test with same TOF-value for two cells 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
eee4a65497 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-08 14:24:42 +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
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
7179aaeac9 Merge branch 'dev' into pre-proto 2017-08-01 12:44:11 +02:00
Magne Sjaastad
7e42efaa8f Cast to size_t to silence warnings on Linux 2017-07-31 08:08:53 +02:00
Bjørnar Grip Fjær
f23f7b0f7d #1665 Fix Linux build errors 2017-07-28 12:03:16 +02:00
Jacob Støren
1de6986ba2 #1666 CommandFile: Add line numbers to parse messages 2017-06-29 17:44:05 +02:00
Jacob Støren
c25895bdad #1666 CommandFile: Add error messages to reading.
Remove some  reader bugs
2017-06-29 16:12:51 +02:00
Jacob Støren
64bee4bb57 #1666 Fix errors in CommandFile parsing for space between argname and "=" 2017-06-29 13:19:06 +02:00
Jacob Støren
ba84b9ec5a #1666 Add CommandFileInterface system 2017-06-29 13:19:06 +02:00
Jacob Støren
7d7172f811 #1646 Fix disappearing mesh lines by using double transformation calculations 2017-06-23 10:16:39 +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
2090db62b2 #1602 Consolidate some intersection functionality to common tools class 2017-06-16 09:44:28 +02:00
Magne Sjaastad
a8b8e061d7 #1596 Merge dev into pre-proto 2017-06-14 07:25:34 +02:00
Magne Sjaastad
cf859e7c16 #1596 Rename from RimDefines to RiaDefines 2017-06-13 15:41:52 +02:00
Magne Sjaastad
dd912b4f97 Merge branch 'dev' into pre-proto 2017-06-08 14:09:03 +02:00
Bjørnar Grip Fjær
b82bda5905 #1577 Improve RigWellPathIntersectionTools 2017-06-07 16:04:34 +02:00
astridkbjorke
1f87681d7e #1542 Always using radial transmissibility calculation if the fracture is transverse to well or azimuth. If alog well: Perforation length for fracture limits the intersection fracture/well. 2017-06-02 15:04:32 +02:00
Bjørnar Grip Fjær
935299b3df Merge branch 'fishbones' into pre-proto 2017-06-01 12:32:36 +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
Bjørnar Grip Fjær
05edb97635 #1519 Create tools for calculating cells intersected by well paths 2017-05-26 11:10:54 +02:00
Magne Sjaastad
a45aee0cc2 Merge branch 'fishbones' into pre-proto 2017-05-23 10:28:42 +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
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
25e6aec94a Merge branch 'dev' into fishbones 2017-05-15 13:37:09 +02:00
Jacob Støren
2a50df5edb #1481 Add tests for transmisibility condensation.
The algorithm is now verified
2017-05-15 13:27:02 +02:00
Jacob Støren
df269931c9 #1481 Add subset of Eigen, and method to condense transmisibilities
Not yet fully tested.
2017-05-12 14:41:38 +02:00