Commit Graph

2561 Commits

Author SHA1 Message Date
Magne Sjaastad
e38b7329d1 #1469 Use time step strings from case 2017-05-15 09:17:06 +02:00
Bjørnar Grip Fjær
59f55f0c06 Move well path completion property editor label to top 2017-05-12 10:49:48 +02:00
Bjørnar Grip Fjær
a399f54ed7 #1470 Fishbones : Perforation intervals visualization 2017-05-12 10:02:00 +02:00
Bjørnar Grip Fjær
1d14971bee Consistent formatting in well path completions property editor 2017-05-12 10:02:00 +02:00
Bjørnar Grip Fjær
dc4e7e0773 #1451 Add table editor for perforation intervals 2017-05-12 10:02:00 +02:00
Bjørnar Grip Fjær
5a8a632082 #1451 Add command for adding new perforation interval 2017-05-12 10:01:59 +02:00
Bjørnar Grip Fjær
d3bcc1644c #1451 Add data structures for perforation intervals 2017-05-12 10:01:59 +02:00
Magne Sjaastad
4204d49f30 #1469 Add checkbox for legend visibility 2017-05-11 21:44:44 +02:00
Bjørnar Grip Fjær
265969f246 Improve property editor for well path completions 2017-05-11 11:19:55 +02:00
Magne Sjaastad
84b922ba82 #1476 Include isFile() when checking if a file exists 2017-05-11 09:23:13 +02:00
Bjørnar Grip Fjær
f78b4db16c #1467 Fix how coordinates are displayed in property editor for well path completions 2017-05-10 17:37:50 +02:00
Bjørnar Grip Fjær
15bac1b050 #1468 New feature 'Import Completions' 2017-05-10 17:09:54 +02:00
Bjørnar Grip Fjær
34f00b07ef #1467 Data structure for completions 2017-05-10 17:03:10 +02:00
Bjørnar Grip Fjær
bf704caa16 #1475 Move well path import to own module 2017-05-10 12:19:46 +02:00
Jacob Støren
141ce6b54b #1381 Well Flow Plots show phase split (Oil Gas Water)
Flow rates are explained in the plots as Surface/reservoir flow rates. Unit for field is [stb]/day for all fluids
2017-05-08 16:02:42 +02:00
Magne Sjaastad
42e2294eca Merge remote-tracking branch 'origin/dev' into fishbones 2017-05-08 11:07:33 +02:00
Magne Sjaastad
342a58a0ae #1452 Fishbones : Export laterals to text file 2017-05-08 10:48:11 +02:00
Magne Sjaastad
b0c5ceeab6 #1442 Moved geometry functions to RigFishbonesGeometry 2017-05-08 08:00:55 +02:00
Magne Sjaastad
dce5f80191 Fix signed/unsighed compare 2017-05-05 14:51:00 +02:00
Magne Sjaastad
2d4e4b47b3 #1441 Add skin factor and rename UI 2017-05-05 14:11:46 +02:00
Magne Sjaastad
f326d5e2a3 #1441 Add skin factor and rename UI 2017-05-05 13:45:07 +02:00
Magne Sjaastad
414733899e Fishbones : Add model and visualization 2017-05-05 12:23:29 +02:00
Magne Sjaastad
2dcf3c75f5 Fishbones : Propagate displayCoordTransform to well path part manager 2017-05-05 12:18:37 +02:00
Magne Sjaastad
a8cab547a0 1251 Added RivObjectSourceInfo for selecting any pdmObject 2017-05-05 12:18:10 +02:00
Bjørnar Grip Fjær
cd8ad75db5 #1445 Use correct colors in pie chart for well alloc plots in well flow mode 2017-05-03 13:39:36 +02:00
Bjørnar Grip Fjær
3fc0a59f06 #1444 Reallocate summary case file names when opening project 2017-05-03 12:32:03 +02:00
Jacob Støren
15d3e08f70 Adjust the TVD warning for LAS curves 2017-05-02 14:31:05 +02:00
Jacob Støren
33468faa28 Adjust headers in Advanced Snapshot Export dialog table 2017-05-02 12:03:55 +02:00
Bjørnar Grip Fjær
7440b49e5b #1438 Rename tracer selection options to indicate all producers and/or selectors are used 2017-05-02 11:25:15 +02:00
Jacob Støren
59d239cfab Add project tree context command on Simulaton Wells to create well log extraction curve 2017-05-02 07:47:51 +02:00
Bjørnar Grip Fjær
f4aa49b31e #1006 Add legend control for well log file and well log extraction curves 2017-05-01 20:13:13 +02:00
Magne Sjaastad
174d658219 #1384 Relocate filenames containing faults when opening project 2017-04-27 12:11:48 +02:00
Bjørnar Grip Fjær
2bb2405682 #1434 Specify tracer selection options are for open injectors and producers, not all 2017-04-27 12:08:41 +02:00
Bjørnar Grip Fjær
6596186df8 #1435 Auto apply changes to summary curve filter by default 2017-04-27 11:38:41 +02:00
Bjørnar Grip Fjær
74d783d5a3 #1435 Capitalize Settings in "Appearance Settings" 2017-04-27 11:36:02 +02:00
Bjørnar Grip Fjær
cd9f496ea9 #1435 Move contribute to legend to curve name configuration 2017-04-27 11:35:05 +02:00
Jacob Støren
ff1b8c6db8 Fix assert in Show Contibuting Wells due to wrongful use of firstAnchestorOf 2017-04-27 10:22:14 +02:00
Magne Sjaastad
7ff27a1938 #1384 Use case insensitive path part compare on Windows 2017-04-27 08:14:42 +02:00
Bjørnar Grip Fjær
7dc903102d #1425 Disable flow diagnostics results for time history curves 2017-04-26 17:07:39 +02:00
Bjørnar Grip Fjær
b91af15214 #1428 Respect current timestep of well log extraction curves when getting flow diagnostics result address 2017-04-26 16:59:52 +02:00
Bjørnar Grip Fjær
76f55c211f #1031 Fix parallel projection for linked Eclipse and GeoMech cases 2017-04-26 15:18:14 +02:00
Bjørnar Grip Fjær
ad4657d610 #165 Use original days since simulation start when plotting time history curves 2017-04-26 09:41:04 +02:00
Bjørnar Grip Fjær
cf18f5324f #165 Keep original days since simulation start 2017-04-26 09:41:04 +02:00
Jacob Støren
6f07a3698b #1427 Enable the new Well Log Curve command for Simulation Wells 2017-04-25 16:12:55 +02:00
Jacob Støren
1f7c357b67 #1427 Add simulation Well and branch index to well log extraction curve and make the extraction work in those cases. 2017-04-25 16:12:55 +02:00
astridkbjorke
a5e3e864fb pre-proto - Cleanups in code. Renamings and adding functions global index in array of RigStimPlanCell for simplified interaction with these 2017-04-25 16:08:44 +02:00
Bjørnar Grip Fjær
63cd817b85 #964 Improve code robustness in defineEditorAttribute 2017-04-25 10:31:56 +02:00
Bjørnar Grip Fjær
68cb4ab54f Better naming of legend configuration properties 2017-04-25 10:31:56 +02:00
Bjørnar Grip Fjær
19b9afe4cb Use cleaner vector iteration 2017-04-25 10:31:56 +02:00
Bjørnar Grip Fjær
50d9904cf7 #1006 Add support for toggling legend and don't show legend for curves without a name 2017-04-24 16:43:31 +02:00
Bjørnar Grip Fjær
05fb8b8da3 Better naming of eclipse reload data function 2017-04-24 12:10:18 +02:00
Bjørnar Grip Fjær
274a108235 #1429 Fix issue with curve colors and symbols for all cases being the same 2017-04-24 12:09:52 +02:00
Jacob Støren
009218e3ec #1422 WLP: Set case and flow diag solution in resultDefinition when switching case in gui. Use the case from the result definition instead of wrong search when updating default flow solution 2017-04-24 11:24:36 +02:00
Bjørnar Grip Fjær
813652477d #1001 Reload all plots when a case is reloaded 2017-04-21 16:05:25 +02:00
Bjørnar Grip Fjær
201ff5699d #1004 Add reload function to eclipse cases to reload all data from file 2017-04-21 12:03:04 +02:00
astridkbjorke
ed03d1fb8e #1417 - pre-proto - Adding function for calculating perforation length in center cell - need to be extended for cases where perforation interval goes outside the center stimPlan cell. 2017-04-21 09:41:52 +02:00
astridkbjorke
8351c6f9d0 #1415 - pre-proto - Adding function for identifying the StimPlanCell though which the well pass, and use this cell in calculation of radial transmissibility to well. Some error in pointers not yet sorted out... 2017-04-21 09:41:52 +02:00
Magne Sjaastad
d532adcec0 #1421 StimPlan : Invert z-values when reading from XML 2017-04-21 09:29:28 +02:00
Jacob Støren
fdac0ea887 #1419 Ensure property filters of categories are loaded properly from file
The category list was not set properly in the propertyFilter base class when the project was loaded.
The concept that list has to be set, and updated is fragile.
2017-04-20 16:22:33 +02:00
Jacob Støren
b113e81385 #1418 Hide the relative results options in GeoMech Result Definition
Avoid decorating the Active Fomation Names with "_D<N>" if relative results is enabled
2017-04-20 16:22:33 +02:00
Jacob Støren
2745d857d0 #1381 Wip: Well Alloc Plots split by phase without flow diagnostics
This is implemented, but turned off as Ert did not seem to deliver correct phase flow rates. Can be enabled as soon as Ert is improved and updated.
2017-04-20 16:22:33 +02:00
Magne Sjaastad
c35e79c3b5 Merge branch 'dev' into pre-proto 2017-04-20 13:40:56 +02:00
Magne Sjaastad
d364e045aa Merge branch 'dev' into hdf-prototype 2017-04-20 13:05:04 +02:00
Bjørnar Grip Fjær
1e3af05879 Remove unused variable 2017-04-19 16:41:12 +02:00
Bjørnar Grip Fjær
f7d72c2f60 #1073 Stable coloring of cases and wells in summary 2017-04-19 16:41:12 +02:00
Magne Sjaastad
9caaeac237 #1373 Add feature ShowTotalAllocationData 2017-04-19 13:48:15 +02:00
Magne Sjaastad
58065396e7 #1373 Include plot title in text for export 2017-04-19 13:31:46 +02:00
astridkbjorke
a7ac9f89ec #1351 - pre-proto - Adding well radius to fracture and fracture template. Well radius, perforation length and perforation efficiency for fracture is updated from fracture template if no local adjustments have been made. Units (meter -feet) is not yet handled. 2017-04-19 11:00:52 +02:00
astridkbjorke
e82a8efc59 #1352 - pre-proto - Adding parameter for fracture perforation efficiency 2017-04-18 15:23:26 +02:00
Bjørnar Grip Fjær
b2d3a84862 #171 Add support for absolute UNIX paths for fault include files on Windows 2017-04-18 11:32:31 +02:00
Bjørnar Grip Fjær
f59f52c848 #800 Ensure data is loaded when linking cell result in views 2017-04-07 15:58:49 +02:00
Jacob Støren
065689bc18 #1399 QA and alignment of property panel of all curves and plots 2017-04-07 14:43:46 +02:00
Jacob Støren
ecae2f8e1c #1399 QA of Summary Curve Properties 2017-04-07 14:43:46 +02:00
Jacob Støren
cbeca54dbe #1399 QA of SummaryCurveFilter and Curve Auto Name Config 2017-04-07 14:43:46 +02:00
Jacob Støren
78fef85f8b #1399 QA of Summary Axis objects 2017-04-07 14:43:46 +02:00
astridkbjorke
51e9ef67b8 pre-proto - Update of stimPlanCells when changing facture color property or stimPlanFracTemplate activeTimeStep 2017-04-07 12:46:09 +02:00
Magne Sjaastad
947845e7fd #1404 Added plot object picker, and use from Well Allocation plot 2017-04-07 11:25:55 +02:00
astridkbjorke
7646b3fcf0 #1410 - pre-proto - stimplan timestep set to readonly for fracture and value is taken from fracture template. 2017-04-07 11:02:31 +02:00
astridkbjorke
50f71a873e #1409, #1410 - pre-proto - Using parameter from FractureColor and units based on parameter/unit system when setting up RigStimPlanCells, and using fromer polygonTimeStep as timestep for setting up RigStimPlanCells 2017-04-07 10:17:17 +02:00
Jacob Støren
2edbffdba5 #1399 QA of Eclipse Well Property panel. Aligned to the Overall Well Settings 2017-04-07 08:52:42 +02:00
Jacob Støren
3b0e2957f6 #1399 Finalized SimulationWells property panel based on input. 2017-04-07 08:40:54 +02:00
Jacob Støren
5ff839efbe #1399 , #1407 Regrouped the statistics case, and hid the Formation Names and Flip XY as they are (probably) unused, and need some more time to fix. 2017-04-06 18:44:41 +02:00
Jacob Støren
b3ecb423be #1399 QA of grouping in 3D main view property panels. Not Simulation Well Collection 2017-04-06 18:37:43 +02:00
Jacob Støren
26b85dedfc #1402 Fixed Well Alloc plot case switching, and removed dependency on active view 2017-04-06 14:15:12 +02:00
Bjørnar Grip Fjær
cb8b773f23 #1362 Support timesteps with higher resolution than seconds 2017-04-06 13:03:27 +02:00
Jacob Støren
aebb1fb7bd Flow Char Plot: Avoid putting cases without flow diag into the Case drop-down 2017-04-06 11:12:51 +02:00
Jacob Støren
3e37eec71c #1382 Removed the FlowDiagnostics solutions from the Gui. Always using the one and only default solution 2017-04-06 11:00:06 +02:00
astridkbjorke
b73e2bb63b pre-proto - Refactoring. Vector of RigStimPlanCells is now being owned by RimStimPlanFractureTemplate 2017-04-06 09:34:38 +02:00
astridkbjorke
faf36665f4 #1400 - pre-proto - Adding function for calculating transmissibilitiy from matrix for each stimPlan-cell (based on contribution from intersecting eclipse cells). 2017-04-05 14:40:54 +02:00
Jacob Støren
d15bdf04ef #1395 Changed keywords for WellAllocationPlot collection and WellFlowRateCurve. 2017-04-05 13:03:53 +02:00
Jacob Støren
6c7dfdca7b #1395 Renamed TopologyItem to GeometrySelectionItem including Keywords with friends.
Changed keyword to GridTimeHistoryCurve (previously missing Grid)
2017-04-04 16:10:00 +02:00
Bjørnar Grip Fjær
677e326213 #1397 Crash when computing statistics when no statistics case is created when adding source eclipse case 2017-04-04 15:16:13 +02:00
Magne Sjaastad
08acb76ad3 Fixed signed / unsigned compare 2017-04-04 13:53:44 +02:00
Magne Sjaastad
866f62410f #1371 opm-parser : Removed project data model files 2017-04-04 13:53:44 +02:00
Jacob Støren
0ec1d44125 #1369 Made Grid-Summary cases independent of the Grid Case, if the grid case is closed. Reconnect if the grid-cases is opened again. 2017-04-04 12:14:13 +02:00
Jacob Støren
5e6018acb7 #1385 Fixed copy view problem, when flow diagnostics result was used.
Also fixed potential other problems due to same cause: resolve must be done before initAfterRead
2017-04-03 12:36:28 +02:00
Bjørnar Grip Fjær
3cefc2f7a8 #1390 Ensure computed statistics view is added to statistics case 2017-04-03 12:35:19 +02:00
Bjørnar Grip Fjær
b3c8a90cd8 #1011 Fix crash when deleting statistics source case 2017-04-03 10:06:49 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
Jacob Støren
d15b2e5196 #1360 description regarding Well Alloc plots improved.
Displays Well Allocation / Well Flow, and Accumulated /Inflow Rates
2017-03-31 16:53:01 +02:00
Magne Sjaastad
021cd5f1e0 Fixed compare between signed/unsigned 2017-03-31 12:00:40 +02:00
Magne Sjaastad
24d4e6d094 #1356 Added possibility to change sour sim file for eclipse result case 2017-03-31 11:37:10 +02:00
astridkbjorke
4f645758b3 #1364 - pre-proto - Fixing bugs in calculation of upscaled cond values 2017-03-31 10:25:24 +02:00
Jacob Støren
4e4b7fb023 #1321 Close the Flow Characteristics plot when closing the project 2017-03-30 10:08:42 +02:00
Magne Sjaastad
69984cec9c #1357 Always use vector with largest item count when producing time step strings 2017-03-29 20:55:14 +02:00
Magne Sjaastad
aad3094cdf #1357 Fixes issue in previous commit 2017-03-29 15:17:37 +02:00
Magne Sjaastad
50e4723578 #1357 Always use vector largest item count when producing time step strings 2017-03-29 14:46:11 +02:00
Jacob Støren
a97b851b6e #1321 Update Flow Characteristics plot when new timesteps arrives.
Added a updateCurrentTimeStepInPlots method
Deleted obsolete ifdeffed code from main plot collection
2017-03-29 14:06:12 +02:00
astridkbjorke
228e39880f #1301 - pre-proto - Setting stimPlan Fracture template unit system based on unit of conductivity in input stimplan file. 2017-03-29 14:05:25 +02:00
Magne Sjaastad
354e44b617 Merge remote-tracking branch 'origin/dev' into hdf-prototype 2017-03-29 12:17:24 +02:00
astridkbjorke
6d791ca3e0 Pre-proto - Fixing compile issues after rename 2017-03-29 11:31:26 +02:00
astridkbjorke
054f35c5ac Pre-proto - Renaming RimStimPlanCell -> RigStimPlanCell 2017-03-29 10:18:14 +02:00
astridkbjorke
500e0b77be #1368 - pre-proto - Adding tilt angles to fractures 2017-03-29 10:12:01 +02:00
Jacob Støren
a7b3bca94a #1321 Added timestep selection to the Flow Characteristics plot 2017-03-29 09:28:41 +02:00
astridkbjorke
2bfb68e17f #1364 - pre-proto - Adding function for calculating AH average for flow across layers 2017-03-29 09:13:07 +02:00
Jacob Støren
ba60bf3c13 #1321 Added a comand to show Flow Characteristics plot. Added timestp colors, zoom, mouse tracking, and titles 2017-03-28 23:36:56 +02:00
astridkbjorke
926ced4dc5 #1364 - pre-proto - Calculate H-A upscaled cond value for flow across layers 2017-03-28 13:49:03 +02:00
Magne Sjaastad
a6ce3c9ef4 Fixed missing includes on Linux 2017-03-28 09:47:06 +02:00
Magne Sjaastad
dec65d0af4 #1365 Limit max height for result variable for flow 2017-03-27 22:57:23 +02:00
Jacob Støren
1fefc6124f #1321 Wip: First shot on bringing the flow characteristics curves up into the open. 2017-03-27 18:13:38 +02:00
Jacob Støren
f102befd84 Added timestep access in RimEclipseCase in preparations for #1321 2017-03-27 18:13:38 +02:00
Jacob Støren
60b104329c Guard against none-existing userDescriptionField in ViewWindow 2017-03-27 18:13:38 +02:00
astridkbjorke
520ab45649 1363 - pre-proto - Creating class StimPlanCell and using this class when displaying stimPlan mesh on fracture 2017-03-27 14:19:21 +02:00
Magne Sjaastad
c536b7a8fe #1327 Added filter field used to limit available items in the selection list 2017-03-27 11:24:51 +02:00
astridkbjorke
b10bdf6f42 pre-proto - Adding inchToFeet conversion to RimDefines 2017-03-27 10:16:01 +02:00
astridkbjorke
9d98a1d661 pre-proto - More refactoring. Moving planeCellIntersectionPolygons to RigFractureTransCalc, adding fracture, unit and case as members. 2017-03-27 10:16:01 +02:00
astridkbjorke
56e84a43eb pre-proto - Refactoring: Moiving functions related to transmissibility calculations from RimFracture to new class RigFractureTransCalc 2017-03-27 10:16:01 +02:00
astridkbjorke
6dadf95713 1339 - pre-proto - Starting functions for computing flow from fracture to well 2017-03-27 10:16:00 +02:00
astridkbjorke
96372c9077 #1339 - pre-proto - Extracting function for azimuth angle of well 2017-03-27 10:16:00 +02:00
astridkbjorke
d15d1a03a1 #1320 - pre-proto - Moving calculation of upscaled parameter from StimPlan for each cell to a separate method, for use in flow calculation. 2017-03-27 10:16:00 +02:00
astridkbjorke
0f86097870 #1320 - pre-proto - Performing harmonic mean upscaling for stimPlan values 2017-03-27 10:16:00 +02:00
astridkbjorke
28a794cc40 #1320 - pre-proto - Performing artithmetric upscaling of stimPlan values. 2017-03-27 10:16:00 +02:00
astridkbjorke
85c69aa15e #1320 - pre-proto - Fix in algorithm for calculating stimPlan cell polygons 2017-03-27 10:06:42 +02:00
astridkbjorke
ffeb50b06a #1320 - pre-proto - Prototyping calculation of upscaled parameter values from stimPlan. Bug in calculation so output values are wrong. 2017-03-27 10:06:42 +02:00
Magne Sjaastad
fcd2d96907 #1359 Sort tracers in category selection list in property editor 2017-03-24 21:34:46 +01:00
Magne Sjaastad
da53183f41 #1360 Well Alloc plots: Description should follow the flow type setting 2017-03-24 13:28:00 +01:00
Magne Sjaastad
40d5150b37 #1358 Added support for "Zoom All" of well alloc plots 2017-03-24 12:10:05 +01:00
Magne Sjaastad
9b27e4cd37 Merge branch 'dev' into hdf-prototype 2017-03-24 11:43:37 +01:00
Magne Sjaastad
8137955add #1322 Added copy/paste of time history curves 2017-03-24 08:36:58 +01:00
Magne Sjaastad
bbf8c31762 Fixed signed/unsigned issues 2017-03-24 08:21:43 +01:00
Magne Sjaastad
881ba2986f #1357 Use recently created method 2017-03-24 07:10:02 +01:00
Magne Sjaastad
52b064c5ce #1322 Rename and set child objects hidden 2017-03-24 06:53:27 +01:00
Magne Sjaastad
d3eec3445f #1357 Added access function to return time step vector with most time steps 2017-03-24 06:53:27 +01:00
Jacob Støren
fd23ec242e Fixed crash when creating well alloc plot 2017-03-23 12:32:02 +01:00
Magne Sjaastad
b29f664723 #1356 Application code for reading of HDF data into ResInsight 2017-03-23 08:21:06 +01:00
Jacob Støren
cde71ef07a #1344 AppFwk: Renamed methods in uiTreeOrdering to align with uiOrdering 2017-03-22 15:57:04 +01:00
Jacob Støren
908fc991bf #1338 Hide grid case field in SummaryCase. 2017-03-22 15:27:47 +01:00
Jacob Støren
b443b6662d #1344 Replaced use of defineUiOrdering() with uiOrdering() 2017-03-22 15:02:42 +01:00
Jacob Støren
c39462d19a #1345 Fixed. Injector TOF results ended up with a double unit conversion, because tracers with no cells were wrongfully added to the flow diag solver solution. 2017-03-22 14:04:13 +01:00
Jacob Støren
5142c5685a #1333 Added the cross flow tracers to the legend, to avoid false color on the cross flow tracers. 2017-03-21 15:58:35 +01:00
Magne Sjaastad
8077882154 #1342 Removed obsolete code from latest merge from dev 2017-03-21 14:45:28 +01:00
Magne Sjaastad
6e948e9ab5 #1340 Use uiOrdering() instead of defineUiOrdering() 2017-03-21 13:48:34 +01:00
Magne Sjaastad
df3ef7106d #1340 AppFwk : Improve how defineUiOrdering handles remaining fields 2017-03-21 13:47:53 +01:00
Magne Sjaastad
98bb97ea34 #1322 Added support for geo mech data 2017-03-21 13:17:04 +01:00
Jacob Støren
c9ca130a2e #1334 Fixed 2017-03-21 08:49:45 +01:00
Magne Sjaastad
5b934b1747 #1336 Support export of Time History curve data 2017-03-20 14:12:16 +01:00
Magne Sjaastad
9e813fa2c0 #1323 Use left axis as default axis, cache last used summary plot 2017-03-20 12:29:30 +01:00
Magne Sjaastad
fda7d6301f Removed unused variable 2017-03-19 21:46:50 +01:00
Magne Sjaastad
79905ae474 #1322 Removed unique_ptr from summary curve filter 2017-03-19 09:29:44 +01:00
Magne Sjaastad
c08b950dfb Cleaned up mix of signed/unsigned variables 2017-03-19 09:16:22 +01:00
Magne Sjaastad
7565b8a15d #1323 "Switch plot Axis" supported for time history curves 2017-03-19 09:13:27 +01:00
Magne Sjaastad
bd659c0769 #1323 Skip separator command when building context menu 2017-03-19 08:47:29 +01:00
Magne Sjaastad
ad90d3f38f #1322 Several refactorings of RimSummaryPlot, added TimeHistoryCurve support
Removed unique_pointer, as childFields now owns (and deletes) the contained object
Simplified extraction of visible curves
Simplified calculation of zoom range
2017-03-19 08:45:29 +01:00
Magne Sjaastad
388fa2b70e #1322 Added GridTimeHistoryCurve and topology picking items 2017-03-19 08:15:41 +01:00
Magne Sjaastad
aae4751ede #1322 Generalized update functions 2017-03-19 08:06:16 +01:00
Magne Sjaastad
db5277e950 #1322 Update read only state in defineUiOrdering 2017-03-19 08:02:53 +01:00
Jacob Støren
2fb35af7a6 #1335 Connection arrows for all cross-flows also. Made ready for options to show straight arrows, and adjusted a bit. 2017-03-17 18:11:06 +01:00
Jacob Støren
5fd2fe683a #1331 Changed "-Xf" to "-XF" fro crossflow tracers 2017-03-16 17:46:45 +01:00
astridkbjorke
fe01fe2751 #1274 - pre-proto - showing stimPlan mesh 2017-03-16 12:02:07 +01:00
Magne Sjaastad
141257c83e #1293 Added "Show Plot Data" to context menu of plots 2017-03-16 08:23:27 +01:00
Magne Sjaastad
10edf44ee3 #1293 Show plot data in text widget 2017-03-15 20:15:04 +01:00
astridkbjorke
63eca2dc54 #1299 - pre-proto - Update to handle space in property name for stimplan fractures 2017-03-15 15:02:20 +01:00
Magne Sjaastad
bfedfe9c30 Fixed #1316 2017-03-15 14:08:41 +01:00
Magne Sjaastad
5d29cd0ac6 #872 Fixed ordering of actions in menu 2017-03-15 12:36:52 +01:00
Magne Sjaastad
fa6800a9b2 Removed unused variable 2017-03-15 12:06:55 +01:00
Magne Sjaastad
6842ec877f Removed unused function 2017-03-15 12:06:42 +01:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Magne Sjaastad
647b4348eb Renamed to eclipseCaseData 2017-03-15 09:10:16 +01:00
Magne Sjaastad
78e6c6a8fc Renamed to m_eclipseCase 2017-03-15 08:45:08 +01:00
Magne Sjaastad
6bcc385da5 #1297 Use firstAncestorOrThisOfTypeAsserted, comments and whitespace 2017-03-15 08:43:06 +01:00
Jacob Støren
7f1d88e487 Merged Well Communication Lines into dev 2017-03-14 19:25:30 +01:00
Jacob Støren
d4c14d0f53 #1114 WIP: Moved pipe radius, and well head position calculations to RimEclipseWell as preparation for well pair lines. 2017-03-14 19:17:14 +01:00
Magne Sjaastad
a22a58dd5b #1297 Property Filter : Update ranges when time step changes 2017-03-14 17:26:40 +01:00
Magne Sjaastad
7db6dc2259 #1297 Fixed invalid initialization of min/max values 2017-03-14 17:07:27 +01:00
Magne Sjaastad
f875824eaf #1297 Fixed missing update of min variable 2017-03-14 17:06:41 +01:00
Magne Sjaastad
ceef7f20f4 Removed duplicate code 2017-03-14 16:20:59 +01:00
Magne Sjaastad
a8f225a749 #1297 Added text label to display range type 2017-03-14 16:13:40 +01:00
Magne Sjaastad
239e9259f5 #1286 Subtract depth value to make TVD behave more nicely 2017-03-14 14:41:39 +01:00
Magne Sjaastad
1f1c82e45e #1286 Show negative depth values to TVD/pseudo plots 2017-03-14 13:15:45 +01:00
Magne Sjaastad
2b7927e5a6 #1286 Rename 2017-03-14 13:11:08 +01:00
Magne Sjaastad
5e79ed594a #1285 Use "Accumulated" and "Inflow Rates" 2017-03-14 09:24:51 +01:00
Jacob Støren
4c8e1e2bcd #1114 WIP: Refactor: Removed RivReservoirWellSpheresPartMgr 2017-03-13 11:35:49 +01:00
Jacob Støren
d34b4e3c05 #1114 WIP: Added field in Sim Well Collection, renamed a bit as preparations 2017-03-13 11:05:46 +01:00
astridkbjorke
ced9342152 #1294 Only include branches selected in plot in csv export 2017-03-10 15:59:26 +01:00
astridkbjorke
0a945155c5 #872 When exporting several summary plots the data from different plots are stored to different files, and adding extension .csv to files files exported for wellLogPlots and summaryPlots. 2017-03-10 15:12:01 +01:00
astridkbjorke
4ccdd51ea8 #1294 - When selecting multiple wellLogPlots, they will now be exported to separate files. 2017-03-10 15:12:01 +01:00
astridkbjorke
eb3283041f #1294 - Improving formatting of well log plot ascii export 2017-03-10 15:12:00 +01:00
astridkbjorke
b89efbf73e #1294 - Renaming and moving ascii export feature, now RicAsciiExportWellLogPlotFeature. Adding functionality for getting data to export (but formatting is still missing) 2017-03-10 15:12:00 +01:00
astridkbjorke
7f511f7004 #1294 - Added command feature for exporting well allocation plot data, and writing empty file 2017-03-10 15:12:00 +01:00
Magne Sjaastad
ecfd61ce68 #1288 Moved copy of camera properties to RimViewManipulator 2017-03-10 13:13:31 +01:00
Magne Sjaastad
40a5f8dc02 #1288 Added defaultFlowDiagSolution to RimEclipseResultCase 2017-03-09 23:01:58 +01:00
Magne Sjaastad
7e4906fced #1288 Show contributing wells from 3D view without using well alloc plot 2017-03-09 23:01:58 +01:00
astridkbjorke
03af1d5e5f #872 - Fixes in export of multiple summary plots 2017-03-09 10:27:48 +01:00
astridkbjorke
080ca76dff #872 - Simplifying setting of file name for ascii export of summary plots 2017-03-09 10:27:48 +01:00
astridkbjorke
dd3b6101a2 #872 - Exporting data from summary plot 2017-03-09 10:27:47 +01:00
astridkbjorke
b888e933b5 #872 - Adding command feature for export of summary plots to ascii (and writing empty export file) 2017-03-09 10:27:47 +01:00
Magne Sjaastad
6e69bdb81d Added const and cleaned up includes and whitespace 2017-03-09 10:03:52 +01:00
Magne Sjaastad
fc5a44bf3a #1305 Removed excess function 2017-03-09 08:11:01 +01:00
Magne Sjaastad
1309c25058 #1305 Update filter UI fields when address is set on filter 2017-03-09 08:04:02 +01:00
Magne Sjaastad
deb62d8198 #1305 Removed use of unique_pointer 2017-03-09 07:08:42 +01:00
Magne Sjaastad
84f76e5242 #1306 Use general delete sub items for well path collection 2017-03-08 12:20:35 +01:00
Magne Sjaastad
d547079847 #1306 Added general "Delete Sub Items" feature 2017-03-08 12:06:05 +01:00
Magne Sjaastad
a81980c235 #1185 Added "Plot Production Rates" for sim well in 3D and project tree 2017-03-08 11:42:08 +01:00
Jacob Støren
c9dc41d374 #1298 Included wells with "closed" state consistently 2017-03-07 12:27:49 +01:00
astridkbjorke
81c243297a #1302 - pre-proto - Setting fracture unit system based on case when sim-well fracture is created. Unit-system for field is now read-only for simwell fractures. 2017-03-07 10:09:19 +01:00
Jacob Støren
0428dbffa3 #1279 Added <wellname>-Xf as tracer on connections with opposite flow thant the well type indicates. 2017-03-06 16:34:30 +01:00
astridkbjorke
ccbc7c7021 #1278 - pre-proto - Converting data to case unit system for COMPDAT export 2017-03-06 15:14:11 +01:00
astridkbjorke
c25d4953df #1276 - pre-proto - Adding dip rotation angle to fractures. 2017-03-06 13:32:42 +01:00
astridkbjorke
2d5eb15fa1 #1258 - pre-proto - Removing isActive from Fracture Template Collection 2017-03-06 11:36:07 +01:00
astridkbjorke
53e085dd79 #1283 - pre-proto - Fracture polygon now passes though first zero-nodes instead of last non-zero nodes. 2017-03-06 11:32:09 +01:00
Jacob Støren
6c0a866008 #1292 Fixed CppCheck Issues in ProjectDataModel 2017-03-06 11:20:28 +01:00
Jacob Støren
4312968124 Removed CppCheck Warnings 2017-03-03 17:09:30 +01:00
Jacob Støren
ea5b4a7ceb MDI Window geometry: Added missing initalization of maximized state 2017-03-03 16:50:04 +01:00
Jacob Støren
f15d698342 #1174 Made 3D main window pop up, and set wether to show Max Fractrion Injectors or Producers. Set timestep in 3D view to match plot. 2017-03-02 16:10:18 +01:00
Magne Sjaastad
f7521ad12f Merged branch pre-proto into pre-proto 2017-03-02 11:48:35 +01:00
Magne Sjaastad
ac9f405c96 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ResInsightVersion.cmake
2017-03-02 11:46:25 +01:00
astridkbjorke
6019ff4586 #1275 - pre-proto - Setting default values for stimplan fracture template polygon based on content in file 2017-03-02 11:43:42 +01:00
astridkbjorke
2811e5aa4d #1272, #1271 - pre-proto - Adding field for setting unit system for fracture, and converting geometry/polygon between unit systems 2017-03-02 11:43:41 +01:00
Jacob Støren
bf375c2485 Well Alloc Plot: Hide unit field for TVD also. 2017-03-01 16:09:28 +01:00
Jacob Støren
8f2affe670 #1120 Well Alloc Plot: Simple TVD calculations 2017-03-01 16:09:28 +01:00
Magne Sjaastad
68ff093c61 #1266 If not computed, compute staticWellCellPath when needed 2017-03-01 14:23:01 +01:00
Magne Sjaastad
da416409aa #1266 Assign visible grid parts before appendStaticGeometryPartsToModel() 2017-03-01 14:20:27 +01:00
Jacob Støren
e19373ec9d #1265 Made sure all in/out fluxes are added to the flow diag solution.
Also made sure only producing cells are added to the producer tracers and injecting cells as injector tracers.
2017-02-28 16:03:43 +01:00
Jacob Støren
01b3df863e #1264 Added Well Allocation command to Project tree context menu 2017-02-28 15:46:08 +01:00
astridkbjorke
f5edd780a5 #1243 - pre-proto - Minor fixes to visualization of fracture polygons 2017-02-28 14:35:19 +01:00
astridkbjorke
c2c3145e5a #1243 - pre-proto - Adding visualization of polygon output for stimplan fractures 2017-02-28 14:28:14 +01:00
Jacob Støren
6149a87347 #1171 Force the depth type to be valid for WellAlloc plots 2017-02-28 11:47:11 +01:00
Jacob Støren
577fc8204d #1171 Disable the Fake 0-connection number value for pseudo depth 2017-02-28 11:47:11 +01:00
Jacob Støren
9e73fadada #1171 Correct start and end of each cell contribution for pseudo-length based plot. 2017-02-28 11:47:11 +01:00
Jacob Støren
b58de820b8 #1171 Removed depth unit field for pseudolength 2017-02-28 11:47:11 +01:00
Jacob Støren
b336d49fb6 #1171 WIP: Pseudo length active. Needs more verification 2017-02-28 11:47:11 +01:00
astridkbjorke
654df52512 #1262 - pre-proto - Adding logging to reading of StimPlan XML files and writing of COMPDAT files. 2017-02-28 10:02:41 +01:00
astridkbjorke
fde41f5116 #1234 - pre-proto - Adding time-step and property type for fracture polygon calculation 2017-02-28 10:02:40 +01:00
Magne Sjaastad
8ce430cb25 #1242 Hide opacity level and discard transparent fragments 2017-02-27 22:21:37 +01:00
Magne Sjaastad
48599f7a94 #1257 More null pointer guards based on CppCheck 2017-02-27 14:01:18 +01:00
astridkbjorke
374ed0130b #1247 - pre-proto - Adding possibility for reading XML-files with negative coordinates for grid in X-direction (values for neg coordinates are ignored when reading file). 2017-02-27 10:50:55 +01:00
Magne Sjaastad
10f14aee8e Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-02-27 07:13:06 +01:00
Magne Sjaastad
83a1d97f33 #1257 More null pointer guards based on CppCheck 2017-02-24 16:16:58 +01:00
Magne Sjaastad
a29f6abc32 #1257 Added null pointer guarding based on reports from CppCheck 2017-02-24 16:00:56 +01:00
Magne Sjaastad
85228ee39c #1255 Removed includes from RimWellPath 2017-02-24 14:31:06 +01:00
Magne Sjaastad
1af3df6c6c #1255 Removed includes from RimWellLogCurve 2017-02-24 14:14:29 +01:00
Magne Sjaastad
ff99d56ea3 #1255 Removed includes from RimFaultCollection 2017-02-24 14:02:03 +01:00
Magne Sjaastad
1991a3c32d #1255 Removed includes from RimCellRangeFilterCollection 2017-02-24 14:01:42 +01:00
Magne Sjaastad
7349d608bd #1255 Removed includes from RimSummary classes 2017-02-24 13:56:46 +01:00
Magne Sjaastad
6ec3e28a21 #1255 Removed includes from RimEclipseWell 2017-02-24 13:18:27 +01:00
Magne Sjaastad
aac42831cf Whitespace 2017-02-24 12:41:09 +01:00
Magne Sjaastad
5c20bff5d1 #1255 Remove includes from header files 2017-02-24 11:07:26 +01:00
Magne Sjaastad
f59c4b4b9e #1242 Do not use transparency on ellipse, default transparency set to 1.0 2017-02-23 11:25:21 +01:00
Magne Sjaastad
7f75f7e509 #1252 Add and use transparent color for both ellipse and stim plan objects 2017-02-23 10:15:56 +01:00
Magne Sjaastad
5ccde99cb3 Guard null pointer access 2017-02-23 10:14:28 +01:00
Magne Sjaastad
7717bf925f Rename and moved azimuth updates to RimFracture 2017-02-23 09:47:30 +01:00
Magne Sjaastad
855960287d #1240 Use last stimplan time step as default, improved UI updates 2017-02-23 09:22:19 +01:00
Magne Sjaastad
36b4238f13 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
2017-02-23 08:44:53 +01:00
Magne Sjaastad
dc886b7e9c Well path delete command supports multi selection 2017-02-23 08:42:27 +01:00
Magne Sjaastad
47f207998a #1240 Adjustments to icons and command texts 2017-02-23 08:21:45 +01:00
Magne Sjaastad
c8cc667fa1 #1240 Use fracture icon for StimPlan colors 2017-02-23 07:07:57 +01:00
Magne Sjaastad
139590760f #1240 Added checbox to StimPlan Colors 2017-02-22 15:32:19 +01:00
Magne Sjaastad
6e5404d943 Use *.xml as file filter when opening a StimPlan file 2017-02-22 14:46:28 +01:00
Magne Sjaastad
65d71f7106 #1250 Show fractures directly as child objects of wells / well path 2017-02-22 14:40:13 +01:00
Magne Sjaastad
73690e6d66 #1239 Do not show fracture when fracture is unchecked 2017-02-22 13:29:20 +01:00
Magne Sjaastad
ac48b31e24 #1239 Add checkbox to control visibility of fractures 2017-02-22 13:24:07 +01:00
Magne Sjaastad
e67b9e4f59 Set visibility to protected to allow for inclusion in derived classes 2017-02-22 13:22:32 +01:00
Magne Sjaastad
cc5f5eddd0 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
2017-02-22 13:12:23 +01:00
Magne Sjaastad
8eb8a6fd3b #1248 Add namedObject and checkableNamedObject 2017-02-22 13:09:31 +01:00
astridkbjorke
407f3734c3 #1244 - pre-proto - Improving text for fractures / fracture templates 2017-02-22 11:52:06 +01:00
Magne Sjaastad
1753449772 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
2017-02-22 09:42:51 +01:00
Magne Sjaastad
03932f59c3 #1183 Property Filter: Context command : Apply As Cell Result - GeoMech 2017-02-21 15:37:56 +01:00
Magne Sjaastad
738e44ed46 #1183 Property Filter: Context command : Apply As Cell Result - Eclipse 2017-02-21 15:25:36 +01:00
Magne Sjaastad
401918910a #1231 Moved category handling to new class RimPropertyFilter 2017-02-21 08:57:40 +01:00
astridkbjorke
c8460e874f pre-proto - Setting azimuth correctly when changing fracture template 2017-02-20 15:39:48 +01:00
astridkbjorke
be49cb2766 #1138 - pre-proto - Updating stimPlan legends after reading in xml file 2017-02-20 15:39:15 +01:00
astridkbjorke
c84f4efbb1 #1138 - pre-proto - Adding field in RimStimPlanColors for transparency 2017-02-20 13:24:22 +01:00
astridkbjorke
0a801635dd #1138 - pre-proto - Adding stimPlan color palette (for plotting fracture data) 2017-02-20 12:30:26 +01:00
Magne Sjaastad
bdbb110ca4 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ModelVisualization/CMakeLists_files.cmake
	ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
2017-02-20 11:07:46 +01:00
Magne Sjaastad
6c5410f41a #1230 Removed obsolete legend structures 2017-02-20 10:05:11 +01:00
Magne Sjaastad
b7aebbb392 #1230 Created StimPlan colors and show lenged in 3D view 2017-02-20 09:31:24 +01:00
astridkbjorke
d2142c5724 #1234 - pre-proto - Adding commands for converting units for all ellipse fracture templates (metric <--> field) 2017-02-20 09:13:44 +01:00
Jacob Støren
070d9c893b #1209 Added calculation of none-accumulated flows as preparation for #1171 and #1120. Missing handling of wells with inconsistent flow. 2017-02-17 15:49:14 +01:00
Jacob Støren
492b777040 More refactoring as preparations for #1171, #1120, and #1209 2017-02-17 15:49:14 +01:00
Jacob Støren
b7b31f6c03 Well Alloc plots: Differentiated gray colors for "Total", "Reservoir" and "Others" 2017-02-17 15:49:14 +01:00
Jacob Støren
b00fe21726 Refactoring as preparations for #1171, #1120, and #1209 2017-02-17 15:49:14 +01:00
astridkbjorke
359f8f9726 #1138 - pre-proto - Code cleanup and adding slider for well depth in stimplan file 2017-02-17 15:10:04 +01:00
astridkbjorke
1b99c25297 #1138 - pre-proto - Added possibility to visualize all properties in input XML stimPlan file 2017-02-17 14:14:49 +01:00
astridkbjorke
e971c5276d #1139 - pre-proto - Reading in all parameters available in StimPlan file. 2017-02-17 14:14:48 +01:00
Magne Sjaastad
a10b96ba3e Merged branch dev into pre-proto 2017-02-17 11:38:32 +01:00
Magne Sjaastad
a4a3a22cdf Added missing include 2017-02-17 11:03:20 +01:00
astridkbjorke
1fbc11acc9 #1139 - pre-proto - Starting reading in units from XML file 2017-02-17 10:11:33 +01:00
astridkbjorke
ab7b86111e pre-proto - Added handling of case where fracture templates have been deleted. 2017-02-17 10:11:32 +01:00
astridkbjorke
fa638243ab #1087 - pre-proto - Moving enum for unit system to RimDefines, and establishing default unit system for fracture template collection (used when creating new templates). 2017-02-17 10:11:32 +01:00
astridkbjorke
86bd033fa8 #1087 - pre-proto - Adding enum for units-system, and adding conversion functions between feet/inch and meter 2017-02-17 10:10:21 +01:00
Magne Sjaastad
81c92d2781 #1230 Added infrastructure for loadAndUpdate of StimPlan data 2017-02-17 09:29:46 +01:00
Magne Sjaastad
aef913739c #1230 Added StimPlan legend configuration object 2017-02-17 09:28:46 +01:00
astridkbjorke
65498e5aec #1138 - pre-proto - Fixing symmetry issue 2017-02-16 13:05:55 +01:00
Jacob Støren
41fada4d1f #1212 Added a subtle gradient in the flow plots 2017-02-16 11:40:02 +01:00
Magne Sjaastad
f9d8ab8bad Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ApplicationCode/Resources/ResInsight.qrc
2017-02-16 10:18:39 +01:00
astridkbjorke
8a603c7f73 #1138 - pre-proto - Using legend config for controlling colors of stimPlan fracture 2017-02-16 09:15:23 +01:00
Jacob Støren
afb628d8bc #1207 Added icons for the different aspects of Flow Diag plots. Also adjusted some of the other icons to have a better and more consistent look 2017-02-15 18:29:01 +01:00
astridkbjorke
3ae816a9aa #1138 - pre-proto - Re-reading data from files when opening stored project. Re-generating geometry when updating values for time-step / parameter to show from stimPlan-file. 2017-02-15 15:49:53 +01:00
Magne Sjaastad
037c7c1f73 #1174 Use well ordering when creating category legend colors max tracer 2017-02-15 15:21:13 +01:00
astridkbjorke
bcd3009066 #1138 - pre-proto - Showing data from stimPlan-file on fracture 2017-02-15 15:14:16 +01:00
Magne Sjaastad
9a7f187765 #1222 Interpolate category colors and assign well color based on sorted order 2017-02-15 13:26:59 +01:00
Jacob Støren
4fc0839a33 #1211 Disabled tracer allocation for wells with inconsistent flow. 2017-02-15 12:29:58 +01:00
astridkbjorke
1cf6d073fe #1138 - pre-proto - Adding fields for fractures for stimPlan parameter to plot and time step. 2017-02-15 12:21:36 +01:00
Magne Sjaastad
c815cfa835 #1138 Added result legends 2017-02-15 11:29:44 +01:00
Magne Sjaastad
b6b544f13f #1174 Rename to loadDataAndUpdate 2017-02-15 10:40:32 +01:00
Magne Sjaastad
f5db37fcf7 Use int as category value type 2017-02-15 10:38:42 +01:00
astridkbjorke
ff59429ad8 #1139 - pre-proto - Adjustments in reading of XML file to handle files with multiple time-steps and several parameters. 2017-02-15 10:32:34 +01:00
Magne Sjaastad
1efbf07711 #1174 Avoid load of data in initAfterRead 2017-02-15 10:26:16 +01:00
Jacob Støren
ed31dab152 #1172 Calculated a grouped tracer contribution value of the tracers below a certain threshold. 2017-02-15 08:46:55 +01:00
Magne Sjaastad
758ac9ef8c #1214 Generalized export of snapshot images for all plot window types 2017-02-14 15:03:54 +01:00
astridkbjorke
3023ddcd78 #1087 - pre-proto - Adding units to fracture template and adding command feature for converting length values in ellipseFractureDefinition. 2017-02-14 09:49:14 +01:00
Magne Sjaastad
e43f531a0f #1208 Use category text instead of category index 2017-02-14 09:47:19 +01:00
Jacob Støren
61e82c37b5 #1210 Using defult flow diag results if available when creating Well Alloc Plots 2017-02-14 08:30:52 +01:00
Jacob Støren
a25bfd4513 #1213 Well allocation plot is now only created when requested.
Also made the fields in FlowPlotCollection private.
2017-02-14 08:10:39 +01:00
Magne Sjaastad
92f4abe7c2 #1214 Implemented snapshot of well allocation plot 2017-02-13 15:47:24 +01:00
Magne Sjaastad
73053b0bb7 #1174 Create TOF property filter with selected tracer 2017-02-13 15:00:49 +01:00
Magne Sjaastad
07dc89bceb Cleaned up includes 2017-02-13 14:29:02 +01:00
astridkbjorke
3dc836e491 #1138 - pre-proto - Setting up nodeCoords and triangleIndices in same loop. 2017-02-13 13:46:49 +01:00
Magne Sjaastad
45f3240932 #1174 Added context menu to WellAllocationPlot and added feature 2017-02-13 13:29:31 +01:00
Magne Sjaastad
9aa98a3895 #1078 Assign default colors when a new well is created 2017-02-13 13:26:05 +01:00
Magne Sjaastad
62f73260fc #1174 Guard for null pointer access of wellAllocationPlotWidget 2017-02-13 13:04:37 +01:00
Jacob Støren
22b3d9fca5 #1169 Added unti labels for the three different sets (metric, field, lab) 2017-02-13 10:54:21 +01:00
Jacob Støren
321b9e2d62 #1173 Made the legend a separate hide/show entity, and changed the overall layout of the well allocation plot 2017-02-13 08:44:29 +01:00
Jacob Støren
30ea467f0e Whitespace 2017-02-13 08:44:29 +01:00
Jacob Støren
2e806e0cb7 #1173 Hide legend in the Well Log part of the Well Alloc Plot by default 2017-02-13 08:44:29 +01:00
Jacob Støren
3e7413831a #1173 Added the possibility to hide the legend in a Well Alloc plots ((including WellLog plot )
Also changed the background color to white.
2017-02-13 08:44:29 +01:00
Magne Sjaastad
d1743be8e7 #1178 Update well allocation plots when well color changes 2017-02-10 19:12:21 +01:00
Magne Sjaastad
b3e845ed5e #1178 Use well colors for Max Fraction Tracer 2017-02-10 18:53:14 +01:00
astridkbjorke
f6caa938ec #1138 - pre-proto - Visualizing full grid of StimPlan simulation with single colour. 2017-02-10 15:29:15 +01:00
astridkbjorke
7f6d9eee1c pre-proto - Adding template<> to appEnum to build on linux 2017-02-10 13:43:22 +01:00
astridkbjorke
6c9ee7f059 #1198 - pre-proto - Adding enum to control finite / infinite conductivity. Calculation for finite conductivity not yet implemented, so transmissibilitiy calculation will as of now always assume infinite cond. 2017-02-10 13:31:23 +01:00
Magne Sjaastad
2ee25c6cf5 Use triangleIndices instead of polygonIndices 2017-02-10 11:32:18 +01:00
astridkbjorke
41a103714e #1196 - pre-proto - Rename to PseudoLenght Location 2017-02-10 10:49:36 +01:00
astridkbjorke
0d027a8fdf #1199 - Hiding azimuth angle when fracture orientation is selected along or transverse to well path, and setting ui-order for stimPlanFractureTemplate. 2017-02-10 10:33:07 +01:00
astridkbjorke
517c53a069 (#1139) - pre-proto - Reading in stimplan XMLfile. Not tested for multiple properties / timesteps. (Also some code clean-up) 2017-02-10 10:03:46 +01:00
astridkbjorke
22ee6250bd (#1137) - pre-proto - Adding delete/new command for stimplan fracture templates. Removing RimStimPlanFractureDefinition, functionality moved into RimStimPlanFractureTemplate. Renaming RimFractureDefinitionCollection to RimFractureTemplateCollection. 2017-02-10 09:54:37 +01:00
astridkbjorke
d52cfc0f0b (#1136, #1137) - pre-proto - Adding base class RimFractureTemplte, and classes for stimPlan fractureTemplate and data structures. Also adding features for creating new stimPlan Fracture templates. 2017-02-10 09:52:18 +01:00
Magne Sjaastad
652df8854d #1180 Use RiaColorTables for several features (well log, summary, flow rates) 2017-02-10 08:39:25 +01:00
Magne Sjaastad
3d5781a601 #1180 Moved color tables from RimLegendConfig to RiaColorTables 2017-02-10 08:37:48 +01:00
Magne Sjaastad
8fffc53629 #1180 Use RiaColorTables and deleted RivColorTableArray 2017-02-10 08:36:32 +01:00
Jacob Støren
fb85416b73 Fixed #1200 2017-02-09 15:32:14 +01:00
Jacob Støren
65f36d6a3f #1168, #1171 Added new depth types to RimWellLogPlot, with handling of unit type "none" as well. Made Well Alloc Plots make only "Connection Number" available on its WellLogPlot 2017-02-09 13:31:25 +01:00
Jacob Støren
dea5c8fc8c #1205 Added a none option to Well Alloc Plot Flow Solution menu 2017-02-09 13:31:25 +01:00
Magne Sjaastad
5df94a1e18 #1181 Do not automatically update track names when adding new tracks 2017-02-09 08:35:33 +01:00
Magne Sjaastad
7cdc550f32 Fixed #1130 Make sure visibility of fractures follows pipe/sphere visibility 2017-02-09 06:59:34 +01:00
Magne Sjaastad
c197f22013 #1189 Improved text in UI and reorganized color buttons 2017-02-08 14:00:06 +01:00
Magne Sjaastad
a5de98ab32 Use upper case for first character in words 2017-02-08 13:59:20 +01:00
Magne Sjaastad
b1beacb46a #1189 Fixed well cells visibilities when no range filters are active 2017-02-08 13:34:31 +01:00
Jacob Støren
a736d41eb7 #1169 Added text on the x-axis 2017-02-08 13:23:52 +01:00
Magne Sjaastad
d5ec760ddd #1189 Fixed well pipe/sphere visibilities when no range filters are active 2017-02-08 08:07:27 +01:00
Magne Sjaastad
f11d2a0d31 #1189 Fixed well pipe/sphere visibilities when no range filters are active 2017-02-08 08:04:08 +01:00
Magne Sjaastad
93954fece0 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
2017-02-08 07:35:20 +01:00
astridkbjorke
c8f682b205 #1140 - pre-proto - Update calculation of dx, dy, dz if not read from file 2017-02-07 19:12:44 +01:00
Magne Sjaastad
255643257f Fixed #1191 Info box: crash when using static cell result with dynamic filter and current time step 2017-02-07 19:07:30 +01:00
Magne Sjaastad
011fd30d08 #1189 Use text "Hide Wells Not Intersecting Filtered Cells" 2017-02-07 18:16:19 +01:00
Magne Sjaastad
4bfb85c62e #1189 Harmonized static and dynamic evaluation of cell visibilities 2017-02-07 15:36:19 +01:00
Magne Sjaastad
2404cf1582 #1189 Visibility of well cells now follow visible range filtered cells 2017-02-07 15:33:04 +01:00
Magne Sjaastad
0061067aa7 #1189 Do not consider well cells when controlling pipe/sphere visibilities 2017-02-07 15:33:04 +01:00
astridkbjorke
a79e6118c7 #1140 - pre-proto - Update calculation of dx, dy, dz if not read from file 2017-02-06 15:23:51 +01:00
Magne Sjaastad
e4830b629c #1176 Read out state directly from well using RigSingleWellResultsData 2017-02-06 14:00:05 +01:00
astridkbjorke
642d468b94 #1143 - pre-proto - Reordering fields / graying out not relevant fields. 2017-02-06 13:51:13 +01:00
Magne Sjaastad
8bc1a3ee3d #1190 Improved copy command feature 2017-02-06 13:33:56 +01:00
astridkbjorke
e6958c3e65 pre-proto - Organize includes 2017-02-06 13:22:18 +01:00
astridkbjorke
093b998fcd #1167 - pre-proto - Calculating azimuth angle for well path and using this angle in setting azimuth angle for fracture. 2017-02-06 13:12:56 +01:00
astridkbjorke
10bb3a834d pre-proto - Rename 2017-02-06 11:45:50 +01:00
astridkbjorke
53e7d99652 #1167, #1143 Calculating angle for simulation well, and setting angle based on this for "along well" and "transverse well" orientation of frac template. Azimuth field for fracture read-only if orientation not "azimuth" for frac template. 2017-02-06 11:44:24 +01:00
Magne Sjaastad
c28ed7f206 Default state is to show all wells 2017-02-06 11:09:02 +01:00
Magne Sjaastad
f186d77136 When entering "Show well cells" state, do not hide wells not intersecting visible cells 2017-02-06 11:07:35 +01:00
Magne Sjaastad
06ace5d3b0 Closes #1176 Well Alloc Plot: Show well Injector/Producer status 2017-02-06 10:58:09 +01:00
Jacob Støren
1f184837f1 #1182 Added a dummy point on first branch to better show the resulting alloaction 2017-02-03 16:35:45 +01:00
astridkbjorke
073c7a6ecc #1186 - pre-proto - Bugfix in reading of NTG. 2017-02-03 14:56:30 +01:00
astridkbjorke
5c6fc9dbcb pre-proto - Fixing bug in fracture transmissibility calculation, handling of skinfactor for fracture 2017-02-03 14:12:40 +01:00
Magne Sjaastad
7738b7f74b Fixed merge issue 2017-02-03 10:52:22 +01:00
Magne Sjaastad
6dc0a7ff59 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ResInsightVersion.cmake
2017-02-03 10:51:46 +01:00
Jacob Støren
01864aee09 Well Alloc Plot: Added case and timestep to title, Adjusted font. 2017-02-03 08:51:43 +01:00
Jacob Støren
c613c389f3 #1118 When no tracer data is available, show the total well flow instead. 2017-02-02 16:08:37 +01:00
Jacob Støren
6aea418084 Total Well Log Allocation Pie Chart: Guarded not yet created widget 2017-02-02 16:06:50 +01:00
Magne Sjaastad
40dbf78aa9 #1165 Added title to well allocation plot 2017-02-02 14:17:36 +01:00
Magne Sjaastad
f3a4242826 #1162 More guarding for no data available 2017-02-02 14:16:03 +01:00
Magne Sjaastad
94eb76436a Fixes #1162 Well Acc plot: Handle missing well data for timesteps (crash) 2017-02-02 13:01:57 +01:00
Magne Sjaastad
f1200af1af Repaint widget in addition to clearing of slices 2017-02-02 13:01:21 +01:00
Magne Sjaastad
8ee7229f60 #1163 Well Acc plot: Timestep and case changes in GUI is not handled 2017-02-02 12:37:58 +01:00
Magne Sjaastad
e8ee077501 #1164 Added feature "Add Stored Well Allocation Plot" 2017-02-02 12:32:01 +01:00
Magne Sjaastad
da903575b6 #1164 Removed dummy objects 2017-02-02 12:31:40 +01:00
Magne Sjaastad
a91bf5144f Removed double namespace prefix 2017-02-02 12:10:14 +01:00
Magne Sjaastad
e48c9c0e10 Add one and only one flow diag solution if flux is available 2017-02-02 12:06:08 +01:00
astridkbjorke
64684f6bec #1145 - pre-proto - Export of fracture data for selected wells (either SimWells or WellPaths) 2017-02-02 11:38:55 +01:00
Jacob Støren
eee43ccf0f #1108, #1110, #1116 Pie chart Well Allocation Factors now working. 2017-02-02 11:30:59 +01:00
Magne Sjaastad
7abdc38d92 #1148 Fixed issue causing well cells to always be enabled 2017-02-02 11:27:55 +01:00
Magne Sjaastad
7c86482af3 #1107 Added calculateValueOptions for case and flow diag solution 2017-02-02 11:11:03 +01:00
Magne Sjaastad
b90b2fbc04 Use ordering of RigSingleWellResultsData when assigning well colors 2017-02-02 10:34:32 +01:00
astridkbjorke
1243ae6cd1 #1149 - pre-proto - rotating fracture geometry 90 deg (0 azimuth means fracture oriented North-South) 2017-02-02 10:02:27 +01:00
Magne Sjaastad
c4d9c1d780 #1148 Made tristate of well cell fence 2017-02-02 09:59:26 +01:00
Magne Sjaastad
53bccf3d0f #1148 Improved obsolete field behaviour for well head, label and well cells 2017-02-02 09:59:26 +01:00
Magne Sjaastad
fad0974b3f #1148 Use tristate for well cell visibility 2017-02-02 09:59:26 +01:00
Jacob Støren
b26bd11674 #1113 Made tracer colors consistent, and son to be consistent with default well colors 2017-02-02 09:56:39 +01:00
astridkbjorke
d7e980887a #1144 - pre-proto - Update perforation length of fracture when value is updated for fracture template 2017-02-02 09:20:58 +01:00
astridkbjorke
30304a5f8a #1157 - pre-proto - Updating how the eclipseCase is handled for transmissibility calculation. Should now avoid segfault when calculating transmissibilities for well path fractures. 2017-02-02 08:50:54 +01:00
astridkbjorke
3e65bcfa88 #1144 - pre-proto - Updating azimuth angles for fractures for connected fractures with this angle when angle is update in template. 2017-02-02 08:50:54 +01:00
astridkbjorke
701687b171 pre-proto - Fixing bug in max value for slider for azimuth angle for simulation well fractures. 2017-02-02 08:50:54 +01:00
Magne Sjaastad
6d95d00863 #1159 Fixed inaccurate position of new fracture when clicking in 3D view 2017-02-02 07:36:22 +01:00
Jacob Støren
8e4e7f098f #1113, #1112 Made stacked curves. Now the accumulated well flow by connection graphs is up to speed. 2017-02-01 19:18:37 +01:00
Magne Sjaastad
d8c2eb0357 #1158 Fixed position of simulation well fractures after scale change 2017-02-01 13:25:07 +01:00
Magne Sjaastad
a4ce5f532d #1148 Use tristate to indicate visibility of simulation well geometry 2017-02-01 09:52:01 +01:00
Magne Sjaastad
ddd72b4866 #1148 Added well head scale factor to EclipseWell 2017-02-01 09:52:01 +01:00
Magne Sjaastad
929e9ad09b Guard for index out of range 2017-02-01 09:52:01 +01:00
astridkbjorke
4c1f7776b9 pre-proto - Sorting includes 2017-01-31 15:58:13 +01:00
Jacob Støren
d3f1c9d6fa #1112 Calculation of accumulated well flow is now implemented. Tracers are handled, as well as MSW's. 2017-01-31 15:29:22 +01:00
astridkbjorke
046060cd04 #1041 - pre-proto - Reading in NTG values outside loop over fractured cells. 2017-01-31 12:32:59 +01:00
astridkbjorke
7d2ebd68bf #1092 - pre-proto - Reading in Dx, Dy, Dz and permeabilities before calculation of transmissibilities. 2017-01-31 12:26:30 +01:00
astridkbjorke
bb2dd91469 #1141 - pre-proto - Only exporting intermediate calculations if fracture has an area in cell. 2017-01-31 10:31:28 +01:00
astridkbjorke
088d1591b6 #1141 - pre-proto - Writing intermediate calculations also when computed transmissibility is invalid. 2017-01-31 10:14:26 +01:00
astridkbjorke
238b803dce #1145 - pre-proto - Adding command feature for export of fractures only from selected wells. So far only fractures from one well can be exported each time. 2017-01-31 09:56:49 +01:00
astridkbjorke
07f5ea45d2 #1141 - pre-proto - Adding intermediate values from transmissibility calculation to the top of the COMPDAT export file. 2017-01-31 09:56:48 +01:00
Magne Sjaastad
f2a4fee68f Added missing updateConnectedEditors 2017-01-30 14:59:10 +01:00
Magne Sjaastad
9aa273e3a2 #1148 Rename and reorder of items in panel 2017-01-30 14:53:20 +01:00
Magne Sjaastad
b13ca8bb1c #1135 Compute accumulated length along sim well and added slider 2017-01-30 14:28:41 +01:00
Magne Sjaastad
758bc96ff5 #1135 Compute and show location along sim well pipe 2017-01-30 14:28:41 +01:00
astridkbjorke
395c80e35f #1041 - pre-proto - Reading permeability and cell sized from grid for use in transmissibility calculation. 2017-01-30 10:45:18 +01:00
Magne Sjaastad
7b6574327e #1094 Gray out wells not visible because they do not intersect visible cells 2017-01-27 15:50:17 +01:00
Magne Sjaastad
bd14f97a2b #1094 Use range based for 2017-01-27 15:48:56 +01:00
Magne Sjaastad
23eeacde37 #1094 Improved constness and use of range based for 2017-01-27 15:19:18 +01:00
astridkbjorke
68e8727f99 #1041 - pre-proto - Starting implementation of calculation of transmissibility in X, Y and Z directon 2017-01-27 12:12:08 +01:00
astridkbjorke
035107b48b #1091, #1092 - pre-proto - Simplifying calulation of projected areas and updating export functionality to include intermediate results of transmissibility calculation 2017-01-27 12:12:08 +01:00
astridkbjorke
0364782d32 #1091 - pre-proto - Starting calculation of projected areas, resulting values not checked to be correct yet. 2017-01-27 12:12:08 +01:00
astridkbjorke
f732c1ea24 #1091 - pre-proto - Updating calculation of fracture area to use functions in RimCellGeometryTools. Calculating area-weighted length for fracture. 2017-01-27 12:12:08 +01:00
astridkbjorke
9c9592ccce #1091 - pre-proto - Adding function for calculating fracture length. 2017-01-27 12:12:08 +01:00
Magne Sjaastad
1e20a61d4c #1078 Updated enabled state of well cells and well cell fence 2017-01-26 18:01:08 +01:00
Magne Sjaastad
ccc7345706 #1078 Added context menu for well cells and well cell fence 2017-01-26 17:52:13 +01:00
Magne Sjaastad
8f4fa4592a #1078 Improved well cells and well cell fence settings 2017-01-26 17:41:34 +01:00
Magne Sjaastad
aedf184d14 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
2017-01-26 14:30:13 +01:00
Magne Sjaastad
d0f613520e #1078 Added possibility to show/hide connection status colors 2017-01-26 14:25:34 +01:00
Magne Sjaastad
1f9ef0d942 #1078 Added color control to sim well collection 2017-01-26 12:25:45 +01:00
Magne Sjaastad
f9a9040ed5 #1078 Added show pipe and show spheres to well collection 2017-01-26 10:27:23 +01:00
Magne Sjaastad
8304cb0393 #1078 Added showWellsIntersectingVisibleCells
Obsoleted wellPipeVisibility and removed wellSphereVisibility
2017-01-26 08:12:28 +01:00
Magne Sjaastad
6ee54733f4 #1078 Context menu commands for multi select of EclipseWell objects 2017-01-26 07:23:18 +01:00
Magne Sjaastad
c4d4d03cee #1078 Added well head control to RimEclipseWell plus rename and reorder 2017-01-26 07:23:18 +01:00
Jacob Støren
90c791a2da #1112 Finally the first iteration of the actual calculation of accumulated flow pr connection. No Flow Diagnostics yet, and we wait for the real flow rates. 2017-01-25 22:49:25 +01:00
Magne Sjaastad
405cd382af Reorganized how clipper is included and deleted example files 2017-01-24 15:39:39 +01:00
Magne Sjaastad
827f0d670c Fixed includes after merge 2017-01-24 15:23:31 +01:00