OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-11 07:56:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,559 Commits 29 Branches 61 Tags 290 MiB
b824f1d75f
Commit Graph

828 Commits

Author SHA1 Message Date
Gaute Lindkvist
2987e6128d #3198 Support LGR when exporting fishbone completions for multi segment wells. 
* Also refactor RicMultiSegmentWellExportInfo to remove public member variables.
 2018-08-13 15:10:03 +02:00
Gaute Lindkvist
ffd545c75c #3183 Refactor MSW export code so fishbones structures are not needed at the time of formatting/writing 
* Instead fill up the RicMultiSegmentWellExportInfo structures beforehand
 2018-08-13 14:36:32 +02:00
Bjørn Erik Jensen
5081f12bb5 #3194. Adapt ResInsight to modified ecllib API 2018-08-13 14:00:26 +02:00
Magne Sjaastad
fe07b60392 CppCheck : Several fixes 
Add missing initializers
Guard potential null pointer access
 2018-08-02 19:22:03 +02:00
Bjørn Erik Jensen
ee8374b105 #3170 Observed data import. Add two misc vectors to list 2018-07-10 14:05:52 +02:00
Bjørn Erik Jensen
238f5f83de #3174 Pasted summary data. Use full address text as curve name 2018-07-10 13:57:22 +02:00
Bjørn Erik Jensen
51be11401a #3152 Observed data import. Prepare for list of known Misc category quantities 2018-07-09 12:46:20 +02:00
Bjørn Erik Jensen
19ce35432c #3152 Observed data import. Fix accumulated data determination 2018-07-09 10:43:53 +02:00
Bjørn Erik Jensen
3bc595dcb2 #3152 Observed data import. Allow only vector names with certain lenghts to be put in a standard category 2018-07-09 10:06:30 +02:00
Bjørn Erik Jensen
60146be146 #3167 CSV parser. Try a fallback datetime format if parsing fails 2018-07-06 15:01:25 +02:00
Bjørn Erik Jensen
2b58e5e7cb #3150 CSV import. Also accept underscores and dashes in vector names 2018-07-05 14:49:50 +02:00
Bjørn Erik Jensen
47eff2d9aa CSV import. Robustified address string to eclipse address object 2018-07-04 09:39:00 +02:00
Bjørn Erik Jensen
cbacd73068 Remove unused files 2018-07-03 08:20:49 +02:00
Bjørn Erik Jensen
9fd38064df #3133 CSV import. Assume that all data columns are numeric columns 2018-07-02 15:14:32 +02:00
Bjørn Erik Jensen
ec26d8638a #3134 Ensemble parameters import. Search 3 folder levels up. Improved warning message 2018-07-02 14:53:13 +02:00
Magne Sjaastad
07530534ef #3129 Table Formatter : Add support for creating tables prefixed with comment string 2018-06-29 11:21:31 +02:00
Magne Sjaastad
bb91a79515 #3100 Well Path Import : Improve test of valid values before adding well path point 2018-06-29 11:19:05 +02:00
Bjørn Erik Jensen
7347e0ecc3 #2781 Ensemble curve set. Support for Tempest workflow (lookup and parse runspecifiction.xml file) 2018-06-29 09:27:13 +02:00
Magne Sjaastad
a97f9b282a #3100 Well Path Import : Make sure last line is imported if no newline at end of last line 2018-06-28 12:58:39 +02:00
Bjørn Erik Jensen
ca171635f0 #3075 Resampled plot export. Vectors ending with 'TH' are now considered accumulated values 2018-06-26 11:47:53 +02:00
Bjørn Erik Jensen
013ba16515 Fix cotire build issues 2018-06-26 09:00:19 +02:00
Bjørn Erik Jensen
637461886b #3096 Fix build error on Linux 2018-06-25 15:58:28 +02:00
Bjørn Erik Jensen
52714a5219 #3096 Try to fix build errors on gcc6 2018-06-25 15:34:20 +02:00
Bjørn Erik Jensen
898df5b68a #3096 Implemented ensemble calulations 2018-06-25 15:15:30 +02:00
Gaute Lindkvist
62792b59c4 #3009 Warn user when loading an eclipse EGRID with mixed UPPER and lower case file name. 2018-06-13 14:10:47 +02:00
Bjørn Erik Jensen
2eee3f770b #2659 Ensemble statistics. Small fixes 2018-06-13 13:35:33 +02:00
Bjørn Erik Jensen
ca17037209 RifEclipseSummaryAddress. Address not valid if empty quantity name 2018-06-13 13:32:26 +02:00
Bjørn Erik Jensen
4491b1de63 #2659 Ensemble statistics. Use resampling during statistics calculations 2018-06-12 14:22:32 +02:00
Bjørn Erik Jensen
aa08735143 #3024 Observed summary data. Fix summary address parse failures 2018-06-08 10:22:01 +02:00
Bjørn Erik Jensen
cb6657266a #2659 Ensemble statistics. Move classes to separate files 2018-06-07 10:50:32 +02:00
Bjørn Erik Jensen
69accdc4c6 #2659 Ensemble statistics. First version 2018-06-07 10:04:16 +02:00
Bjørn Erik Jensen
11aeda63d9 #2962 Summary import performance. Preliminary optimization of summary groups and ensemble import 2018-06-06 09:49:58 +02:00
Bjørn Erik Jensen
10b3d0f6db #2776 Error bars. Moved eclipse address parsing to RifEclipseSummaryAddress class 2018-05-28 11:20:20 +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
403e1759f9 #2778 Observed error bars. Display error bars in the same color as data points 2018-05-25 11:28:55 +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
8f5c3436ce #1776 CSV data parser. Remove double spaces in column names 2018-05-23 12:33:26 +02:00
Gaute Lindkvist
090a79cf90 #2854 UNRST and EGRID file matching confused by . in basename 
* Need to send in QFileInfo::completeBaseName() rather than just baseName()
* The change will cause libECL to match only files where the base name is everything except what is after the LAST  dot.
 2018-05-14 09:32:19 +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
Bjørn Erik Jensen
9a51343321 #2813 Origin import dialog. Remove misplaced assert 2018-04-27 12:43:32 +02:00
Gaute Lindkvist
3a670d94a2 #2801 Fix Cotire build. 2018-04-25 14:13:12 +02:00
Gaute Lindkvist
a7c72b549b #2790 Progress bar when importing summary cases. 2018-04-25 09:26:12 +02:00
Gaute Lindkvist
c5e4bf93a6 Summary Case Import cleanup (#2795) 2018-04-25 09:25:35 +02:00
Gaute Lindkvist
e953d6800c #2795 Summary Case Import: When importing grids keep going even if summary file import fails. 2018-04-24 15:55:51 +02:00
Gaute Lindkvist
f456911c80 #2794 Summary Case Import: Improve error reporting. 
* When an error is found with one summary case file, continue importing all the files that worked.
* Report an error in the log window and a message box afterwards about the case that failed.
* Fix crash when loading .EGRID file without a summary case.
 2018-04-24 14:19:08 +02:00
Gaute Lindkvist
51fb8a6935 #2787 Import summary case does not work on linux 
* Make sure summary files are added to class member in getFilesToImportUsingPrefs.
* The code used to return a vector of summary files, now just a boolean and the files
   are meant to be added to the vector for later retrieval.
 2018-04-23 14:50:12 +02:00
Jacob Støren
f507a35c8f #2785 Fix crash detected by regression test. 2018-04-23 10:31:07 +02:00
Bjørn Erik Jensen
c3ae45e748 #2766 Bugfix. Import egrid files even though there are no associated summary files 2018-04-20 08:28:04 +02:00
Bjørn Erik Jensen
e5570441f6 #2751 Rename ensamble to ensemble 2018-04-19 14:00:18 +02:00
Bjørn Erik Jensen
7afa753d11 #2714 Display a warning in origin summary import dialog when ecllib may fail to read origin files 2018-04-17 11:01:45 +02:00
Bjørn Erik Jensen
0fcc0bea4c 2743 Origin summary import dialog adjustments 2018-04-16 14:11:31 +02:00
Bjørn Erik Jensen
e5e9692eb5 #2710, #2719 Restart preference and dialog adjustments. And some bugfixes 2018-04-13 15:47:43 +02:00
Bjørn Erik Jensen
d7e7c4a463 #2720, #2686, #2701 Origin summary and grid cases import enhancements 2018-04-13 15:47:42 +02:00
Bjørn Erik Jensen
3f429ccfd7 #2555 Add canonicalPath method to improve path handling 2018-04-10 13:11:59 +02:00
Bjørn Erik Jensen
951e0f7aa0 #2555 Detect restart file reference looping. Break out if loop is detected 2018-04-10 13:11:58 +02:00
Bjørn Erik Jensen
ee9e9b2989 #2685 Origin summary. Split preferences settings into two fields 2018-04-09 13:22:05 +02:00
Bjørn Erik Jensen
c69b558ff8 Restart files. Fix bug during import of grid summary cases 2018-04-09 10:53:51 +02:00
Bjørn Erik Jensen
e4ef9bd014 Fix cotire build errors 2018-04-09 10:08:50 +02:00
Bjørn Erik Jensen
e8d765a2a9 #2610 Add default constructor and setter 2018-04-06 15:52:16 +02:00
Bjørn Erik Jensen
e25f8f100f #2610 Fix build error 2018-04-06 11:58:06 +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
81354e0408 #2610 Add RifEnsambleParametersReader and RifFileParseTools 2018-04-06 11:58:04 +02:00
Magne Sjaastad
0512d3fbbc #2553 Well CF Visualization: Read well connection factor from ecllib 2018-04-05 14:25:47 +02:00
Bjørn Erik Jensen
1369b11e6e #2555 Guarding for nullptr and some minor fixes 2018-03-21 14:47:23 +01:00
Magne Sjaastad
41d92832a7 #2631 Whitespace 2018-03-21 07:48:47 +01:00
Magne Sjaastad
4060e7e5a5 #2631 Text Export to Eclipse : Generated text file has too many characters in line 2018-03-21 07:43:59 +01:00
Bjørn Erik Jensen
148d058d88 #2555 Open summary restart dialog if necessary when opening egrid files 2018-03-20 14:32:56 +01:00
Bjørn Erik Jensen
95a9744241 #2555 Add time period for current file as well 2018-03-20 14:32:56 +01:00
Bjørn Erik Jensen
d5bbeffdd0 #2555 Refactored summary restart file import 2018-03-20 14:32:55 +01:00
Bjørn Erik Jensen
2f11395525 #2555 Add preferences for summary restart file import 2018-03-20 14:32:55 +01:00
Bjørn Erik Jensen
208d738846 #2555. Add summary restart file import dialog 2018-03-20 14:32:54 +01:00
Magne Sjaastad
716bb3184b System : Replace tab with four spaces 2018-03-12 11:12:39 +01:00
Magne Sjaastad
8ce6784517 #2573 Eclipse Text File Import : Improve error message if required keyword is missing 2018-03-06 10:29:46 +01:00
Bjørn Erik Jensen
2ac9aba485 #2494 Add height/width fracture scaling 2018-03-01 14:18:12 +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
Jacob Støren
267e3ef59d #2535 Use the MainWindowTools class instead of MainWindow directly (part 4) 2018-02-27 16:46:53 +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
c6b12b85e0 Merge fracture unit refactoring into dev #2509 
Add display of M and F in front of fracture templates
Add convert of StimPlan templates
Add copy/paste of StimPlan templates
Remove obsolete unit conversion code
 2018-02-21 10:15:56 +01:00
Magne Sjaastad
4e737885e4 #2509 Fracture : Move unit conversion of top/bot perforation depth 2018-02-20 15:35:08 +01:00
Magne Sjaastad
35febab8db #2509 Fracture : Add support for unit conversion of stimplan grid coords 2018-02-20 15:15:06 +01:00
Magne Sjaastad
479247dc4d Merge fix for multi case statistics into dev 2018-02-20 14:02:51 +01:00
Magne Sjaastad
65f93814fe #2468 Multi grid statistics : Initialize filename before creating data access object 2018-02-20 13:35:31 +01:00
Magne Sjaastad
1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +01:00
Bjørn Erik Jensen
6f3a84c2b0 Merge branch '2018.01.01-patch' into dev. #2453 2018-02-08 11:45:15 +01:00
Bjørn Erik Jensen
2e0069456f #2453 Stim plan. Removed double string splitting loop 2018-02-08 11:37:07 +01:00
Bjørn Erik Jensen
7ddfaeb234 #2388 fractures. Support for asymmetric stim plan 2018-02-08 11:05:55 +01:00
Bjørn Erik Jensen
0b0e60135c Merge branch '2018.01.01-patch' into dev. #2434 2018-02-05 14:15:50 +01:00
Bjørn Erik Jensen
0dff40f658 #2434. Ignore NOECHO keyword in grdecl files 2018-02-05 14:13:28 +01:00
Bjørn Erik Jensen
c09dd0522b Merge branch '2018.01.01-patch' into dev. #2086 2018-02-05 08:29:24 +01:00
Bjørn Erik Jensen
98a94c0525 #2086 Moved RifStringTools -> RiaStringEncodingTools 2018-02-02 15:44:28 +01:00
Bjørn Erik Jensen
b0ca4f3199 #2086 Handle extended file name chars on Linux for eclipse cases and summary cases 2018-02-02 14:18:09 +01:00
Rebecca Cox
b2bdd996d2 #2389 Fracture: Set perforation length and depth from file values 2018-01-31 12:25:58 +01:00
Magne Sjaastad
71deeb8954 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 10:09:54 +01:00
Magne Sjaastad
41506afe06 #2241 : Workaround for report numbers : Convert to upper case befor calling libecl 2018-01-29 10:09:30 +01:00
Magne Sjaastad
27ee70f90e Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 08:48:27 +01:00
Magne Sjaastad
b59734160c Use range based for 2018-01-29 08:47:23 +01:00
Magne Sjaastad
9cc090256d #2241 : Do not skip report numbers with -1 2018-01-29 08:46:28 +01:00
Magne Sjaastad
c8546eb7e7 #2241 : Improve robustness when reading report numbers from libecl 2018-01-29 08:44:30 +01:00
Magne Sjaastad
33901a115e Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-28 21:31:36 +01:00
Magne Sjaastad
aa12ac743a #2418 : Import of text grid model fails when comments is on same line as keyword 2018-01-28 21:29:40 +01:00
Magne Sjaastad
430b193437 #2402 Fracture : Compute conductivity scaling for all conductivity variants 2018-01-25 14:17:10 +01:00
Rebecca Cox
e68f0e2be8 Merge branch '2018.01.01-patch' into dev 2018-01-24 08:33:47 +01:00
Rebecca Cox
9617481406 #2327 Formation RFT Plot: Read tvdss from well pick files 2018-01-24 08:21:22 +01:00
Rebecca Cox
dcff8c1536 #2372 Elm Props: Scale Modulus by a factor of 1e-9 2018-01-16 10:56:41 +01:00
Rebecca Cox
96bff27519 #2372 Elm props: Map modulus and ratio ui names 2018-01-15 17:40:39 +01:00
Rebecca Cox
4bf8de2787 #2369 Elm props: Clear cell results on deletion 2018-01-15 14:48:05 +01:00
Rebecca Cox
a8039b8569 #2369 Elm Props: Remove deleted field results from cache 2018-01-13 12:38:08 +01:00
Rebecca Cox
27901f426c #2369 Elm Props: Close selected files 2018-01-12 16:18:54 +01:00
Rebecca Cox
efaaab1dc6 #2360 Elm Props: Make sure either elementIdxToId or elementIdToIdx is larger than elementIdsFromFile 2018-01-12 14:08:11 +01:00
Rebecca Cox
b08e382dae #2360 Elm Props: Use correct index to id map 2018-01-12 12:43:39 +01:00
Rebecca Cox
2cd006882f #2360 Elm Props: Wire up reading of elm prop data into data structures 2018-01-10 10:43:33 +01:00
Rebecca Cox
0dc0533501 #2350 Elm props: Fix crash when table has only one data column 2018-01-10 10:33:33 +01:00
Bjørn Erik Jensen
766f4da48b #2350. Renaming, robustify 2018-01-09 11:59:43 +01:00
Bjørn Erik Jensen
55147e5b70 #2350. Implement ElementPropertyTable file reader for single file 2018-01-09 11:34:52 +01:00
Rebecca Cox
d5b12a8b23 Summary header parsing: Add summary region2region mnemonic 2017-12-15 13:48:20 +01:00
Bjørn Erik Jensen
6ffcb703fd #2249 Summary Plot Editor. Support for plotting individual aquifers 2017-12-12 15:10:11 +01:00
Jacob Støren
84dcc0980e #2237 Progress bar when calculating flooded PV 
Fix errors in progress detected when opening project
 2017-12-08 16:56:42 +01:00
Rebecca Cox
a2d2879bab #2227 Well formations: New Rig data stucture with top+base MD and level 2017-12-08 09:27:37 +01:00
Bjørn Erik Jensen
64ef2f02d4 RFT/PLT plot. Rename RFT source group to 'RFT File cases' 2017-12-07 11:15:25 +01:00
Rebecca Cox
48f9769eb7 #2221 Well Path Formation names: Improve user feedback on import 2017-12-07 08:34:12 +01:00
Rebecca Cox
9a4eab2569 #2232 Well formations: Read new file format 2017-12-07 08:28:20 +01:00
Rebecca Cox
8608e00b35 #2224 Well Formations: Make Reloading the csv file work 2017-12-06 12:01:33 +01:00
Rebecca Cox
6198ec4284 #2225 Well formations: Make header checking easier 2017-12-06 08:40:47 +01:00
Rebecca Cox
1675c17314 #2225 Well formations: Support extra headerlines within the csv file 2017-12-06 08:40:47 +01:00
Rebecca Cox
bef764bf5b #2225 Well formations: Handle tabs in well path formations reader 2017-12-06 08:19:42 +01:00
Rebecca Cox
5145d3f8a5 #2223 Well Formations: Rename to Well Picks where sensible 2017-12-05 14:14:53 +01:00
Rebecca Cox
bc026da2f6 #2221 Well Path Formation names: Add logging on import and well creation/matching 2017-12-05 08:58:51 +01:00
Jacob Støren
b092c6e047 Merge branch 'dev' of https://github.com/OPM/ResInsight.git 2017-12-04 16:38:45 +01:00
Jacob Støren
1ec6d77ff9 #2195 Final fix of missing connections in high level grids, if connections in lower levels exist. 2017-12-04 16:37:53 +01:00
Rebecca Cox
860458eb28 #2123 Formation/Well Path: Code clean up 2017-12-04 15:47:35 +01:00
Jacob Støren
fcd9d0f3e6 #2195 First step in making higher LGR level connections not beeing hidden 2017-12-04 11:42:10 +01:00
Bjørn Erik Jensen
da11a32862 #1942 HDF5 reader. Using RiaQDateTimeTools for parts of the reading. See issue comment for more info 2017-12-01 09:13:42 +01:00
Bjørn Erik Jensen
7f02791aba CSV import dialog. Display cell separator in preview 2017-11-29 13:51:54 +01:00
Rebecca Cox
6fae55f07c #2182 RFT: Add logging for debugging 2017-11-28 12:47:43 +01:00
Bjørn Erik Jensen
622161776e CSV import. Rename ColumnInfo to Column 2017-11-28 11:35:17 +01:00
Bjørn Erik Jensen
0dbcc43d9c CSV import dialog. Highlight selected time series column 2017-11-28 11:02:46 +01:00
Bjørn Erik Jensen
4b14a4fdda CSV import dialog. Use html table in preview text box 2017-11-28 11:02:46 +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
bb9f1aea47 CSV import. Include cmath even though it builds successfully on both Windows and Linux locally 2017-11-27 19:04:58 +01:00
Bjørn Erik Jensen
bdc680bc03 ASCII import dialog. Determine default decimal separator 2017-11-27 12:39:12 +01:00
Bjørn Erik Jensen
e53059e2c8 ASCII import dialog. Update preview when cell separator is modified 2017-11-27 11:35:00 +01:00
Bjørn Erik Jensen
f34b2bb612 CSV import. Add argument to method. Texts in drop down 2017-11-27 11:01:37 +01:00
Rebecca Cox
8c57fdf22a #2122 Formation/Well Path: Set formations path and key on RimWellPath 2017-11-27 10:33:41 +01:00
Bjørn Erik Jensen
7add91b1d6 CSV import. Insert HUGE_VAL in numeric column on parse error 2017-11-27 08:42:43 +01:00
Jacob Støren
007fc87283 Switched to none-deprecated enums 2017-11-24 15:46:31 +01:00
Magne Sjaastad
a04c42313f #2168 Summary Plot : Improve identifier stepping 2017-11-24 15:34:02 +01:00
Magne Sjaastad
b46c19d90f (#2168) Summary Plot : Add support for modifying identifier for curves 2017-11-24 15:32:51 +01:00
Unknown
7e28039ffd #2122 Formation/Well Path: Add new reader. Same pattern as WellPathFile 2017-11-24 15:18:25 +01:00
Bjørn Erik Jensen
800ac30d81 #2018 CSV import. Modify CSV parser interface. Optimization. 2017-11-24 13:54:01 +01:00