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,584 Commits 27 Branches 61 Tags 309 MiB
bbcc59ee1d
Commit Graph

6278 Commits

Author SHA1 Message Date
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
Rebecca Cox
f909a7ea27 #2438 2d Intersection View: Update intersection view on 3dOverlayInfo update 2018-02-15 14:31:13 +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
1076384ce0 #2438 2D Intersection View: 3D Info Box items must follow settings in the main view 2018-02-15 13:00:44 +01:00
Bjørn Erik Jensen
de498a71c2 #2474 fractures. Added plural form of fracture. Moved below sim wells 2018-02-15 12:34:34 +01:00
Bjørn Erik Jensen
3fd5d3a3a7 #2393 Reservoir compaction derived result 2018-02-15 11:01:55 +01:00
Bjørn Erik Jensen
0e53c4b8bd RuiMainWindow. Null pointer guard 2018-02-15 10:59:15 +01:00
Rebecca Cox
22ba541145 #2359 Tensor Vectors: Use lines to draw the vectors 2018-02-15 10:47:14 +01:00
Magne Sjaastad
8e1a7b2bbb #2455 Non-Darcy Flow : Compute D-factor and show in UI 2018-02-14 13:35:35 +01:00
Magne Sjaastad
f9bded9c13 #2455 Fracture : Move code to cpp and restructure header 2018-02-14 13:34:38 +01:00
Magne Sjaastad
1a78490991 Fix warnings related to signed / unsigned compare 2018-02-14 13:27:50 +01:00
Magne Sjaastad
03f4b778cc #2471 Fracture : Block selection of fracture if fracture template is selected in Project Tree 2018-02-14 13:07:33 +01:00
Magne Sjaastad
646eb8fee4 StimPlan Fracture : Make sure geometry is recomputed when required 2018-02-14 13:07:16 +01:00
Magne Sjaastad
302edc5677 System : Guard null pointer access 2018-02-14 13:06:54 +01:00
Rebecca Cox
eedf182620 #2413 2D intersection view: Use correct cell result in infoText 2018-02-14 10:54:28 +01:00
Jacob Støren
cb38d435cd #2457 Make 2d intersection view length start at well start 2018-02-13 16:56:48 +01:00
Rebecca Cox
3b627ce1c4 #2413 2D Intersection View: Add geoMech result title to infoText 2018-02-13 14:01:37 +01:00
Rebecca Cox
4eb80e83bb #2465 Property panel: Update UI fields from selected result on tree view object changed 2018-02-13 13:29:47 +01:00
Jacob Støren
2e8a497989 #2461 Align the vertices between shader and fixed function rendering methods. 2018-02-13 12:53:50 +01:00
Jacob Støren
ab27efcb7d #2461 Add explicit render code for shader based rendering. Should solve the issue. 2018-02-13 12:12:55 +01:00