OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
11,327 Commits 53 Branches 83 Tags
29fdca3f69bd3622beb8bb66f6b0778be8542327
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Magne Sjaastad 4920ccd667 Merge pull request #4898 from OPM/fix-update-ensemble 
#4851 Ensemble RFT : Fix update of color of ensemble curves on project load
 2019-10-21 07:58:49 +02:00
Magne Sjaastad 328cf44d94 #4851 Ensemble RFT : Fix update of color of ensemble curves on project load 2019-10-20 10:46:05 +02:00
Magne Sjaastad f114a37b3c Merge pull request #4897 from OPM/summary-data-show-short-text-labels 
#4876 Resampeled Plot Data: Show time short text labels when possible
 2019-10-20 08:44:27 +02:00
Magne Sjaastad 53e8cc82bd #4876 Resampeled Plot Data: Show time short text labels when possible 2019-10-19 15:05:59 +02:00
Magne Sjaastad d59cdfa6ec Merge pull request #4895 from OPM/fix-cumulative-curve-statistics-resample 
Fix cumulative curve statistics resampling
 2019-10-19 13:33:26 +02:00
Magne Sjaastad c0d678d355 Merge pull request #4896 from OPM/add-error-message-to-fmu-import 
Add error message to FMU import
 2019-10-18 18:16:58 +02:00
Magne Sjaastad 6d7b29bb29 #4893 Formations : Make sure "layer_zone_table.txt" is defined once 2019-10-18 14:45:12 +02:00
Magne Sjaastad 3f617c93d2 #4893 Import Observed FMU data : Add error message 2019-10-18 14:36:53 +02:00
Magne Sjaastad 537184328a #4877 Refactor and rename to RiuSummaryQuantityNameInfoProvider 2019-10-18 14:28:02 +02:00
Magne Sjaastad 1cab88e9c5 #4877 Detect correct accumulation type for statistics curves 2019-10-18 14:22:15 +02:00
Magne Sjaastad 4dcdc2a1ee Set version to 2019.08.2-dev.04 2019-10-16 12:53:45 +02:00
Magne Sjaastad bb74ac24f8 Merge pull request #4875 from OPM/fix-dual-porosity-issues 
Fix dual porosity issues
 2019-10-16 11:59:17 +02:00
Magne Sjaastad 61db98ef04 #4874 Dual Porosity : Missing active cells in some cases 2019-10-16 11:11:01 +02:00
Magne Sjaastad a53f1e1e91 #4638 Dual porosity : Make sure geometry is regenerated when switching between matrix/fracture 2019-10-16 10:15:51 +02:00
Magne Sjaastad 715a1c66e5 Merge pull request #4848 from OPM/command-line-snapshots 
#4847 Command Line Snapshots : Make sure image size is handled correctly
 2019-10-11 14:01:54 +02:00
Magne Sjaastad c19bae3a07 #4852 Command Line : Enable commented code 2019-10-11 13:03:14 +02:00
Magne Sjaastad 0e2cee7295 #4852 Command Line : Add snapshotexportfolder 2019-10-11 12:35:41 +02:00
Magne Sjaastad 225893dcda #4852 Command Line : Add snapshotsize 2019-10-11 10:57:20 +02:00
Magne Sjaastad 4bfcf86962 #4847 Move setFixedWindowSizeFor3dViews to RiuMainWindowTools 2019-10-11 08:54:23 +02:00
Magne Sjaastad 69ff4d25f2 #4847 Command Line Snapshots : Make sure image size is handled correctly 2019-10-11 08:32:08 +02:00
Magne Sjaastad 71760b0e34 Merge pull request #4844 from OPM/improve-command-line- 
#4765 Summary : Support command line snapshots without a project file
 2019-10-10 07:52:55 +02:00
Magne Sjaastad 75140c2406 #4765 Summary : Support command line snapshots without a project file 
Use current working directory as base, and create a sub folder named "snapshots". Export snapshots from the application into this folder.
 2019-10-09 15:21:51 +02:00
Magne Sjaastad 35004ef7b2 #4843 AppFwk : Remove debug output to avoid noise 2019-10-09 13:07:19 +02:00
Magne Sjaastad b24b0932a3 Merge pull request #4836 from OPM/fix-transfer-of-single-timestep-data 
#4835 Python Cell Results : Not possible to write data if no dynamic data is present
 2019-10-08 11:45:39 +02:00
Magne Sjaastad 482d437505 #4835 Python Cell Results : Not possible to write data if no dynamic data is present 2019-10-08 10:39:22 +02:00
Magne Sjaastad 06b007effb Ensemble plot templates (#4829) 
* #4828 Summary Plot Templates : Support ensembles as plot data sources

Guard null pointer access and use regexp to match case and index
 2019-10-08 09:08:04 +02:00
Magne Sjaastad 8ef5982756 Merge pull request #4834 from OPM/support-input-as-data-source-for-compdat 
support-input-as-data-source-completions
 2019-10-08 08:24:03 +02:00
Magne Sjaastad 55224bed3d Fix signed/unsigned compare 2019-10-08 08:20:03 +02:00
Magne Sjaastad 1f181fa175 #4827 Completion Data : Guard index out of range 2019-10-08 08:01:25 +02:00
Magne Sjaastad cc746a20cb #4828 Summary Plot Templates : Robustification 2019-10-08 07:27:45 +02:00
Magne Sjaastad 5a410ca8be #4828 Summary Plot Templates : Use regexp to match case and index 2019-10-07 12:05:14 +02:00
Magne Sjaastad 56a5a750f2 #4828 Summary Plot Templates : Improve robustness 2019-10-07 10:30:17 +02:00
Magne Sjaastad 9365511f3d #4828 Summary Plot Templates : Remove unused function 2019-10-07 07:47:44 +02:00
Magne Sjaastad cd12b3ad4b Guard null pointer access 2019-10-07 07:42:39 +02:00
Magne Sjaastad 2c73b2ed02 #4828 Summary Plot Templates : Support ensembles as plot data sources 2019-10-04 18:46:30 +02:00
Magne Sjaastad 8a11c565f3 #4827 Completion Data : Support Eclipse input text files as data source 2019-10-04 15:55:31 +02:00
Magne Sjaastad 3d3ad421dd Merge pull request #4826 from OPM/fix-keyboard-events-stepping 
#4825 Summary Plot Stepping : Key events are not routed correctly
 2019-10-04 14:20:11 +02:00
Magne Sjaastad 2998ad3bed #4825 Summary Plot Stepping : Key events are not routed correctly 2019-10-04 13:20:15 +02:00
Magne Sjaastad a6733ae776 Merge pull request #4818 from OPM/improve-ensemble-stepping 
Improve ensemble stepping
 2019-10-04 11:43:06 +02:00
Magne Sjaastad c111b0d4c3 #4811 Source Stepping : Show ensemble stepping when plot is selected 2019-10-04 09:54:57 +02:00
Magne Sjaastad 311dd5b5c4 #4811 Source Stepping : Fix well stepping for ensembles 2019-10-04 09:09:22 +02:00
Magne Sjaastad ff3055b961 #4815 Ensemble Curve Set : Make text match case insensitive 2019-10-03 14:36:10 +02:00
Magne Sjaastad c90e7e0663 #4814 Ensemble Summary Curves : Fix creation of new curve set 2019-10-03 14:36:10 +02:00
Magne Sjaastad 1e2e02c9ac Merge pull request #4812 from OPM/use-first-ensemble-case 
#4750 Summary : Use first ensemble case if no standalone case is found
 2019-10-03 11:21:00 +02:00
Magne Sjaastad 5a2bea38f7 #4750 Summary : Use first ensemble case if no standalone case is found 2019-10-03 10:12:50 +02:00
Magne Sjaastad 86d17441eb #4713 Summary Case : Use "Calculated" as shortname for calculated case 
Seen by running regression tests
 2019-10-01 13:00:09 +02:00
Magne Sjaastad 6ba4425dad #4766 Crash when Show plot data for ensemble with a stopped simulation 2019-10-01 11:07:46 +02:00
Magne Sjaastad 18e12efaa3 Merge pull request #4803 from OPM/summary-template-adjustments 
Adjustments to summary templates
 2019-09-30 22:27:35 +02:00
Magne Sjaastad 7ce7211187 Merge remote-tracking branch 'origin/dev' into summary-template-adjustments 2019-09-30 19:43:08 +02:00
Magne Sjaastad 7173f1d4be #4796 Summary Plot Template : Fix typo in include file name 2019-09-30 14:05:19 +02:00
Magne Sjaastad 0698674d59 #4796 Summary Plot Template : Add context menu of summary cases 2019-09-30 13:28:08 +02:00
Magne Sjaastad 64e617562d #4796 Summary Plot Template : Add context menu of summary cases 2019-09-30 07:50:51 +02:00
Magne Sjaastad 18e6bec1bf #4796 Summary Plot Template : Move code to SummaryPlotTemplateTools 2019-09-29 12:42:38 +02:00
Magne Sjaastad fbfba745c3 #4796 Summary Plot Template : Add context menu to selected summary cases 2019-09-29 12:31:21 +02:00
Magne Sjaastad a6609c6e06 #4795 Summary Plot : Add updateConnectedEditors() 
Recent changes in logic requires more updateConnectedEditors
 2019-09-28 17:40:40 +02:00
Magne Sjaastad d2df004cf3 #4795 Summary Plot Templates : Make sure summary address is valid 
If the summary address specified in the template does not exist, uses the first valid address of the specified quantity.
 2019-09-27 16:18:12 +02:00
Magne Sjaastad cf482edd3e #4795 Summary Plot Templates : Do not set custom plot title 2019-09-27 16:14:56 +02:00
Magne Sjaastad 1ab58449bd #4793 Summary Plot Templates : Help accessible from About menu 2019-09-27 15:15:09 +02:00
Magne Sjaastad 856596c366 Merge pull request #4791 from OPM/fix-e300-wrong-date 
#4770 Incorrect reporting of date for E300 in combination with lab units
 2019-09-27 14:41:48 +02:00
Magne Sjaastad 0c4de184b1 Merge pull request #4768 from OPM/bug-libecl-crash2 
#4762 Fix reset_actnum libecl crash on load
 2019-09-27 14:40:03 +02:00
Magne Sjaastad acb3c3e23b #4770 Incorrect reporting of date for E300 in combination with lab units 
User reports issues with import of dynamic properties for E300 simulation. E100 works as expected. For some reason, the date for all time steps for the E300 simulations is identical. This fix detects the situation, and use the double value from days vector as offset.
 2019-09-27 14:04:13 +02:00
Magne Sjaastad b8e36de943 #4707 Update web address for Help/User Guide/F1 2019-09-26 10:04:26 +02:00
Magne Sjaastad fd49edc91c Upped to 2019.08.1-dev.03 2019-09-26 07:21:26 +02:00
Magne Sjaastad 611e1f24d3 #4753 Fix selection of plot subitems jumps to parent plot 2019-09-24 12:35:03 +02:00
Magne Sjaastad 980d483024 Merge pull request #4752 from OPM/use-wstring-for-file-path 
#4751 System : Use std::wstring to communicate file path
 2019-09-24 11:09:01 +02:00
Magne Sjaastad e3aa160265 Python doc adjustments (#4756) 
* Doc and adjustments of project.py

* Doc and adjustments view.py

* Python doc cleanup

* Python : Add copy of files to deployment folder

* Python : Several updates to doc

* Python : Limit line lenghts

* Minor adjustments
 2019-09-24 11:06:24 +02:00
Magne Sjaastad f41edcee44 #4751 System : Use std::wstring to communicate file path 2019-09-23 13:37:29 +02:00
Magne Sjaastad 00eb02ccec Merge pull request #4745 from OPM/sync-tree-selection-with-field-value 
Auto scroll to checked item
 2019-09-20 14:58:30 +02:00
Magne Sjaastad 385207eebe Compare with correct enum 2019-09-20 14:50:41 +02:00
Magne Sjaastad daf4132dec #4744 AppFwk : Auto scroll to first checked item 2019-09-20 14:19:26 +02:00
Magne Sjaastad f7b53aa666 Fix signed/unsigned compare 2019-09-20 14:19:17 +02:00
Magne Sjaastad a7c92a43e5 #4741 Summary Plot Editor : Add first item in intermediate selection when summary vector is selected 2019-09-20 12:08:57 +02:00
Magne Sjaastad d4b64c58f2 Merge pull request #4740 from OPM/sync-tree-selection-with-field-value 
Sync tree selection with field value
 2019-09-20 11:19:52 +02:00
Magne Sjaastad a9080e14c3 #4722 AppFwk: Rename 2019-09-20 09:54:10 +02:00
Magne Sjaastad f4cfc750f1 AppFwk : Apply clang-format 2019-09-20 09:52:12 +02:00
Magne Sjaastad b92618ebd3 #4722 Summary Plot Editor : Set the current category to the first selected category 2019-09-20 09:45:15 +02:00
Magne Sjaastad cba51615d8 #4722 Summary Plot Editor : Update current item in tree view 
Make sure the current selected item in the tree view is updated with the value in the underlying field.
 2019-09-20 09:44:26 +02:00
Magne Sjaastad 4d82a65d8b Merge pull request #4737 from OPM/plot-templates-rc2 
#4733 Summary Template : Add reload of templates
 2019-09-20 07:18:55 +02:00
Magne Sjaastad f088d99a02 Fix invalid case in file name 2019-09-19 14:32:35 +02:00
Magne Sjaastad f2ac170b66 #4733 Summary Template : Add reload of templates 
Adjust save and load of templates
Add save path to preferences
 2019-09-19 11:39:32 +02:00
Magne Sjaastad 977771e3b0 Merge pull request #4734 from OPM/fwk-adjustments 
Add access to reference string
 2019-09-18 14:51:45 +02:00
Magne Sjaastad 01c615889b AppFwk : Add accessor functions to xml reference string 2019-09-18 14:17:49 +02:00
Magne Sjaastad 60b4078829 AppFwk : Guard for null pointer access 2019-09-18 14:17:44 +02:00
Magne Sjaastad eb31e9672f AppFwk : Remove clang-format 
As we now use clang-format on save in ApplicationCode, we need to remove the clang-format file until we decide to use clang-format for code in AppFwk.
 2019-09-18 14:17:39 +02:00
Magne Sjaastad f5d2e594a2 Merge pull request #4721 from OPM/disable-warnings-2 
Disable warnings
 2019-09-16 21:38:03 +02:00
Magne Sjaastad 528d4523bd System : Disable warnings 2019-09-16 21:23:11 +02:00
Magne Sjaastad fe8bd23cac System : Disable warnings 2019-09-16 20:30:49 +02:00
Magne Sjaastad 59616d5c65 AppFwk : Disable some warnings 2019-09-16 13:42:36 +02:00
Magne Sjaastad 29184f4475 System : Disable warnings 2019-09-16 13:33:05 +02:00
Magne Sjaastad 8a7dee705a System : Move include and compiler defs to ApplicationCode 2019-09-16 13:29:44 +02:00
Magne Sjaastad 8c189922e0 System : Move include of Eigen into ApplicationCode 2019-09-16 13:18:56 +02:00
Magne Sjaastad b6dcb6285e Merge pull request #4720 from OPM/minor-summary-adjustments 
Minor summary adjustments
 2019-09-13 20:32:25 +02:00
Magne Sjaastad f7a36e1c99 #4709 Summary Plot Editor : Increase height for summary vector widgets 2019-09-13 20:29:29 +02:00
Magne Sjaastad 8e3e16c7e6 #4709 Summary Plot Editor : Avoid default selection of field vectors 2019-09-13 19:16:06 +02:00
Magne Sjaastad d212201a3a #4713 Summary Case : Shortname is not used in plot title 2019-09-13 18:39:23 +02:00
Magne Sjaastad abb0363b12 Merge pull request #4717 from OPM/feature-Text-Based-Curve-Filter-Editor 
Feature text based curve filter editor
 2019-09-13 18:01:29 +02:00
Magne Sjaastad c5c4bfb545 Add missing include 2019-09-13 17:16:58 +02:00
Magne Sjaastad 679ce3a222 Merge pull request #4719 from OPM/qt5-use-grab 
#4718 Qt5 : Use grab() instead of grabWidget()
 2019-09-13 16:57:39 +02:00
Magne Sjaastad 33cd6bb0c8 Clang-format after merge 2019-09-13 16:51:21 +02:00
Magne Sjaastad aaeafa6aef Merge remote-tracking branch 'origin/patch-2018.08.2' into dev 2019-09-13 16:51:03 +02:00