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
12,091 Commits 53 Branches 83 Tags
06f1db671ec557fc8b2a32d4444aa8e29720fb78
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Magne Sjaastad 0944aa5771 Set version to 2019.12.0-dev.02 2020-01-08 15:22:39 +01:00
Magne Sjaastad 3d5903b9c4 Merge pull request #5302 from OPM/well-measurements-file-format-changes-5216 
Well measurements file format changes 5216
 2020-01-08 14:28:06 +01:00
Magne Sjaastad cbe89c05c9 Merge pull request #5312 from OPM/feature-reservoir-surface-import 
Feature reservoir surface import
 2020-01-08 14:27:33 +01:00
Magne Sjaastad c40f2dd94a #5309 Fractures : Guard when no time steps are present 2020-01-08 12:42:11 +01:00
Magne Sjaastad 65f4a5e089 Fix signed/unsigned compare 2020-01-07 13:09:44 +01:00
Magne Sjaastad 15dc0e974b Assign calculation ID to existing addresses (#5304) 
#5278 Assign calculation ID to existing addresses
 2020-01-07 12:29:12 +01:00
Magne Sjaastad 4811cfb28f Merge pull request #5301 from OPM/bugfix-summary-selection-5278 
#5278 Fix selection of calculated curves in summary selction dialog
 2020-01-07 11:21:33 +01:00
Magne Sjaastad 4ba622ee73 Merge pull request #5303 from OPM/improve-formations 
Improve formations
 2020-01-07 11:21:09 +01:00
Magne Sjaastad 79641f090f #5300 Formations : Make sure views are updated correctly 2020-01-07 08:47:02 +01:00
Magne Sjaastad ff2963293b #5300 Formations : Move update of Rim-related structures to RimEclipseCase 2020-01-06 15:27:16 +01:00
Magne Sjaastad 7d05a8bd0a #5300 Formations : Fix update issues 2020-01-06 14:33:54 +01:00
Magne Sjaastad a7366fbebf Guard null pointer access 2020-01-06 11:22:39 +01:00
Magne Sjaastad ef986fcd34 Merge pull request #5282 from OPM/fix-ensemble-curve-highlight 
Summary Plot: Ensemble curve highlight is missing in 2019.12
 2020-01-03 13:33:25 +01:00
Magne Sjaastad 10649fa444 #5281 Summary Plot: Ensemble curve highlight is missing in 2019.12 2020-01-03 12:51:55 +01:00
Magne Sjaastad 576dfa80ac Make it possible to store project file without global path section 
If you have a project file with an alias section, this project is not possible to open in previous versions. Add a menu entry in the Testing menu to allow storage without alias.
 2020-01-03 12:51:40 +01:00
Magne Sjaastad 5df7700a75 Merge pull request #5280 from OPM/improve-formations 
Formations : Add const and simplify access
 2020-01-03 12:51:08 +01:00
Magne Sjaastad 1c4feade71 #5279 Formations GeoMech : Add const and simplify access 2020-01-03 11:59:17 +01:00
Magne Sjaastad afc9ace33e #5279 Formations : Add const and simplify access 2020-01-03 09:59:38 +01:00
Magne Sjaastad 5bcaed594b Merge pull request #5277 from OPM/guard-null-pointer-access 
Ensemble : Guard null pointer access causing crash
 2020-01-03 08:37:29 +01:00
Magne Sjaastad dffef1cf54 #5276 Ensemble : Guard null pointer access causing crash 2020-01-03 07:09:35 +01:00
Magne Sjaastad 831b899091 #5200 Prototype of use of formation names for allen diagram 2019-12-20 13:55:43 +01:00
Magne Sjaastad be3c40c317 Merge pull request #5262 from OPM/keywords-from-menu 
#5261 System : Allow export of field and object keywords from test menu
 2019-12-20 12:35:40 +01:00
Magne Sjaastad 582720f74e #5261 System : Allow export of field and object keywords from test menu 2019-12-20 11:22:29 +01:00
Magne Sjaastad e37795a4dd Add object and field keywords names for release 2019.12 2019-12-20 10:53:34 +01:00
Magne Sjaastad a324e9ac33 Merge pull request #5260 from OPM/merge-fixup 
Merge fixup
 2019-12-20 10:42:25 +01:00
Magne Sjaastad f22161bf6e Merge branch 'master' into 'dev' 
Previous attempts to merge failed due to bugs in merge tools. Performing merge from command line works as expected.
 2019-12-20 10:39:29 +01:00
Magne Sjaastad 46c14af2fd Merge pull request #5257 from OPM/feature-well-dist-clang 
Well distribution plots
 2019-12-19 14:29:56 +01:00
Magne Sjaastad 4d3113255e Minor code adjustments 2019-12-19 11:55:34 +01:00
Magne Sjaastad 4ccbd274b8 clang-format : Apply clang-fomat on ApplicationCode 2019-12-19 11:11:33 +01:00
Magne Sjaastad ba0ef5c7e8 Merge branch 'master' into dev 2019-12-19 09:34:34 +01:00
Magne Sjaastad 823e2abe7a Merge pull request #5253 from OPM/release-2019-12 
Release of 2019.12
 2019-12-19 09:13:57 +01:00
Magne Sjaastad fd86c830f6 Upped to 2019.12.0 2019-12-19 08:34:45 +01:00
Magne Sjaastad 682c1324b7 Merge branch 'master' into release-2019.11 2019-12-19 08:00:41 +01:00
Magne Sjaastad 69885af447 Upped to 2019.12-RC05 2019-12-18 15:51:58 +01:00
Magne Sjaastad 91cd27d589 #5251 Comparison View : Guard null pointer access 2019-12-18 15:47:06 +01:00
Magne Sjaastad 3100ed655d Manual copy of code from release-2019.11 2019-12-18 15:44:48 +01:00
Magne Sjaastad 6ae0c5e816 Merge pull request #5241 from OPM/fix-crash-well-production-plots 
Fix crash when creating prodution rate plot.
 2019-12-18 15:36:06 +01:00
Magne Sjaastad 4a0b602851 Upped to 2019.12.0-RC04 2019-12-18 12:32:06 +01:00
Magne Sjaastad ab371fb2bb #5251 Comparison View : Guard null pointer access 2019-12-18 12:30:32 +01:00
Magne Sjaastad 314e98d407 #5249 Update clang-format 2019-12-18 11:12:47 +01:00
Magne Sjaastad 67cd398414 Prepare for release of 2019.12.0 2019-12-18 10:20:30 +01:00
Magne Sjaastad f339b52907 #5036 Octave : Simplify error message 2019-12-18 08:34:21 +01:00
Magne Sjaastad b013475fa8 #5036 Octave : Simplify error message 2019-12-18 08:34:04 +01:00
Magne Sjaastad 2b21a37f0d Upped to 2019.12.0-RC03 2019-12-18 08:12:07 +01:00
Magne Sjaastad a9548c8c01 Merge pull request #5243 from OPM/bug-#5234-summary-xplot-axis 
#5234 Fix auto scale of cross plot x-axis
 2019-12-18 08:00:10 +01:00
Magne Sjaastad 0085ab3c12 Merge pull request #5244 from OPM/bug-#5234-release-2019.11 
#5234 Fix auto scale of cross plot x-axis
 2019-12-18 07:59:56 +01:00
Magne Sjaastad 92c767989f #5237 MSW: Use 7 numbers for roughness number format 2019-12-17 14:11:23 +01:00
Magne Sjaastad 87d0efe7c1 #5237 MSW: Use 7 numbers for roughness number format 2019-12-17 14:10:59 +01:00
Magne Sjaastad bd74a3ce73 #5238 Ensemble RFT : Hide P50 from statistics 2019-12-17 12:05:36 +01:00
Magne Sjaastad d65c84049d Merge pull request #5236 from OPM/cherrypick-from-release 
Cherrypick several fixes from release branch
 2019-12-17 12:05:14 +01:00
Magne Sjaastad d24fe229b0 #5238 Ensemble RFT : Hide P50 from statistics 2019-12-17 12:03:11 +01:00
Magne Sjaastad 0b2a78b211 #5232 Templates: Do not write dialog fields to project file 2019-12-17 10:55:51 +01:00
Magne Sjaastad af6e713414 #5228 Summary Plot: Fix curves from a summary case when .EGRID file is opened 2019-12-17 10:55:37 +01:00
Magne Sjaastad 22b054a63a #5225 Plot Template: Fix crash when selecting directory instead of template item 2019-12-17 10:55:30 +01:00
Magne Sjaastad 5235b5f49e #5227 Ensemble Filter : Create one curve filter by default 2019-12-17 10:55:24 +01:00
Magne Sjaastad b6b5b014ad #5226 Ensemble Filter : Remove colors group from property editor 2019-12-17 10:55:19 +01:00
Magne Sjaastad 714868b10a Merge pull request #5233 from OPM/avoid-storing-ui-fields 
Templates: Do not write dialog fields to project file
 2019-12-17 08:35:02 +01:00
Magne Sjaastad 17fb70d52d #5232 Templates: Do not write dialog fields to project file 2019-12-17 07:32:19 +01:00
Magne Sjaastad ff09fba50c Merge pull request #5229 from OPM/release-fixes 
Small fixes related to release
 2019-12-16 14:36:02 +01:00
Magne Sjaastad 563fa8dbaa #5228 Summary Plot: Fix curves from a summary case when .EGRID file is opened 2019-12-16 13:21:43 +01:00
Magne Sjaastad fc535d6d74 #5225 Plot Template: Fix crash when selecting directory instead of template item 2019-12-16 13:02:31 +01:00
Magne Sjaastad fee31510d6 #5227 Ensemble Filter : Create one curve filter by default 2019-12-16 12:40:10 +01:00
Magne Sjaastad 839329876a #5226 Ensemble Filter : Remove colors group from property editor 2019-12-16 11:44:25 +01:00
Magne Sjaastad d5c965aebe #5224 Avoid unicode in description of Summary Address 2019-12-13 15:53:38 +01:00
Magne Sjaastad 91e8b1a839 #5224 Avoid unicode in description of Summary Address 2019-12-13 15:52:28 +01:00
Magne Sjaastad 5d96ce738c #5131 Minor calculation curve adjustments 2019-12-13 15:41:34 +01:00
Magne Sjaastad dd5ebe494a Merge pull request #5210 from OPM/fix-show-plot-on-calculated-curves-5140 
Fix show plot on calculated curves 5140
 2019-12-13 11:05:25 +01:00
Magne Sjaastad 525d4086f9 #5131 Remove obsolete includes 2019-12-13 08:50:01 +01:00
Magne Sjaastad 3093d1ac90 Upped to 2019.08.2-dev.09 2019-12-11 09:53:55 +01:00
Magne Sjaastad 1628f01939 #5131 : Calculated curves : Use find in RimSummaryCalculationCollection 2019-12-11 09:47:26 +01:00
Magne Sjaastad 532d5899de #5131 : Calculated curves : Show native address in title 2019-12-11 09:47:26 +01:00
Magne Sjaastad 03581804e2 #5131 : Calculated curves : Always show legend text 2019-12-11 09:47:26 +01:00
Magne Sjaastad 8a88208f65 #5207 Curve Calculator : Move dialog to RiuPlotMainWindow 2019-12-11 09:29:41 +01:00
Magne Sjaastad c9f1028bf1 Merge pull request #5208 from OPM/move-curve-calculator 
Curve Calculator : Move dialog to RiuPlotMainWindow
 2019-12-11 09:28:21 +01:00
Magne Sjaastad 946eaf4878 #5207 Curve Calculator : Move dialog to RiuPlotMainWindow 2019-12-10 15:36:33 +01:00
Magne Sjaastad af2791da42 Set version to 2019.11.0-RC02 2019-12-06 14:47:39 +01:00
Magne Sjaastad 8e540efa37 Merge pull request #5199 from OPM/msw-fixes 
Several critical fixes for MSW export
 2019-12-06 14:39:13 +01:00
Magne Sjaastad fdb14dd49a Merge pull request #5199 from OPM/msw-fixes 
Several critical fixes for MSW export
 2019-12-06 14:37:04 +01:00
Magne Sjaastad b1e631c32f Fix notation 2019-12-06 14:16:22 +01:00
Magne Sjaastad db3b8937fa #5198 Export MSW : Move into separate functions 2019-12-06 13:34:52 +01:00
Magne Sjaastad 312caa7568 #5198 Export MSW : Add extra segment if user defined measured depth is above grid 2019-12-06 13:14:42 +01:00
Magne Sjaastad 3babbe675a #5197 Export MSW : Set minimum segment length to 1.0e-3 2019-12-06 12:10:34 +01:00
Magne Sjaastad 955d07f9ce #5196 Export MSW : Do not export segments before start measured depth 2019-12-06 10:10:02 +01:00
Magne Sjaastad d4b7797bb1 #5187 Info Box: Change defaults for Statistics Options 2019-12-06 07:47:19 +01:00
Magne Sjaastad 0cf05a4347 Merge pull request #5192 from OPM/change-defaults 
Info Box: Change defaults for Statistics Options
 2019-12-06 07:46:05 +01:00
Magne Sjaastad 4761938a72 #5187 Info Box: Change defaults for Statistics Options 2019-12-05 15:20:12 +01:00
Magne Sjaastad 948d193e3e #5189 Grid Case Group: Read Well Data Source when importing project 2019-12-05 14:29:53 +01:00
Magne Sjaastad e4d7595bb6 Merge pull request #5191 from OPM/read-well-data-on-load 
Read well data on load
 2019-12-05 14:27:47 +01:00
Magne Sjaastad 28dc11ac64 Merge pull request #5184 from OPM/feature-ensemble-rft-colors 
Feature ensemble rft colors
 2019-12-05 14:25:46 +01:00
Magne Sjaastad cebe0485da #5100 Regression Test : Avoid deleteLater() to have full control on memory management timing 2019-12-05 14:21:57 +01:00
Magne Sjaastad 2f2a2188fe #5100 Regression Test : Move summary dialog to main plot window 2019-12-05 14:21:35 +01:00
Magne Sjaastad 0af1b71607 Merge pull request #5190 from OPM/fix-timers 
Avoid timers being used from statically allocated dialog
 2019-12-05 14:21:01 +01:00
Magne Sjaastad 1f7818098a #5189 Grid Case Group: Read Well Data Source when importing project 2019-12-05 13:53:03 +01:00
Magne Sjaastad 8113782dd6 #5100 Regression Test : Avoid deleteLater() to have full control on memory management timing 2019-12-05 13:33:58 +01:00
Magne Sjaastad 41fbd7bcf5 #5100 Regression Test : Move summary dialog to main plot window 2019-12-05 13:32:48 +01:00
Magne Sjaastad d6bdc53ee5 #5185 Regression Test : Always set regression image size on snapshot commands 2019-12-05 11:56:10 +01:00
Magne Sjaastad ad648eadc1 Janitor : Guard access to undefined memory 2019-12-05 11:56:04 +01:00
Magne Sjaastad 7e22cc12b8 Merge pull request #5186 from OPM/snapshot-fixes 
Fix snapshot image size issues
 2019-12-05 11:54:17 +01:00
Magne Sjaastad 73869c0036 #5185 Regression Test : Always set regression image size on snapshot commands 2019-12-05 09:25:44 +01:00
Magne Sjaastad 6636ae7d64 Janitor : Guard access to undefined memory 2019-12-05 09:22:26 +01:00