OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 16:32:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,242 Commits 59 Branches 85 Tags
1de088ccbaa81eda561e344da17649d8f20762e8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Magne Sjaastad 78068e547d Fix compiler warnings related to converting time_t to double 2018-01-26 08:25:50 +01:00
Magne Sjaastad 889f615d19 #2276 : Source Stepping : Improve region ordering 
Internally, region numbers are stored in a set and then ordered correctly. When converting to strings for UI, the sorting criteria changes, and the order is wrong. If a vector is used to represent the UI strings, the problem is solved.
 2018-01-26 08:16:07 +01:00
Magne Sjaastad 0559084d93 #2325 Summary plot: Apply axis settings on preview plot 2018-01-25 21:16:35 +01:00
Magne Sjaastad aa6b657027 #2141 : Fracture : Show conductivity result name from file 2018-01-25 14:24:54 +01:00
Magne Sjaastad 6ff354c7ec Fix signed/insigned compare 2018-01-25 14:17:10 +01:00
Magne Sjaastad 6ce0037733 #2141 : Fracture : Make sure a new StimPlan fracture get valid defaults 2018-01-25 14:17:10 +01:00
Magne Sjaastad 430b193437 #2402 Fracture : Compute conductivity scaling for all conductivity variants 2018-01-25 14:17:10 +01:00
Magne Sjaastad 827468b764 #2402 Code cleanup 2018-01-25 14:17:10 +01:00
Magne Sjaastad 001742cbd3 #2402 Fracture : Add support for multiple conductivities on a template 2018-01-25 14:17:10 +01:00
Magne Sjaastad 1e4b4dbf62 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-25 11:14:09 +01:00
Magne Sjaastad 7dbd6c1027 #2398 Fracture : Hide "New Fracture" in context menu when no Fracture Template is defined 2018-01-23 07:28:32 +01:00
Magne Sjaastad bc5139257f #2141 Fracture : Remove Stimplan from UI text 2018-01-22 15:10:49 +01:00
Magne Sjaastad f0554d85af #2402 Fracture Conductivity : Add result name define 2018-01-22 15:07:59 +01:00
Magne Sjaastad 759d46813d #1544 Fracture Perforation Length : Set color to deep green 2018-01-22 13:00:11 +01:00
Magne Sjaastad 348b492cc1 RiaColorTables : Add and use undefinedCellColor() 2018-01-22 11:55:27 +01:00
Magne Sjaastad 9a420183e1 Remove unused code 2018-01-22 11:09:37 +01:00
Magne Sjaastad 245d10c5c1 Fix compiler warnings related to converting time_t to double 2018-01-19 16:55:16 +01:00
Magne Sjaastad 5c1f5326a0 #1544 Fracture : Show perforation length for along well path fractures 2018-01-19 15:08:31 +01:00
Magne Sjaastad 53418179ba #1544 Fracture : Add function used to compute perforation length coords 2018-01-19 15:08:31 +01:00
Magne Sjaastad c7d61ed7f4 #1544 : Move well path radius to RimWellPath 2018-01-19 15:08:31 +01:00
Magne Sjaastad 8e5bcef7c7 #1544 Removed unused functions and other minor improvements 2018-01-19 15:08:31 +01:00
Magne Sjaastad ba437c605d #2385 Main Window: More flexible docking restrictions 2018-01-19 15:08:31 +01:00
Magne Sjaastad ef3d9f1095 #2141 Fracture Legend : If conductivity, use legend to set ellipse fracture color 2018-01-19 15:08:31 +01:00
Magne Sjaastad 0674eaefbf #2141 Fracture Legend : Update model when ellipse conductivity changes 2018-01-19 15:08:31 +01:00
Magne Sjaastad 04a91b92f4 Remove unused function 2018-01-19 15:08:31 +01:00
Magne Sjaastad 2da5f8cf54 #2141 Use accumulators to compute min/max used to configure legend 2018-01-19 15:08:31 +01:00
Magne Sjaastad b4b1dfa0f9 #2141 Fixed wrong default values for MinMaxAccumulator 2018-01-19 15:08:31 +01:00
Magne Sjaastad b6a7dcb7b5 Upped version to 2018.01.00-dev.02 2018-01-17 14:44:21 +01:00
Magne Sjaastad 76b84cbb17 #2361 AppFwk : Make sure field of FilePath supports space, add more tests 2018-01-17 14:32:47 +01:00
Magne Sjaastad c0d9ef67fa #2361 AppFwk : Make sure identical strings are separated by semicolon 2018-01-17 14:32:47 +01:00
Magne Sjaastad 3bcfc09baf #2332 2D Intersection View: Show warning if intersection is not vertical 2018-01-17 11:29:06 +01:00
Magne Sjaastad 03de2aba5b #2332 2D Intersection View: Command to create view 2018-01-17 11:05:31 +01:00
Magne Sjaastad b53603e906 Use range based for 2018-01-17 09:23:45 +01:00
Magne Sjaastad 0ecfdeee6b Reorder functions, remove unused function 2018-01-17 09:23:45 +01:00
Magne Sjaastad 1523ce55f0 #2150 Fracture : Duplicate fracture geometry for along well pipe fractures 2018-01-17 09:23:45 +01:00
Magne Sjaastad 673ae6b1ff #2150 Fracture : Create two parts of fracture geometry 2018-01-17 09:23:45 +01:00
Magne Sjaastad 828557f71f Whitespace and include cleanup 2018-01-17 09:23:45 +01:00
Magne Sjaastad 424c6a46f6 Whitespace and function headers, move implementation to header 2018-01-16 08:04:49 +01:00
Magne Sjaastad 2457f968cf #2374 Fracture : Incomplete results when computing intersected StimPlan cells 2018-01-16 08:04:49 +01:00
Magne Sjaastad 523c623d39 #2152 Fracture : Rename UI text 2018-01-15 09:41:00 +01:00
Magne Sjaastad b2e0f3df31 #2371 Fracture : Update views after change of stimplan xml file name 2018-01-15 09:16:44 +01:00
Magne Sjaastad 85ead20ec9 #2371 Fracture : Guard for null pointer access 2018-01-15 08:58:56 +01:00
Magne Sjaastad 9820cb45e4 #2371 Fracture Template : Avoid crash when StimPlan xml fails to load 2018-01-15 08:58:56 +01:00
Magne Sjaastad e5aaf73a84 #2152 Fracture : Add StimPlan cell element color 2018-01-15 08:58:56 +01:00
Magne Sjaastad bf1b755dc8 #2361 AppFwk : Improve robustness of load and save of FilePath 2018-01-12 14:56:05 +01:00
Magne Sjaastad 5e3bc0e5ee #2152 Fracture : Add color interpolation mode 2018-01-12 14:56:05 +01:00
Magne Sjaastad ff03820a19 #2152 Minor refactoring 2018-01-12 14:56:05 +01:00
Magne Sjaastad fe17d0edd4 Remove unused function 2018-01-12 12:12:03 +01:00
Magne Sjaastad ded9cc6708 #2322 Check define before using stimPlanColors 2018-01-12 11:56:33 +01:00
Magne Sjaastad 7511e8a243 #2322 New View : Improve default values when creating view 2018-01-12 10:55:00 +01:00
Magne Sjaastad d25f9d4b67 Use const reference 2018-01-12 10:25:16 +01:00
Magne Sjaastad 9a2eebe8f5 Fracture : Move public fields to protected, and make RimFractureTemplate friend 2018-01-12 10:21:10 +01:00
Magne Sjaastad 337310c497 Fix invalid compare 2018-01-12 10:20:09 +01:00
Magne Sjaastad 402a2607c4 #1905 Perforation Intervals : Make sure well path context menu is displayed when clicking a perforation interval 2018-01-12 08:49:01 +01:00
Magne Sjaastad f027027618 #1905 Perforation Intervals : Picking the well path pipe does not work at perforations 
Forward all parts intersected to 3d viewer event handler
 2018-01-12 07:56:35 +01:00
Magne Sjaastad b70d39cc6c System : Postfix with u to indicate unsigned value (avoid warning on linux) 2018-01-11 14:04:25 +01:00
Magne Sjaastad e99cc66325 #2361 AppFwk : Test application adjustments to allow save and load of project 2018-01-11 13:50:26 +01:00
Magne Sjaastad 97822cbd2c #2361 AppFwk : Template specialization of stream operator for vector of FilePath 2018-01-11 13:50:26 +01:00
Magne Sjaastad f86b13adc8 #2361 AppFwk : Add cafFilePath and conversion to QVariant 2018-01-11 13:50:26 +01:00
Magne Sjaastad 90f9b63b44 #2361 AppFwk : cafPdmuiListEditor : Refactor setting of strings to field 2018-01-11 13:50:26 +01:00
Magne Sjaastad 30cbd8018f #2359 Move fields to private, whitespace cleanup 2018-01-10 07:44:53 +01:00
Magne Sjaastad 49eebd0c28 #2359 Fracture : Adjust default parameters for ellipse fracture 2018-01-10 07:44:53 +01:00
Magne Sjaastad 68b5a0e019 Merge branch '2018.01.01-patch' into dev 2018-01-09 09:58:39 +01:00
Magne Sjaastad 472aa87265 System : Postfix with _OBSOLETE 2018-01-09 09:57:54 +01:00
Magne Sjaastad 09d776dd73 #2353 Empty function caseName() shadows base class field with same signature 2018-01-09 09:16:06 +01:00
Magne Sjaastad 038914dc01 Delete octave tests, moved to test repository 
See https://github.com/OPM/ResInsight-regression-test
 2018-01-08 21:47:23 +01:00
Magne Sjaastad 8a2066eac2 Merge branch '2018.01.01-patch' into dev 2018-01-08 11:48:16 +01:00
Magne Sjaastad a26f3b6907 #2340 Snapshot : Space in path is replaced with underscore 2018-01-08 11:46:51 +01:00
Magne Sjaastad cc97baa9cb Merge branch '2018.01.01-patch' into dev 2018-01-08 10:39:50 +01:00
Magne Sjaastad 561e20a37e #2329 Add relocate of RimWellLogFile 2018-01-08 10:37:57 +01:00
Magne Sjaastad a40a3578f2 #2329 Add relocate of well path formation file 2018-01-08 10:35:53 +01:00
Magne Sjaastad f515d3c2de System : Add field and object keywords for 2018.01 2018-01-05 15:40:09 +01:00
Magne Sjaastad 84bc868338 #2313 Upped version to 2018.01.00-dev.01 2018-01-05 15:34:26 +01:00
Magne Sjaastad 1df20d1b10 #2313 Improve cmake tooltip text and mark as advanced 2018-01-05 14:21:02 +01:00
Magne Sjaastad e6c96a3beb #2313 Version number set to 2018.01.00 2018-01-05 11:52:35 +01:00
Magne Sjaastad b598bdf86c #2315 Add missing include of cmath 2018-01-05 11:38:58 +01:00
Magne Sjaastad c4369a2861 Octave : Do not compare well names by index, as the index of wells can change 2018-01-05 11:24:13 +01:00
Magne Sjaastad 98374923b9 #2315 AppFwk : Use fabs 2018-01-05 11:11:48 +01:00
Magne Sjaastad 0939cff93a Merge pull request #2320 from OPM/fabs 
#2315. Replaced abs() by fabs() where relevant
 2018-01-05 10:50:11 +01:00
Magne Sjaastad 0f30433286 #2313 Make sure ResInsight compiles if HDF5 is not available on Linux 2018-01-05 07:06:55 +01:00
Magne Sjaastad 92cc4f4dbe System : Add how to create patch from a single commit 2018-01-04 20:54:14 +01:00
Magne Sjaastad 39168a9be8 #2317 Apply fix for synthetic ODB files 2018-01-04 20:38:16 +01:00
Magne Sjaastad d8f7e0ce1c #2317 Update patch file to match new file paths 2018-01-04 20:37:46 +01:00
Magne Sjaastad 11ed06a5d5 #2314 Fracture : Along well path direction 
Use fabs instead of abs to avoid unintentionally conversion to integer
 2018-01-04 19:31:44 +01:00
Magne Sjaastad addf200a9e #2310 Fix boolean test in isProjectFileVersionEqualOrOlderThan 2018-01-04 15:24:35 +01:00
Magne Sjaastad 0647add116 #2302 Formations : Always show formations, and display above fracture templates 2018-01-04 15:04:58 +01:00
Magne Sjaastad 706740ca5b #2313 Improve RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING 
Set default ON
 2018-01-04 13:53:50 +01:00
Magne Sjaastad efd321f2c6 #2313 Improve RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 
Set default on and mark as advanced
 2018-01-04 13:51:54 +01:00
Magne Sjaastad 780f11713d #2310 Refactor creation of product version string 2018-01-04 13:12:49 +01:00
Magne Sjaastad 96a900fe0f #2310 Add isProjectFileVersionEqualOrOlderThan to RimProject and use from summary plot 2018-01-04 13:12:07 +01:00
Magne Sjaastad dbc1061a59 #2310 Version compare : Improve interface and add unit test 2018-01-04 12:38:12 +01:00
Magne Sjaastad e7c8667b24 #2310 Add helper files and unit test for project file version queries 2018-01-03 13:17:29 +01:00
Magne Sjaastad 24aca6edc3 #2304 Property Editor: Box header text not readable 
Modify title label palette before modifying the frame palette
 2018-01-03 13:17:29 +01:00
Magne Sjaastad 79818cecac #2292 AppFwk : Fixed copyright and improved whitespace 2018-01-02 10:32:04 +01:00
Magne Sjaastad 695978ed95 Regression Test : Use folder selection editor 2018-01-02 10:21:32 +01:00
Magne Sjaastad 40a4222db2 Remove obsolete assert 
Discussed with @jacobstoren : Multiple branches are handled by the logic, and the assert is probably obsolete. Consider to set isMultiSegmentWell = true when multiple branches are detected.
 2018-01-02 08:20:03 +01:00
Magne Sjaastad bdfd3d4e04 #2234 Completion Export : Do not include unticked perf intervals in project tree 2017-12-22 15:08:13 +01:00
Magne Sjaastad 173ef575fd #2234 Completion Export : Do not include unticked fishbones in project tree 2017-12-22 15:01:41 +01:00
Magne Sjaastad 500b298c26 #2293 Completion Export : Make sure one of the available combo box items are selected 2017-12-22 14:43:00 +01:00
Magne Sjaastad d9e29b91cb #2234 Fractures : Export only sim well fractures ticked on in project tree 2017-12-22 14:43:00 +01:00