OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,711 Commits 27 Branches 61 Tags 309 MiB
1aad577a49
Commit Graph

6397 Commits

Author SHA1 Message Date
Bjørn Erik Jensen
1792163d55 #2474 Fractures. Do not store object name to project file 2018-03-06 14:18:54 +01:00
Magne Sjaastad
2435e92be1 #2577 Test : Add test toolbar to launch unit tests and regression tests 2018-03-06 13:19:06 +01:00
Magne Sjaastad
ec96edf266 #2576 Command File : Add support for comments 2018-03-06 13:19:06 +01:00
Magne Sjaastad
ce2b4febbb #2554 Regression Test : Detect command files and execute content 2018-03-06 13:19:06 +01:00
Magne Sjaastad
b2204fb22a #2554 System : Create absolute path of project file before update of file references 2018-03-06 13:19:06 +01:00
Bjørn Erik Jensen
b2c0ea73f1 Fix Linux build problem 2018-03-06 13:11:18 +01:00
Rebecca Cox
f4b6542f60 #2575 Use Integration Point to calculate elm avg tensor 2018-03-06 12:54:10 +01:00
Magne Sjaastad
7f06f51e59 Fix signed/unsigned compare 2018-03-06 10:29:46 +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
Rebecca Cox
c77c08222d Mohr circle: Use same function to calculate FOS (=1/dsm) in results collection and mohrs plot 2018-03-06 10:29:08 +01:00
Bjørn Erik Jensen
d92918d11e Fix Linux build error 2018-03-06 10:20:23 +01:00
Bjørn Erik Jensen
c685453fbb #2563 Compaction. Fixed compaction calculation due to wrong sign 2018-03-06 10:02:04 +01:00
Rebecca Cox
381ae6bd81 #2527 Mohr circle: Make coloring of envelope more robust 2018-03-06 09:55:51 +01:00
Rebecca Cox
3f7eae6bcc #2537 Mohr circle: avoid clearing plot on selection = nullptr 2018-03-06 09:55:51 +01:00
Rebecca Cox
fcf8bf6e68 #2540 Mohr circle: Improve scaling of window 2018-03-06 09:55:51 +01:00
Bjørn Erik Jensen
5e54c58c6d #2564 Compaction. Set default reference layer to topmost layer having valid POR 2018-03-06 09:33:21 +01:00
Magne Sjaastad
44db864846 System : Remove duplicate file reference 2018-03-06 08:53:26 +01:00
Magne Sjaastad
cbb25cb514 #2561 Fracture Template : Set Default Conductivity Result in loadDataAndUpdate() 2018-03-06 08:16:39 +01:00
Magne Sjaastad
0bf72d5f68 #2561 Fracture Templates: Rename command feature files 2018-03-06 07:58:48 +01:00
Magne Sjaastad
bbcc59ee1d #2561 Fracture Templates: Create duplicate of template and convert 2018-03-06 07:54:37 +01:00
Magne Sjaastad
3a1147dcdf #2554 Non-Darcy : Add tool for text compare 2018-03-05 15:01:01 +01:00
Bjørn Erik Jensen
801b1aefb8 #2565 Campaction. Remove enable compaction checkbox 2018-03-05 14:36:42 +01:00
Bjørn Erik Jensen
e5eb8f55b3 #2566 Set tooltip on compaction ref layer field 2018-03-05 14:24:26 +01:00
Bjørn Erik Jensen
658e9e9f44 #2505 Add setFractureContainment batch command 2018-03-05 14:17:18 +01:00
Bjørn Erik Jensen
3a6de3cc56 #2505 Add conductivity scale factor batch command argument 2018-03-05 11:55:34 +01:00
Bjørn Erik Jensen
b371a94e91 #2495 Add batch command argument for D-factor scaling 2018-03-05 10:52:25 +01:00
Bjørn Erik Jensen
2f023f4016 Argument parser. Add ignoreArgs argument for testing purposes 2018-03-05 10:52:24 +01:00
Magne Sjaastad
204c0c77b1 #2560 Fracture : Reload XML data after unit system change 2018-03-05 09:56:06 +01:00
Magne Sjaastad
454e0b31be #2559 Fracture Template : Fix unit conversion for width and conductivity 2018-03-05 09:43:06 +01:00
Magne Sjaastad
e386b031c1 #2567 Fracture : Fix display of result values for all result types 2018-03-04 10:36:39 +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
fbe3e4fbda #2483 Intersections : Keep branch index in intersection when switching branch detection mode 2018-03-02 15:16:47 +01:00
Bjørn Erik Jensen
48419480fa #2505 CommandFile. Add scaleFractureTemplate command. Currently accepting arguments width and height 2018-03-02 14:39:15 +01:00
Magne Sjaastad
ef2179f1ba #2545 Move fields from public to private 2018-03-02 14:27:52 +01:00
Magne Sjaastad
bb0f026644 Whitespace 2018-03-02 14:09:46 +01:00
Magne Sjaastad
08995cf63e #2483 Refactoring : Simplify generation of well branch geometry (2) 2018-03-02 14:07:31 +01:00
Magne Sjaastad
7bd0bdc612 #2483 Refactoring : Simplify generation of well branch geometry (1) 2018-03-02 14:07:23 +01:00
Magne Sjaastad
e39105503b #2483 Use update pattern of intersections when updating simwell fractures 2018-03-02 12:43:12 +01:00
Magne Sjaastad
db276fff03 #2483 Intersections : Use branch detection switch in "Simulation Wells" 2018-03-02 12:42:46 +01:00
Bjørn Erik Jensen
3fc99a73bc #2462 Add fracture template id 2018-03-02 09:33:38 +01:00
Unknown
bbabb60ece #2538 Mohr Circle: Support time stepping 2018-03-02 09:31:17 +01:00
Unknown
6bb06ce53c Tensor results: Add function to create arrow indices 2018-03-02 08:16:36 +01:00
Unknown
82a394d588 #2543 Tensor vectors: Use tensor value, not length, for color mapping 2018-03-01 16:01:19 +01:00
Bjørn Erik Jensen
2ac9aba485 #2494 Add height/width fracture scaling 2018-03-01 14:18:12 +01:00
Unknown
4f20c7862e #2541 Mohr Circle: Use correct arguments when calling calculateFOS 2018-03-01 12:52:47 +01:00
Jacob Støren
74e4775395 #2487 Avoid switching views when picking a simulation well in an intersection view 2018-03-01 07:52:32 +01:00
Jacob Støren
5087085635 #2482 Add wellhead pipe piece to simulation wells. 2018-02-28 17:19:05 +01:00
Unknown
6a33735479 #2537 Mohr circle: Support multi selection of cells 2018-02-28 15:41:57 +01:00
Magne Sjaastad
26884d97b6 #2536 Merge branch 'cmake-improvements' into dev 2018-02-28 11:05:12 +01:00
Magne Sjaastad
7b5963d75c #2536 Build System : Add list of internal ResInsight libraries 2018-02-28 10:54:53 +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
ca0087eb55 #2536 Build System VizFwk : Use target_* and remove includes 2018-02-28 07:42:19 +01:00
Magne Sjaastad
233df05f68 #2536 Build System : Remove obsolete includes and update depending includes 2018-02-27 20:00:56 +01:00
Magne Sjaastad
3b63c8d433 #2536 Build System : Add target_include_directories to app libraries 2018-02-27 19:05:04 +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
Jacob Støren
43dc25eca0 #2535 Add MainWindow tools class that can reduce number of mainWindow includes and hopefully reduce compile time 2018-02-27 16:46:53 +01:00
Jacob Støren
6a3b43ec7c #2487 Avoid switching view when clicking objs in the intersectino view. Some minor refactoring of the MainWindows 2018-02-27 16:46:53 +01:00
Rebecca Cox
599909a9e8 #2533 Mohr circle: Round of FOS to 2 decimals 2018-02-27 15:06:59 +01:00
Rebecca Cox
2734f52e53 #2533 Mohr Circle: Calculate Element FOS 2018-02-27 14:39:07 +01:00
Rebecca Cox
2d931a81f5 #2523 Mohr circle: Remove colors from circles 2018-02-27 14:09:31 +01:00
Rebecca Cox
4f8c585be7 #2534 Mohr circle: Always use SE as result 2018-02-27 12:59:14 +01:00
Rebecca Cox
f4d4a8aa46 #2531 Mohr Circle: Add Info text 2018-02-27 12:40:36 +01:00
Magne Sjaastad
10bc5c92ab #2532 Fracture : Create copy of fracture template if non-matching units is detected 2018-02-27 12:05:41 +01:00
Rebecca Cox
cfa3443cdd #2530 Mohr circle: Fix crash when selected cell has no value 2018-02-27 10:32:59 +01:00
Rebecca Cox
cbbc9c0f26 #2496 Tensor vectors: Two new paletts 2018-02-27 09:39:47 +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
Rebecca Cox
2b368fb0b8 #2523 Mohr Circle: Improve circle appearence 2018-02-26 15:56:23 +01:00
Magne Sjaastad
0cee37ce86 Add missing ifdef macro for use of fracture template 2018-02-26 14:42:00 +01:00
Rebecca Cox
bed95a105e #2527 Mohr Circle: Use cohersion and friction angle from case 2018-02-26 13:39:26 +01:00
Rebecca Cox
f7ba9133fe #2527 Mohr circle: Make friction-cohesion line for negative principals 2018-02-26 12:51:25 +01:00
Rebecca Cox
23ab74c34d Mohr Circle: Make result "E" work 2018-02-26 11:15:18 +01:00
Rebecca Cox
f3859a6bee #2528 Tensor Vectors: Make tensor vectors for result "E" 2018-02-26 11:03:57 +01:00
Rebecca Cox
75bcf7dcf4 #2527 Mohr Circle: Add friction-cohesion line 2018-02-26 11:03:57 +01:00
Rebecca Cox
fe301bfc11 #2522 Mohr circle: Avoid calculating circle if result without tensor is selected 2018-02-26 11:03:57 +01:00
Magne Sjaastad
1706a6c0c4 System : Reorder initialization order to match declaration order 2018-02-24 09:17:02 +01:00
Magne Sjaastad
905ebb49de System : Add missing default statements in switch block 2018-02-24 09:16:15 +01:00
Magne Sjaastad
7ce6177bc5 System : Add missing braces 2018-02-23 22:39:29 +01:00
Magne Sjaastad
ae064463a9 System : Add missing default statements 2018-02-23 22:39:14 +01:00
Magne Sjaastad
245ea2dac2 System : Use unsigned type as index 2018-02-23 22:38:46 +01:00
Magne Sjaastad
0006c786cf System : Reorder initialization order to match declaration 2018-02-23 22:38:08 +01:00
Magne Sjaastad
34c6e3d906 System : Add missing default sections of switch statements 2018-02-23 21:30:24 +01:00
Rebecca Cox
69b1384d89 #2523 Mohrs circle: Add comments and improve readablity 2018-02-23 10:05:03 +01:00
Rebecca Cox
e8a65989c3 Code cleanup 2018-02-23 07:42:42 +01:00
Rebecca Cox
bf1a621332 #2523 Mohr Circle: Improve circle appearence 2018-02-22 18:10:24 +01:00
Rebecca Cox
28efe4661d #2522 Mohr circle: Update plot on 3D view selection 2018-02-22 18:04:47 +01:00
Rebecca Cox
d6974bfdba #2519 Mohr Circle: Create plot widget 2018-02-22 17:45:58 +01:00
Magne Sjaastad
80af97c1a8 #2521 Fishbones : Clamp MD ranges to max MD of well path 2018-02-22 14:48:24 +01:00
Magne Sjaastad
594be93883 Whitespace cleanup 2018-02-21 19:53:22 +01:00
Magne Sjaastad
c22f38e30c #2509 Fracture : Move fracture commands to separate folder 2018-02-21 19:38:20 +01:00
Magne Sjaastad
69339ad141 #2507 Non-Dracy Flow : Add display of unit and handle unit conversion 2018-02-21 19:25:05 +01:00
Magne Sjaastad
8ad30d9350 #2509 Fracture : Disconnect fracture template when unit changes 2018-02-21 19:07:03 +01:00
Magne Sjaastad
1b7dabdc51 #2291 Fishbones : Use 6 decimals, as this is required when using MD above 1000 2018-02-21 13:06:03 +01:00
Magne Sjaastad
ad97b19c30 #2509 Fracture : Exclude files when fracture config is not active 2018-02-21 10:41:11 +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
81bb4481ed #2509 Fracture : Rename 2018-02-21 10:10:22 +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
f67918eba3 #2509 Fracture : Improve UI 2018-02-21 08:36:18 +01:00
Magne Sjaastad
b0be540977 #2509 Fracture : Remove obsolete unit conversion code 2018-02-21 08:18:55 +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
Rebecca Cox
81287ee7cc #2484 2D Intersection View: 3D Info text: Show only well name, well path name or intersection name 2018-02-20 14:40:47 +01:00
Rebecca Cox
b69b15145f #2496 Tensor vectors: Use dark magenta for principal 1 and move color code to RiaColorTables 2018-02-20 14:27:10 +01:00
Magne Sjaastad
479247dc4d Merge fix for multi case statistics into dev 2018-02-20 14:02:51 +01:00
Rebecca Cox
0366361767 #2460 Tensor vectors: Move cvf::ref of scaler mapper out to avoid nullptr exception 2018-02-20 13:56:36 +01:00
Rebecca Cox
2c26ca4243 #2460 Tensor Vectors: Hide tensors on intersection creation 2018-02-20 13:47:47 +01:00
Rebecca Cox
4ca78ca833 #2460 Tensor Vectors: Use result as colormapping on the vectors 2018-02-20 13:47:47 +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
9b1b94a4ae #2517 Export COMPDATL : Include diameter for LGR grids 2018-02-20 11:26:39 +01:00
Magne Sjaastad
79a32af209 Octave Plugin : Move definition of qtDataStreamVersion to RiaSocketServerDefines 
After conversion from NULL -> nullptr the octave plugins failed to compile. By moving the define of qtDataStreamVersion this issue was resolved, and the dependency from oct-files to RiaSocketServer.h was not required anymore (and removed)
 2018-02-20 08:26:19 +01:00
Magne Sjaastad
82e706375a Octave Plugin : Move definition of qtDataStreamVersion to riSettings 
After conversion from NULL -> nullptr the octave plugins failed to compile. By moving the define of qtDataStreamVersion this issue was resolved, and the dependency from oct-files to RiaSocketServer.h was not required anymore (and removed)
 2018-02-20 08:16:13 +01:00
Magne Sjaastad
fb95d896ef #2509 Fracture : Add copy / paste of ellipse fracture template 2018-02-20 07:20:25 +01:00
Rebecca Cox
f0d32e6e45 #2511 2D Intersection view: Avoid selecting intersection in tree when selecting a cell 2018-02-19 15:11:35 +01:00
Rebecca Cox
0cb14397ac #2503 2D intersection View: Add Z-scale as info in the 3d info box 2018-02-19 15:08:54 +01:00
Magne Sjaastad
0ef0f3b5b1 #2509 Fracture : Guard UI selection of fracture template of different unit 2018-02-19 14:32:33 +01:00
Rebecca Cox
7f246a032a Merge patch into dev with fixes for #2501 2018-02-19 14:16:22 +01:00
Rebecca Cox
119752bf04 #2501 Result Plot: Add "Show Plot Data" to context menu 2018-02-19 14:15:42 +01:00
Magne Sjaastad
de3aa9f975 #2509 Fracture : Add text to indicate unit of fracture template 2018-02-19 13:54:29 +01:00
Rebecca Cox
542c912df2 Merge patch into dev with fixes for #2403 2018-02-19 09:32:37 +01:00
Rebecca Cox
4d39136212 #2403 Extraction curves: Fix curves without vertical connections 2018-02-19 09:29:14 +01:00
Magne Sjaastad
8d30b6e09f Use size_t instead of int 2018-02-18 19:01:38 +01:00
Magne Sjaastad
1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +01:00
Magne Sjaastad
69875eec8f (clang-tidy) : modernize-use-nullptr 2018-02-18 18:22:23 +01:00
Magne Sjaastad
88ead1f986 Fix signed /unsigned compare 2018-02-16 16:56:39 +01:00
Bjørn Erik Jensen
772ba788ad #2449 2d intersection view. Show UTM intersection point in result info window 2018-02-16 14:38:28 +01:00
Magne Sjaastad
917cae9e2d #2455 Non-Darcy Flow : Hide "From Fracture" if no width is available 2018-02-16 14:17:28 +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
b06d33c5e9 #2455 Non-Darcy Flow : Use DoubleValueEditor 2018-02-16 10:14:41 +01:00
Magne Sjaastad
ec70639a8f Remove obsolete code 2018-02-16 09:54:51 +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
7f5ff7be0f #2455 Non-Darcy Flow : Use double in fields to avoid many decimals when converting from float to double 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
8dfe181cc3 #2455 Non-Darcy Flow : Add support for user defined D-factor 2018-02-16 09:37:55 +01:00
Magne Sjaastad
dda9bd11ea #2455 Non-Darcy Flow : Add fracture width 2018-02-16 09:37:55 +01:00
Magne Sjaastad
e1619d3d62 #2455 Non-Darcy Flow : Show user defined permeability and rename 2018-02-16 09:37:55 +01:00
Rebecca Cox
82343d6680 #2489 Geo mech cases: Hide legend when result is not valid 2018-02-16 09:11:45 +01:00
Rebecca Cox
1fd6d10b69 #2460 Tensor vectors: Put scalar mapper code in separate functions 2018-02-15 15:45:40 +01:00
Rebecca Cox
67040d757f #2477 2D intersection view: add legend update 2018-02-15 15:10:59 +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
Rebecca Cox
0fece2447a #2470 2D Intersection Views: Hide the item when no intersections are present 2018-02-15 14:37:38 +01:00