Commit Graph

1397 Commits

Author SHA1 Message Date
Magne Sjaastad
bbcc59ee1d #2561 Fracture Templates: Create duplicate of template and convert 2018-03-06 07:54:37 +01:00
Magne Sjaastad
204c0c77b1 #2560 Fracture : Reload XML data after unit system change 2018-03-05 09:56:06 +01:00
Magne Sjaastad
ef2179f1ba #2545 Move fields from public to private 2018-03-02 14:27:52 +01:00
Magne Sjaastad
7bd0bdc612 #2483 Refactoring : Simplify generation of well branch geometry (1) 2018-03-02 14:07:23 +01:00
Bjørn Erik Jensen
3fc99a73bc #2462 Add fracture template id 2018-03-02 09:33:38 +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
Jacob Støren
562dfbe9b8 #2535 Use the MainWindowTools class instead of MainWindow directly (part 3) 2018-02-27 16:46:53 +01:00
Jacob Støren
72013f4ff8 #2535 Use the MainWindowTools class instead of MainWindow directly (part 2) 2018-02-27 16:46:53 +01:00
Jacob Støren
d74807d669 #2535 Use the MainWindowTools class instead of MainWindow directly (part 1) 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
72b5f540e5 #2529 Fracture : Remove all #ifdef USE_PROTOTYPE_FEATURE_FRACTURES 2018-02-26 20:54:45 +01:00
Magne Sjaastad
0cee37ce86 Add missing ifdef macro for use of fracture template 2018-02-26 14:42:00 +01:00
Magne Sjaastad
c22f38e30c #2509 Fracture : Move fracture commands to separate folder 2018-02-21 19:38:20 +01:00
Magne Sjaastad
8ad30d9350 #2509 Fracture : Disconnect fracture template when unit changes 2018-02-21 19:07:03 +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
0acab5cd65 #2509 Fracture : Add copy / paste of StimPlan 2018-02-21 09:50:50 +01:00
Magne Sjaastad
0d7e4f460c #2509 Fracture : Find matching template when adding new fracture 2018-02-21 09:10:40 +01:00
Magne Sjaastad
28ab07b199 #2509 Fracture : Remove obsolete unit conversion 2018-02-21 09:10: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
Rebecca Cox
2c26ca4243 #2460 Tensor Vectors: Hide tensors on intersection creation 2018-02-20 13:47:47 +01:00
Magne Sjaastad
9b1b94a4ae #2517 Export COMPDATL : Include diameter for LGR grids 2018-02-20 11:26:39 +01:00
Magne Sjaastad
fb95d896ef #2509 Fracture : Add copy / paste of ellipse fracture template 2018-02-20 07:20:25 +01:00
Magne Sjaastad
1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +01:00
Magne Sjaastad
cf11eff319 #2456 Non-Darcy Flow : Allow transmissibilities close to zero when computing d-factor 2018-02-16 11:22:13 +01:00
Magne Sjaastad
504e80534b #2456 Non-Darcy Flow : Export : Use scientific formatting for kh and d-factor 2018-02-16 11:02:50 +01:00
Magne Sjaastad
52621bae6c #2456 Non-Darcy Flow : Include diameter for fracture completions 2018-02-16 10:51:04 +01:00
Magne Sjaastad
dab73009e7 #2456 Non-Darcy Flow : Return the one and only (unmodified) completion 2018-02-16 10:49:53 +01:00
Magne Sjaastad
db20cf4b5b #2492 : Non-Darcy Flow : Ignore WPIMULT export setting if non-Darcy Flow is active 2018-02-16 09:37:55 +01:00
Magne Sjaastad
ac96824640 #2455 Non-Darcy Flow : Add fields to fracture template 2018-02-16 09:37:55 +01:00
Magne Sjaastad
6b246f4671 Remove unused function 2018-02-16 09:37:55 +01:00
Magne Sjaastad
cdfe6e3000 #2475 Fractures: Use filename as default name when importing a StimPlan fracture 2018-02-15 15:00:09 +01:00
Bjørn Erik Jensen
022d2ffd2d #2473 copy intersections. Resolve references and update connected editors 2018-02-15 13:05:42 +01:00
Rebecca Cox
cf3a1ad43f #2392 3D View Context command: "Color Result" 2018-02-12 08:42:12 +01:00
Magne Sjaastad
123a2830aa Merge patch into dev : Snapshot : Always use _ in generated file names #2446 2018-02-09 11:34:05 +01:00
Magne Sjaastad
6e16a47b0d #2446 : Replace - with _ for all generated file names 2018-02-09 11:19:04 +01:00
Magne Sjaastad
778119bf62 #2442 Fracture Template : Move more fields from public to protected 2018-02-08 14:02:02 +01:00
Magne Sjaastad
a1c891cd99 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-02-08 13:18:36 +01:00
Magne Sjaastad
80eefb3141 #2442 Fracture Template : Move several fields from public to protected 2018-02-08 13:17:31 +01:00
Magne Sjaastad
f053dfa8e3 #2446 : Snapshot : Improve generated file, always use _ in generated filename 2018-02-08 13:17:18 +01:00
Magne Sjaastad
1370cfe3e5 Merge fix for fishbone export into dev #2451 2018-02-08 10:31:51 +01:00
Magne Sjaastad
39949923a6 #2451 Export Completion : Remove obsolete test 2018-02-08 10:25:43 +01:00
Magne Sjaastad
0843c3e464 #2451 Export Completion : Exclude main bore cells correctly 2018-02-08 10:18:01 +01:00
Magne Sjaastad
53a1de91d7 #1968 Export Completions : Improve ordering 2018-02-07 14:07:49 +01:00
Magne Sjaastad
68c21e117b #1968 Readability : Whitespace changes 2018-02-07 14:07:00 +01:00
Magne Sjaastad
76e6ec3aef Remove unused function 2018-02-07 14:07:00 +01:00
Magne Sjaastad
dd34b0111a #1968 Readability : Major whitespace changes 2018-02-07 14:07:00 +01:00
Magne Sjaastad
c695d40266 #2447 Fracture : Set default conductivity result when creating the first fracture 2018-02-06 13:15:36 +01:00
Magne Sjaastad
a283a468c2 #2447 Fracture : Show fracture legend when only ellipse fractures are present 2018-02-06 12:42:13 +01:00
Magne Sjaastad
91e062fd93 #2431 : Add Rim3dView to event interface object 2018-02-05 20:12:22 +01:00
Bjørn Erik Jensen
8c4cad894f #2391 intersections. New copy to all views command feature 2018-02-05 13:24:17 +01:00
Magne Sjaastad
bf0b4f68e1 Merge message box fixes into dev, #2443 2018-02-02 14:47:05 +01:00
Magne Sjaastad
ba09906163 #2443 Replace QMessageBox with RiaLogging to avoid blocking of batch commands 2018-02-02 09:37:34 +01:00
Magne Sjaastad
dc0c6d1b47 #2443 : Remove obsolete includes of QMessageBox 2018-02-02 09:37:00 +01:00
Magne Sjaastad
f21f6e969f #1905 : Make sure picking on perforation intervals reports well path MD 2018-02-02 08:20:57 +01:00
Magne Sjaastad
c5333d09b2 Merge perforation updates into dev #2422 2018-02-01 13:05:00 +01:00
Bjørn Erik Jensen
7131006188 #2422 perforations. Update tree view after perforations import 2018-02-01 09:10:31 +01:00
Magne Sjaastad
d111fde68b #2425 Export Completions : Include cleanup 2018-01-31 10:20:47 +01:00
Magne Sjaastad
8fbd417c4f #2425 Export Completions : Move function 2018-01-31 10:20:47 +01:00
Magne Sjaastad
f8b020e364 #2425 Export Completions : Whitespace 2018-01-31 10:20:47 +01:00
Magne Sjaastad
c04ef6bbbf #2425 Export Completions : Move app logic into separate file 2018-01-31 10:20:47 +01:00
Magne Sjaastad
965deeb67a #2425 Export Completions : Separated feature UI from app logic 2018-01-31 10:20:47 +01:00
Magne Sjaastad
52875a57dc #2423 Export Completions : Cleaned up private functions, moved to cpp and improved whitespace 2018-01-31 10:20:47 +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
Magne Sjaastad
f0f7c954cc #2423 Export Completions : Move files to separate folder 2018-01-31 10:20:47 +01:00
Magne Sjaastad
e18a08a425 #1758 Use RigMainGrid in interface to CompletionDataGridCell 2018-01-31 10:20:47 +01:00
Magne Sjaastad
54a7320b59 #1758 Export main grid data to one file and LGR data to one file 2018-01-31 10:20:47 +01:00
Magne Sjaastad
38f18dbecb #1758 Add support for export of WPIMULTL 2018-01-31 10:20:47 +01:00
Magne Sjaastad
c7b5e091c6 #1758 Rename to gridName 2018-01-31 10:20:47 +01:00
Magne Sjaastad
5cc6877afa #1758 Use map to sort RigCompletionDataGridCell based on grid 2018-01-31 10:20:47 +01:00
Magne Sjaastad
4516941d2c #1758 Add RigCompletionDataGridCell 2018-01-31 10:20:47 +01:00
Magne Sjaastad
028b5303a7 #1758 Add support for export of COMPDATL for LGR grid 2018-01-31 10:20:47 +01:00
Magne Sjaastad
c0359f1776 #1758 Refactor IJKCellIndex 2018-01-31 10:20:47 +01:00
Magne Sjaastad
85d9d21bb6 #1758 Rename to globalCellIndex 2018-01-31 10:20:47 +01:00
Bjørn Erik Jensen
7779ff5ed0 Merge branch '2018.01.01-patch' into dev. #2229 2018-01-31 08:33:51 +01:00
Bjørn Erik Jensen
fa66cf14cd #2229 curve creator. Update when adding/deleting calculated curves as well 2018-01-31 08:32:14 +01:00
Jacob Støren
c9d6d60931 #2331 GeoMech fixes for intersection view. Paste view and animation of synthetic cases. 2018-01-29 16:16:11 +01:00
Jacob Støren
287992df91 #2331 Update Intersection View List when copying and deleting views 2018-01-29 16:16:11 +01:00
Jacob Støren
f931b92341 #2412 Disable irrelevant toolbar commands 2018-01-29 16:16:11 +01:00
Rebecca Cox
885c03b9a4 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 11:24:56 +01:00
Rebecca Cox
d67e1a7d13 #2261 Well Paths: Change newestAddedWellPath to mostRecentlyUpdatedWellPath 2018-01-29 11:24:12 +01:00
Bjørn Erik Jensen
fbe9d2d73d Merge branch '2018.01.01-patch' into dev 2018-01-26 15:56:37 +01:00
Bjørn Erik Jensen
ca3bb02c57 #2356 grid statistics dialog. Display of Mobile Volume Weighted Mean controlled by info box property 2018-01-26 15:53:13 +01:00
Jacob Støren
d8d2076dea #2333 New Intersection View: Update vertical warningtext. Avoid selecting view in tree. 2018-01-26 11:19:16 +01:00
Jacob Støren
02f6b95959 #2333 Add flattened intersectino geometry. Some view modifications to move towards a final 2D view experience 2018-01-26 11:19:15 +01:00
Rebecca Cox
47d8508196 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-26 10:29:01 +01:00
Magne Sjaastad
0559084d93 #2325 Summary plot: Apply axis settings on preview plot 2018-01-25 21:16:35 +01:00
Magne Sjaastad
6ce0037733 #2141 : Fracture : Make sure a new StimPlan fracture get valid defaults 2018-01-25 14:17:10 +01:00
Bjørn Erik Jensen
95db322f57 #2384 multi case import. Fix path filtering. Display relative file names 2018-01-25 13:57:09 +01:00
Bjørn Erik Jensen
3d2e5b6088 #2383 Eclipse cases import. New command feature using file hierarchy dialog 2018-01-24 14:39:06 +01:00
Bjørn Erik Jensen
3f96ad7ad9 File hierarchy dialog. Trim extensions 2018-01-24 14:37:52 +01:00
Bjørn Erik Jensen
5e46a378aa #2384 multi case import. New command feature for importing cases into group recursively 2018-01-24 13:18:47 +01:00
Bjørn Erik Jensen
a039bcd0a9 File hierarchy dialog. Stop if no root dir 2018-01-24 13:18:47 +01:00
Bjørn Erik Jensen
d646af8514 #2384 multi case import. Context menu for on/off/toggle files 2018-01-24 12:36:06 +01:00
Rebecca Cox
8b4a1f05bc #2390 Intersections: Add Copy/Paste 2018-01-24 11:44:20 +01:00
Rebecca Cox
97aab5bda5 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-24 10:56:10 +01:00
Rebecca Cox
650fc2147d #2404 Intersection: Update 3d view when creating new Intersection Box 2018-01-24 10:48:23 +01:00
Bjørn Erik Jensen
7c47783e3a #2384 multi case import. Add check box for each file 2018-01-24 10:43:56 +01:00