OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 15:36:09 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,689 Commits 28 Branches 61 Tags 290 MiB
a5670cdb0e
Commit Graph

803 Commits

Author SHA1 Message Date
Magne Sjaastad
f727a6c4ee #3929 System : Always lock mutex before unlocking 2019-01-07 12:38:53 +01:00
Gaute Lindkvist
128208d35a Fix type in RiaColorTools contrastColor 2018-12-21 10:12:58 +01:00
Magne Sjaastad
d54c509b35 Add missing include 2018-12-21 10:10:11 +01:00
Gaute Lindkvist
9fdec77c94 #3919 Contrast colors for contour lines 2018-12-21 09:48:57 +01:00
Gaute Lindkvist
68fb72311e #3919 Implement a better threshold check for contrast colors 2018-12-21 09:48:56 +01:00
Magne Sjaastad
6f3097dd5f Merge remote-tracking branch 'origin/2018.11.01-patch' into dev 2018-12-21 08:46:27 +01:00
Magne Sjaastad
8011c9994d #3904 Summary : Always insert summary curve without H when match is found 2018-12-19 10:08:10 +01:00
Magne Sjaastad
b7e569d09a #3904 Summary : Move function 2018-12-19 10:07:33 +01:00
Magne Sjaastad
aaff5d33e5 #3841 Summary : Detect summary curves and corresponding history curves 2018-12-17 15:45:37 +01:00
Magne Sjaastad
560549a5cb #3841 Add compare to RiaStdStringTools 2018-12-17 07:55:20 +01:00
Gaute Lindkvist
3adb1cc4bd #3884 Implemented Valve Templates for MSW parameters 2018-12-14 16:03:04 +01:00
Magne Sjaastad
75a0a01952 #3841 Add compare to RiaStdStringTools 2018-12-14 12:25:14 +01:00
Gaute Lindkvist
e510237793 Make Qt5 fix for RiaApplication::launchUnitTests() a bit safer. 2018-12-11 15:39:12 +01:00
Gaute Lindkvist
f3a2f0c5b2 Fix build problem on Qt5 in relation to unit tests. 2018-12-11 15:32:08 +01:00
Gaute Lindkvist
4591d9f20e #3615 Fix z-order so packers are added after other components 
*  Valves are added last of all
* This way packers are displayed on top of perforation intervals and fishbones.
 2018-12-05 15:47:16 +01:00
Bjørn Erik Jensen
7b9520a8cc Application. Use the new FontCache for applicationwide font creation 2018-12-05 14:53:08 +01:00
Bjørn Erik Jensen
00d767f67c #3789 Annotations. Text appearance settings. New FontCache class 2018-12-05 14:39:07 +01:00
Magne Sjaastad
68bc466830 #3792 Use font 10 and 14 2018-12-03 14:19:49 +01:00
Gaute Lindkvist
9961b39473 Fix build problem on Linux with missing cvfBase.h 2018-12-03 10:58:49 +01:00
Jacob Støren
92a45e959e #3757 Rename RiuSelectionManager to Riu3dSelectionManager 2018-11-30 14:30:34 +01:00
Gaute Lindkvist
5c66b901c3 #3752 ResInsight code changes to build on both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
2414865dbe #3442 UI For ICD/ICV parameters 2018-11-29 15:24:39 +01:00
Bjørn Erik Jensen
d3db1a6075 #3777 Annotations. Use Bounding box to decide whether to draw an object or not 2018-11-29 14:28:33 +01:00
Bjørn Erik Jensen
4685d5981d Merge branch 'dev' into dev-deeper 2018-11-28 07:10:56 +01:00
Jacob Støren
29e6e08779 #3724 Added cycling default color to polyline import. Set default line thickness to 2. 
Refactored away unneccesary complexity. loadAndUpdate when opening project file. Toggle now working
 2018-11-27 17:54:42 +01:00
Gaute Lindkvist
70eca210bf #3765 Support Eclipse cases in Memory Management case list 2018-11-27 13:40:08 +01:00
Gaute Lindkvist
80d48fd669 Move QString include to cpp file of RiaStatisticsTool 2018-11-26 08:01:44 +01:00
Magne Sjaastad
f9a6957fae #3748 Statistics calculator : Add helper functions for (in)valid numbers 2018-11-23 10:12:23 +01:00
Magne Sjaastad
a225d1fd1a #3696 Non-Darcy perforation intervals : Remove unit constant from UI 2018-11-22 09:46:40 +01:00
Magne Sjaastad
bab90456c7 #3694 Stimplan : Add support for effective width using unit mm 2018-11-19 10:39:15 +01:00
Magne Sjaastad
9cd695278e #3695 Well path creation : Crash when creating a vertical well 
Caused by two identical reference points next to each other
 2018-11-16 08:43:19 +01:00
Magne Sjaastad
cfbbcacc23 #3634 Regression Test : Use flag to control OpenMP when building geometry 2018-11-12 07:33:08 +01:00
Magne Sjaastad
ae94785634 #3659 Regression Test : Make sure exported snapshots have same size 2018-11-11 12:58:51 +01:00
Magne Sjaastad
99f182e74d #3659 Regression Test : Use range based for 2018-11-11 12:57:51 +01:00
Magne Sjaastad
937e1f16d4 #3659 Regression Test : Extract functions 2018-11-11 11:52:53 +01:00
Gaute Lindkvist
c67469b410 #3627 2d Maps: Nearly true volume of intersection weighing + riOilVolume result 
* Takes the volume summation error from around 30% -> 1.5-2.0% for Norne and TEST10K_FLT_LGT_NNC for sample
spacing approximately the same as grid characteristic size.
* The latter part is for #3630 and adds a special case for calculating 2d Maps SUM of riOilVolume since it needs
to avoid using the actual riOilVolume 3d result but instead use SOIL to avoid multiplying by cell volume twice.
 2018-11-08 11:52:19 +01:00
Gaute Lindkvist
ef4b70d6e5 #3630 Implement volume calculation on grid 2018-11-08 11:52:19 +01:00
Magne Sjaastad
10394f1571 Move black from first to last palette color for well log plot curves 2018-11-06 13:37:01 +01:00
Magne Sjaastad
f30c87491c #3629 System : Add helper function to disable write and set field hidden 2018-11-05 14:42:39 +01:00
Magne Sjaastad
6bec1615e1 HoloLens : Improve icons 2018-11-02 13:02:32 +01:00
Bjørn Erik Jensen
fa81d0411c #3470 Inflow model. New algorithm for calculating averageflow distance 2018-11-02 09:10:05 +01:00
Bjørn Erik Jensen
af4d8ee817 Fix warnings 2018-11-01 09:32:26 +01:00
Magne Sjaastad
4831cffc99 Add missing include 2018-11-01 06:46:44 +01:00
Bjørn Erik Jensen
81608990a0 #3470 InFlow model. New class RiaCellDividingTools. Moved method from RigCellGeometryTools 2018-10-31 14:47:03 +01:00
Magne Sjaastad
715003f58e #3587 Clear all selections as part of delete of temporary LGRs 2018-10-30 14:02:27 +01:00
sigurdp
8ca73960f4 #3561 HoloLens: Establish sharing server session and publish visualization data to sharing server 2018-10-25 15:34:48 +02:00
Magne Sjaastad
bb674e7504 #3557 HoloLens : Add export folder to preferences 2018-10-25 09:25:53 +02:00
Magne Sjaastad
cdda4d74df #3541 HoloLens : Create dummy file backed feature 2018-10-22 12:36:14 +02:00
Magne Sjaastad
24a075499e #3541 HoloLens: Create session object 2018-10-22 12:36:14 +02:00
Magne Sjaastad
75174a47e8 Whitespace 2018-10-22 12:36:14 +02:00
Magne Sjaastad
822645e264 #3524 HoloLens : Add toolbar and icons for operations 2018-10-19 10:09:45 +02:00
Magne Sjaastad
6346ed012c clang-tidy : Remove redundant 'virtual' and add 'override' 2018-10-18 19:45:57 +02:00
Magne Sjaastad
16265273b9 #3512 System : Remove unused functions 2018-10-18 16:32:02 +02:00
Magne Sjaastad
766fea603e #3512 System : Remove unused functions 2018-10-18 15:14:25 +02:00
Magne Sjaastad
5a1acc124f #3512 System : Remove unused functions 2018-10-17 13:52:48 +02:00
Jacob Støren
d25d8a3fe4 #3506 Move well path geometry classes to a separate folder 2018-10-16 09:53:00 +02:00
Jacob Støren
5bf5e6c99d #3382 Remove libslvs from the code base, including some cleanup. 2018-10-16 09:20:44 +02:00
Gaute Lindkvist
2035df2739 #3492 Tidy up color code for well path components/completions and select colors that work better. 2018-10-12 15:05:22 +02:00
Magne Sjaastad
d1b48898a9 System : Make detection of path to diff2html more robust 2018-10-12 09:03:51 +02:00
Gaute Lindkvist
ade893099f #3490 Fix interpretation of fracture cell intersections in 3D view. 
* Also fix typo in variable name.
 2018-10-11 15:58:16 +02:00
Gaute Lindkvist
fbe7561896 #3482 Fix Eclipse property filter behaviour by reverting order of WellPathComponentType enum 2018-10-10 10:07:18 +02:00
Magne Sjaastad
06f91a6762 #3479 Input Case : Use default folder fallback to case folder 2018-10-10 10:06:07 +02:00
Magne Sjaastad
046c05e76e #3476 Regression Test : Use lastUsedDialogDirectoryWithFallbackToProjectFolder 2018-10-10 08:02:41 +02:00
Magne Sjaastad
fd5b9653ba #3476 Regression Test : Add fallback to project folder 2018-10-10 08:02:41 +02:00
Gaute Lindkvist
e61e71ecbf #3467 Improved code using RimWellPathComponentInterface 2018-10-09 14:05:57 +02:00
Gaute Lindkvist
1019eeaa6a #3467 New interface class for completions +use RiaDefines::CompletionType 2018-10-09 14:05:57 +02:00
Magne Sjaastad
2f61681642 #3472 Regression Test : Use git to produce diff of exported files from ResInsight 2018-10-08 11:45:41 +02:00
Magne Sjaastad
85197661fe #3472 Regression Test : Add GitDiff 2018-10-08 11:41:35 +02:00
Gaute Lindkvist
fbc49e2b02 #3443 MSW: Visualise perforations, fishbones, packers and fractures in well log plots 2018-10-05 15:35:15 +02:00
Bjørn Erik Jensen
116b36bbc8 #3454 ExportProperty. Default result type set to undefined. Search through types when type not specified 2018-10-04 13:51:51 +02:00
Magne Sjaastad
a083e70ea1 #3428 Text string creation based on date and time : Add helper function 2018-10-03 08:44:01 +02:00
Bjørn Erik Jensen
76b992c7ed Fix warning 2018-10-02 08:15:27 +02:00
Jacob Støren
1ece11b7c4 #3393 handle 0 dogleg/ inf radius in J Curve calculator 2018-09-28 15:17:23 +02:00
Jacob Støren
f4761b55ab #3393 Continous sensible tangent calculation for targets wo tangent constraint. 
Using abs(90 -inclination) and inverse distance as weights.
Moved well path calculations into a separate class
 2018-09-28 15:15:38 +02:00
Jacob Støren
71c36208c3 #3422 Handle straight well paths better 2018-09-28 15:09:46 +02:00
Magne Sjaastad
acf6a17c40 Fix warnings 2018-09-27 20:49:47 +02:00
Jacob Støren
478160fdfe #3387 Add "Show Well Plan" command 2018-09-26 12:40:15 +02:00
Jacob Støren
4170a57bf2 #3387 Add additional output from the ArcCurveCalculator 2018-09-26 12:40:15 +02:00
Jacob Støren
170da81287 #3387 Add epsilon to handle singularities in OffshoreSphericalCoords 2018-09-26 12:40:15 +02:00
Magne Sjaastad
b999a14aaf #3413 Well Path Import : Avoid similar default color 2018-09-25 14:36:50 +02:00
Magne Sjaastad
f61b82dd35 System : System : Introduce compiler warning 4456 with fixes 2018-09-25 07:37:40 +02:00
Jacob Støren
5a9a5ba803 #3407 Default color palette for new well paths 2018-09-24 16:41:57 +02:00
Jacob Støren
d5d18bde09 #3353 Use ArcCurveCalculator instead of ad-hoch function 2018-09-24 15:50:57 +02:00
Jacob Støren
41b24a8de2 #3353 Improve error messages from arc based geometry calculators. 
Color dogleg text red if the constaint is not satisfied
 2018-09-24 15:49:16 +02:00
Magne Sjaastad
0f99ecf9e6 #3224 Add validAggregatedWeight() to geometric mean calculator 2018-09-24 15:09:27 +02:00
Gaute Lindkvist
e4a5eb2769 #3384 Add RiaApplication::enableDebugFeatures method that checks environment for RESINSIGHT_DEBUG 
* Disable System tab of preferences if this is not enabled.
 2018-09-21 12:51:36 +02:00
Magne Sjaastad
7adf7e1e31 Fix some warnings 2018-09-20 16:24:11 +02:00
Gaute Lindkvist
5a3d036732 Implement --replaceCase for ODB files 2018-09-19 11:57:35 +02:00
Jacob Støren
0259eb6402 #3252 Add solver and curve status enums to communicate more fine grained 
how the S-curve result is.
Adjusted tests. Enabled two configs now reporting and solving correctly.
Disabled three that now cant converge
 2018-09-19 10:23:23 +02:00
Jacob Støren
e49712fd50 #3252 Cleanup. Disabled experiments. Trying the simple solution. 2018-09-19 10:23:23 +02:00
Jacob Støren
944ba7cfd8 #3252 Tried updating jacobi. Not quite sccessful 2018-09-19 10:23:22 +02:00
Jacob Støren
fdbfd30d31 #3252 WIP: Internal iterative solver in place. Needs improvement. 2018-09-19 10:23:21 +02:00
Jacob Støren
007149b544 #3252 WIP: Home brewn iteration loop to find correct Q1Q2 points giving requested R1 and R2 2018-09-19 10:23:20 +02:00
Gaute Lindkvist
38c2c9c237 #3339 Make order of summary curves in plot predictable. 
* The issue is sorting on pointer address for ensembles and summary cases. Instead sort by name.
* The crucial changes are in RiaSummaryCurveDefinition.cpp, RimSummaryCase and RimSummaryCaseCollection.
* The rest of the changes are just fallout from changing the pure virtual method RimSummaryCase::caseName to be const. The rest just follows.
* RimGridSummaryCase::caseName does alter something, but this variable was already declared mutable.
 2018-09-18 11:31:10 +02:00
Bjørn Erik Jensen
044dbb14a7 Move string transform 2018-09-17 14:55:12 +02:00
Gaute Lindkvist
9953c56c35 Make mean calculators more consistent and add an harmonic mean calculator. 2018-09-17 10:51:45 +02:00
Bjørn Erik Jensen
b4dd37337a #3318 Plot editor performance. Several performance fixes 2018-09-13 12:38:50 +02:00
Magne Sjaastad
08449ceb9e #3343 HoloLens Export : Add factory to create option items for views 2018-09-12 11:44:11 +02:00
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