Commit Graph

664 Commits

Author SHA1 Message Date
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