Commit Graph

705 Commits

Author SHA1 Message Date
Magne Sjaastad
b604d26e90 #3340 Fix some warnings 2018-09-11 21:56:15 +02:00
Gaute Lindkvist
11253f2dbd Make RiaWeightedAverageCalculator a template class. 2018-09-07 10:49:00 +02:00
Bjørn Erik Jensen
2c5c007048 #3302 Weighted Geometric Mean Calculator. Improved algorithm 2018-09-03 09:56:06 +02:00
Bjørn Erik Jensen
130828416d #3281 Add weighted geometric mean calculator 2018-08-31 09:12:11 +02:00
Bjørn Erik Jensen
6b2359cb39 #3091 Completion export. Add WELSPECS/WELSPECL to exported file 2018-08-29 13:36:33 +02:00
Magne Sjaastad
9e3a100bcc #3253 OpenMP : Give name to all critical sections 2018-08-27 13:04:29 +02:00
Bjørn Erik Jensen
6f421e0990 #3180 Add multiple fraction create command (CommandFile) 2018-08-22 11:10:10 +02:00
Gaute Lindkvist
1e77c9308a #3209 Make sure project tree is initialised when creating the plot window.
* Also ensure the main plot window is created before attempting to set a brand new plot as an MDI window.
* This ensures the MDI view controller has been created, otherwise the new plot MDI window will not be shown in the main plot window when the main plot window is created.
2018-08-17 10:54:40 +02:00
Magne Sjaastad
fa25f448a1 #3089 Non-Darcy longitudinal : Use weighted average calculator 2018-08-15 15:52:06 +02:00
Magne Sjaastad
59f9d189e5 #3214 Use template function to get referencing objects of specified type 2018-08-15 13:01:11 +02:00
Magne Sjaastad
4c75e2514d #3089 Move text parsing for unit conversion 2018-08-15 09:53:52 +02:00
Magne Sjaastad
e195eed246 #3210 Helper class used to compute weighted average 2018-08-15 09:53:52 +02:00
Jacob Støren
088dd61fd8 #3201, #3202 Add end tangent access and some better handling of errors 2018-08-14 11:41:20 +02:00
Jacob Støren
9025cedecb #3204 Add double precision to OffshoreSphericalCoords 2018-08-14 11:41:20 +02:00
Jacob Støren
92dd375da3 #3201 Fix error discovered by unit test 2018-08-14 11:41:19 +02:00
Jacob Støren
fb7a7e39eb #3201 #3202 Split in separate files. Move offshore spherical coords stuff to separate file in RiaTools 2018-08-14 11:41:19 +02:00
Bjørn Erik Jensen
8b14a01a2b #3200 Plot editor. Remove curve sets correctly 2018-08-14 11:01:19 +02:00
Jacob Støren
840f011346 #2608 Guard input and and validate output of SolveSpace SCurve calculator.
Now fallback is used in most cases where needed
2018-08-10 15:57:41 +02:00
Jacob Støren
752510fab2 #2608 Use Solve Space solver in an iterative fashion 2018-08-10 15:57:40 +02:00
Jacob Støren
5cdde7f851 #2608 Fix error in analythical control point based S-Curve calculation.
Seed SolveSpace solution with estimated solution.
Add (disabled) test covering all configurations of curves for ctl point based curve
2018-08-10 15:57:40 +02:00
Jacob Støren
1fff2dfa97 #2608 Prepare to find a correct seeding of the SolveSpace S-curve solver
Extracted the inital values to a separate section.
Use an explicit fallback calculation (based on control points) if the solvespace one fails
2018-08-10 15:57:40 +02:00
Magne Sjaastad
e21fe9b706 RegTestRunner : Add removeDirectoryAndFilesRecursively 2018-08-10 08:23:08 +02:00
Magne Sjaastad
5054a01dbe RegTestRunner : remove test generated folder 2018-08-09 15:37:02 +02:00
Bjørn Erik Jensen
8c0d9ab377 #3162 Resampling. Add missing include 2018-07-06 14:19:39 +02:00
Bjørn Erik Jensen
b8fbbc63f0 #3162 Resampling. INF values ignored in calc 2018-07-06 14:14:15 +02:00
Bjørn Erik Jensen
3f1ad163ea #3151 Resampling. Use 0 value outside the defined time range, for weighted mean calcs. Update unit tests 2018-07-06 11:35:16 +02:00
Jacob Støren
7156b99b88 #2608 #2609 Add disabled Solvespace S-curve calculation. Use simplified S-curve calculation. Cleaned up Gui to only whats supported. 2018-07-04 17:02:20 +02:00
Jacob Støren
95c396ce77 #2609 Make modeled well path visible when loading project file 2018-07-02 16:55:32 +02:00
Jacob Støren
0f39356fcb #3135 Create a class to do sampling of an poly-arc-line 2018-07-02 16:31:55 +02:00
Bjørn Erik Jensen
0baf2226a2 #3087 Show plot data. Do not display tabs when only ascii data curves exist. Bugfixes 2018-07-02 13:06:07 +02:00
Bjørn Erik Jensen
13e5a3214b #3087 Show plot data. Display tabbed dialog for summary data 2018-07-02 11:45:14 +02:00
Gaute Lindkvist
0a0cb584b5 Move hard coded parameter names to RiaDefines 2018-07-02 10:29:32 +02:00
Gaute Lindkvist
0d9f810718 Make sure plot window is activated after creating/opening it. 2018-07-02 10:29:31 +02:00
Gaute Lindkvist
e39a34cd0d Add some features to well log plot, track and curve creation.
* Needed for creating the well bore stability plots
* Add ability to set plot and track titles
* Make updating and refreshing plots optional when adding curves/tracks so it can be done at the end instead.
* Optionally set custom titles to the plots and tracks.
2018-07-02 10:29:31 +02:00
Magne Sjaastad
082f8be6b2 Set default unit system for fractures based on loaded cases 2018-06-28 11:13:42 +02:00
Magne Sjaastad
b4f8df50a2 Guard null pointer access 2018-06-28 09:52:40 +02:00
Magne Sjaastad
50be372425 Regression Test : Compare CaseInsensitive 2018-06-28 09:52:40 +02:00
Bjørn Erik Jensen
28d093f54a #3086 Resampled plot export. When data are resampled, write all data into the same table in export file 2018-06-27 11:05:55 +02:00
Bjørn Erik Jensen
b0355471b4 #3082 Statistics. Further fixes regarding P10 and P90 labels 2018-06-26 11:29:05 +02:00
Bjørn Erik Jensen
b6240049a9 #3082 Statistics. Different meaning of P10 and P90. Switch labels 2018-06-26 08:48:58 +02:00
Bjørn Erik Jensen
898df5b68a #3096 Implemented ensemble calulations 2018-06-25 15:15:30 +02:00
Gaute Lindkvist
5fc795a24a #3061 Implement Memory Cleanup for eclipse data. 2018-06-20 11:46:19 +02:00
Bjørn Erik Jensen
2eef989389 #3060 Resampled plot export. Implement dialog. Resample plot data according to spec from Equinor 2018-06-20 09:41:01 +02:00
Bjørn Erik Jensen
7e6943aa96 #3060 Resampled plot export. Prepare for resampling during summary plot export 2018-06-19 15:44:27 +02:00
Gaute Lindkvist
d13a52a8b4 #3058 Implement a memory cleanup dialog for GeoMech data. 2018-06-19 12:20:21 +02:00
Bjørn Erik Jensen
d5ec3b1db3 #3057 Resampled plot export. Add more resample periods. Add unit tests 2018-06-18 14:10:11 +02:00
Jacob Støren
ecd8f7cfd8 Fix compiler warnings 2018-06-15 14:47:42 +02:00
Bjørn Erik Jensen
4c25ba8c7d #2659 Ensemble statistics. Interpolate values when resampling for end of period calculation 2018-06-13 15:19:34 +02:00
Gaute Lindkvist
280656ca26 #3043 Implement Time step filtering on import for Geomech 2018-06-13 14:10:47 +02:00
Bjørn Erik Jensen
2eee3f770b #2659 Ensemble statistics. Small fixes 2018-06-13 13:35:33 +02:00
Bjørn Erik Jensen
848d774440 #2659 Ensemble statistics. Fix code error 2018-06-12 11:15:30 +02:00
Bjørn Erik Jensen
1137a916e0 #2659 Ensemble statistics. Add time history resampler class. Extended RiaQDateTimeTools class 2018-06-12 11:05:53 +02:00
Bjørn Erik Jensen
eebd8bef2d Move RigCurveDataTools and RigTimeHistoryCurveMerger to Application/Tools plus rename 2018-06-08 15:10:45 +02:00
Magne Sjaastad
d353a9fc44 #3012 Selection manager is not cleared when project is closed 2018-06-06 12:36:28 +02:00
Bjørn Erik Jensen
10b3d0f6db #2776 Error bars. Moved eclipse address parsing to RifEclipseSummaryAddress class 2018-05-28 11:20:20 +02:00
Gaute Lindkvist
4c6a56bb52 #2873 Do only one updateAllRequiredEditors when closing cases
* Instead of one for every case that is being closed.
2018-05-23 14:38:26 +02:00
Bjørn Erik Jensen
22c71b60dd #1776 CVS data parser. Made parsing more generic. Handle error result columns 2018-05-23 12:33:26 +02:00
Bjørn Erik Jensen
8f5c3436ce #1776 CSV data parser. Remove double spaces in column names 2018-05-23 12:33:26 +02:00
Jacob Støren
9b9f9b2bf1 #2939 ProgressInfo: Reintroduce process envents, to update the progress dialog durig processing on linux/mac.
Introduced isActive and used this info to block sheduled redraw/display model regen when progress bar is active, to avoid unintended recursive behaviour resulting in crashes.
2018-05-21 23:46:35 +02:00
Jacob Støren
d7cffba9f1 #2940 Covert old project file geomech camera mx to new display offsetted regime 2018-05-18 21:38:49 +02:00
Magne Sjaastad
82d6db94cb WIP : try to fix import of geomech project files 2018-05-18 19:23:36 +02:00
Gaute Lindkvist
79928702bf #2920 Save window state for main window when closing plot window last (and vice versa). 2018-05-16 08:55:34 +02:00
Gaute Lindkvist
461d22b2b5 #1908 Stop creating new summary cases when opening a project file. 2018-05-15 16:20:25 +02:00
Gaute Lindkvist
0c9470fdf0 #2913 Improve coupling between egrid and summary cases
* Convert RimGridSummaryCase to RimFileSummaryCase when closing grid.
2018-05-15 15:43:21 +02:00
Bjørn Erik Jensen
7103ff73a2 Renaming 'Restart Files' to 'Origin Files' 2018-05-15 15:08:25 +02:00
Jacob Støren
d34e517968 #2917 Vector Selection Dialog: Fix missing selection text 2018-05-15 14:26:28 +02:00
Jacob Støren
6c6e7df3c9 #2917 Vector Selection Dialog: Fixed problem with dialog initialization when single selecting ensemble curve sets. 2018-05-15 14:26:28 +02:00
Jacob Støren
9b591f622c #2917 SummaryCurveDefinition: Remove pair, improve less operator 2018-05-15 14:26:28 +02:00
Magne Sjaastad
9eb16f22cd #955 Toolbar Button State : Update plot toolbars when eclipse case is imported 2018-05-15 10:56:31 +02:00
Bjørn Erik Jensen
6edd240c4c #2912 Ensemble curves. Fixes regarding summary curve definitions 2018-05-15 10:12:04 +02:00
Bjørn Erik Jensen
7c0017923c #2658 Ensemble curves. Warning when too many ensemble curves 2018-05-14 14:52:02 +02:00
Bjørn Erik Jensen
4e9dfafe02 #2894 Summary cases. Moved code to more appropriate location 2018-05-11 09:53:03 +02:00
Bjørn Erik Jensen
3ad7c11040 #2894 Summary cases. Select case after import from recent file menu 2018-05-11 09:08:14 +02:00
Bjørn Erik Jensen
6270dd3bc9 #2692 Ensemble curves. Add ensemble selection support to curve editor 2018-05-10 21:30:14 +02:00
Magne Sjaastad
a986f3a4d2 #2868 Completion Type : Simplify update code paths 2018-05-09 11:48:37 +02:00
Magne Sjaastad
9bb8f36052 #2868 Completion Type : Compute completion type based on virtual connection factors 2018-05-09 11:48:37 +02:00
Magne Sjaastad
89930e15f7 #2803 Logging : Make calling of RiaLogging thread safe 2018-05-04 13:53:54 +02:00
Jacob Støren
2f80e99abc #2829 Add overall handling of std::bad_alloc exception with a message box. Now the user can know what is happening, and possibly save his work. On linux this will only work sometimes unless sysctl vm.overcommit_memory = 2 2018-05-03 10:11:30 +02:00
Bjørn Erik Jensen
92fd4183a9 #2797 Ensemble curves. Support for text ensemble parameters. Unit test 2018-05-03 09:55:13 +02:00
Bjørn Erik Jensen
b686c1a081 Hierarchy dialog. Removed duplicate definition 2018-04-30 15:33:04 +02:00
Bjørn Erik Jensen
7ff30a13d1 #2813 Fix logic for removing common root path 2018-04-27 12:43:32 +02:00
Magne Sjaastad
23c439fe6b #2831 StatusBar : Hide statusBar during regression test execution 2018-04-27 12:40:46 +02:00
Magne Sjaastad
c267f32638 Rename to RiuPlotMainWindow 2018-04-27 06:28:08 +02:00
Magne Sjaastad
132db2bb1e #2798 Dock Widgets : Improve menus and handling of tabbed dock widgets
Create dock widgets based on static names
Build Windows menu based on static names
Wire up toggleView actions to RiuDockWidgetTools
Change dock widget visibility based on view
2018-04-26 20:05:42 +02:00
Jacob Støren
4a7f54689e #2799 Origin Summary Cases: Fix option order in preference dialog 2018-04-25 11:21:30 +02:00
Gaute Lindkvist
c5e4bf93a6 Summary Case Import cleanup (#2795) 2018-04-25 09:25:35 +02:00
Gaute Lindkvist
f456911c80 #2794 Summary Case Import: Improve error reporting.
* When an error is found with one summary case file, continue importing all the files that worked.
* Report an error in the log window and a message box afterwards about the case that failed.
* Fix crash when loading .EGRID file without a summary case.
2018-04-24 14:19:08 +02:00
Magne Sjaastad
4eec46cbdc #2770 Fracture : Extract startTimer() 2018-04-20 14:22:55 +02:00
Magne Sjaastad
9550864c9e #2711 Project File : Use forward slash for project file path in XML 2018-04-20 10:07:00 +02:00
Bjørn Erik Jensen
c3ae45e748 #2766 Bugfix. Import egrid files even though there are no associated summary files 2018-04-20 08:28:04 +02:00
Bjørn Erik Jensen
a8fb4469b4 Fix a bug in commonRootPath logic 2018-04-17 11:01:45 +02:00
Bjørn Erik Jensen
0fcc0bea4c 2743 Origin summary import dialog adjustments 2018-04-16 14:11:31 +02:00
Bjørn Erik Jensen
e5e9692eb5 #2710, #2719 Restart preference and dialog adjustments. And some bugfixes 2018-04-13 15:47:43 +02:00
Bjørn Erik Jensen
9f40679f22 #2555 Bugfix 2018-04-13 15:47:43 +02:00
Bjørn Erik Jensen
d7e7c4a463 #2720, #2686, #2701 Origin summary and grid cases import enhancements 2018-04-13 15:47:42 +02:00
Bjørn Erik Jensen
3f429ccfd7 #2555 Add canonicalPath method to improve path handling 2018-04-10 13:11:59 +02:00
Bjørn Erik Jensen
ee9e9b2989 #2685 Origin summary. Split preferences settings into two fields 2018-04-09 13:22:05 +02:00
Gaute Lindkvist
63ffade452 Set background and frame color from the view plus update frame margins. 2018-04-09 13:14:19 +02:00
Magne Sjaastad
50212fff0d #2553 Well CF Visualization: Add findOrCreateSimWellExtractor() 2018-04-05 14:25:47 +02:00
Bjørn Erik Jensen
a86fe5deb9 Fix Linux build error 2018-03-20 14:57:11 +01:00
Bjørn Erik Jensen
148d058d88 #2555 Open summary restart dialog if necessary when opening egrid files 2018-03-20 14:32:56 +01:00
Bjørn Erik Jensen
d5bbeffdd0 #2555 Refactored summary restart file import 2018-03-20 14:32:55 +01:00
Bjørn Erik Jensen
2f11395525 #2555 Add preferences for summary restart file import 2018-03-20 14:32:55 +01:00
Bjørn Erik Jensen
2a84cb6ddf #2555 Handle import to separate cases 2018-03-20 14:32:55 +01:00
Magne Sjaastad
0aba950c12 #2544 Well CF Visualization: Use coordinate on well path as center 2018-03-14 14:35:45 +01:00
Magne Sjaastad
2bf0773815 #2546 Well CF Visualization: Recompute data when required 2018-03-14 14:35:45 +01:00
Magne Sjaastad
716bb3184b System : Replace tab with four spaces 2018-03-12 11:12:39 +01:00
Magne Sjaastad
4c19be91ac #2554 Regression Test : Ignore line endings when using diff tool 2018-03-09 09:00:44 +01:00
Jacob Støren
0bdde36aa3 Merge #51 Legend background and #2478 Edge axis top into dev 2018-03-08 16:22:13 +01:00
Jacob Støren
4d7f753d3c #51 Add preference option to control legend background 2018-03-08 16:15:45 +01:00
Magne Sjaastad
0629551fa8 #2583 Remove obsolete code, moved to RiaRegressionTestRunner 2018-03-08 10:57:06 +01:00
Magne Sjaastad
ca36e0a7cc #2583 Add missing include 2018-03-08 10:31:21 +01:00
Magne Sjaastad
4f7291c95d #2583 System : Move regression test framework to separate class 2018-03-08 10:15:51 +01:00
Magne Sjaastad
cec745d08a #2554 Regression Test : Add text file compare tool and display folder in test config 2018-03-07 09:30:15 +01:00
Magne Sjaastad
91428a028d #2554 Regression Test : Reorganize setting of current working folder 2018-03-07 09:30:15 +01:00
Magne Sjaastad
2e122d2ab3 #2554 Regression Test : Move serialization code into RiaRegressionTest 2018-03-07 09:30:15 +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
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
Magne Sjaastad
cbb25cb514 #2561 Fracture Template : Set Default Conductivity Result in loadDataAndUpdate() 2018-03-06 08:16:39 +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
2f023f4016 Argument parser. Add ignoreArgs argument for testing purposes 2018-03-05 10:52:24 +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
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
Rebecca Cox
2d931a81f5 #2523 Mohr circle: Remove colors from circles 2018-02-27 14:09:31 +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
cbbc9c0f26 #2496 Tensor vectors: Two new paletts 2018-02-27 09:39:47 +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
Rebecca Cox
bf1a621332 #2523 Mohr Circle: Improve circle appearence 2018-02-22 18:10:24 +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
1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +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
a283a468c2 #2447 Fracture : Show fracture legend when only ellipse fractures are present 2018-02-06 12:42:13 +01:00
Jacob Støren
7dbffd0075 Add error to messages window if a requested regression test is not found. 2018-02-05 17:56:40 +01:00
Bjørn Erik Jensen
c09dd0522b Merge branch '2018.01.01-patch' into dev. #2086 2018-02-05 08:29:24 +01:00
Bjørn Erik Jensen
98a94c0525 #2086 Moved RifStringTools -> RiaStringEncodingTools 2018-02-02 15:44:28 +01:00
Magne Sjaastad
a4eb16883b #2441: Fracture Colors : Make sure conductivity result is set on template for old project files 2018-02-01 15:37:05 +01:00
Rebecca Cox
47d8508196 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-26 10:29:01 +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
001742cbd3 #2402 Fracture : Add support for multiple conductivities on a template 2018-01-25 14:17:10 +01:00
Jacob Støren
d34b3a7c74 #2331 Add 2d Intersection View collection with automatic views. The create command is adjusted into a "Show" command. 2018-01-23 14:37:52 +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
828557f71f Whitespace and include cleanup 2018-01-17 09:23:45 +01:00
Jacob Støren
b092565a61 #2331 Introduce new intermediate class RimGridView 2018-01-15 14:53:48 +01:00
Jacob Støren
4b26354b30 #2331 Moved redraw scheduling and completion type recalc out of RiaApplication 2018-01-12 12:01:04 +01:00
Magne Sjaastad
7511e8a243 #2322 New View : Improve default values when creating view 2018-01-12 10:55:00 +01:00