Jacob Støren
|
4312968124
|
Removed CppCheck Warnings
|
2017-03-03 17:09:30 +01:00 |
|
Jacob Støren
|
b00ad4ba4a
|
Fixed some CppCheck Performance warnings
|
2017-03-03 16:23:20 +01:00 |
|
Magne Sjaastad
|
e7b920fab8
|
Removed unused files
|
2017-03-03 14:12:03 +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 |
|
Jacob Støren
|
8f2affe670
|
#1120 Well Alloc Plot: Simple TVD calculations
|
2017-03-01 16:09:28 +01:00 |
|
Jacob Støren
|
984762ab5d
|
#1268 Well Alloc Plots: Fixed missing grouping of small contributions for pseudo depth
|
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 |
|
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
|
528b064569
|
#1171 Made the branch contribution a bit cleaner by splitting the cells own contribution as one point, and the branch inflow as another at the same depth, creating a step at the upper cell 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
|
e1d579f195
|
#1171 Fixed assert regarding total flow pr. pseudo lenght
|
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 |
|
Jacob Støren
|
601a920337
|
#1171 WIP: Calculated pseudo length-based flow (Both accumulated and not)
|
2017-02-28 11:47:11 +01:00 |
|
Jacob Støren
|
ccd5294ded
|
More refactoring as preparation to #1171 and #1120
|
2017-02-28 11:47:11 +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
|
10f14aee8e
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
|
2017-02-27 07:13:06 +01:00 |
|
Magne Sjaastad
|
1af3df6c6c
|
#1255 Removed includes from RimWellLogCurve
|
2017-02-24 14:14:29 +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
|
a29f325125
|
Guard time step index
|
2017-02-20 10:04:21 +01:00 |
|
Magne Sjaastad
|
b7aebbb392
|
#1230 Created StimPlan colors and show lenged in 3D view
|
2017-02-20 09:31:24 +01:00 |
|
Jacob Støren
|
d69a6e1daa
|
Linux compile fix
|
2017-02-17 16:04:16 +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
|
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
|
e971c5276d
|
#1139 - pre-proto - Reading in all parameters available in StimPlan file.
|
2017-02-17 14:14:48 +01:00 |
|
astridkbjorke
|
1fbc11acc9
|
#1139 - pre-proto - Starting reading in units from XML file
|
2017-02-17 10:11:33 +01:00 |
|
Magne Sjaastad
|
81c92d2781
|
#1230 Added infrastructure for loadAndUpdate of StimPlan data
|
2017-02-17 09:29:46 +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 |
|
Jacob Støren
|
4fc0839a33
|
#1211 Disabled tracer allocation for wells with inconsistent flow.
|
2017-02-15 12:29:58 +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 |
|
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 |
|
Jacob Støren
|
df35335744
|
#1172 Well Alloc plot: Sorted the tracers according to contribution.
|
2017-02-14 08:10:39 +01:00 |
|
Magne Sjaastad
|
2ee25c6cf5
|
Use triangleIndices instead of polygonIndices
|
2017-02-10 11:32:18 +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 |
|
Jacob Støren
|
491e0bcb7c
|
Fixed too much unit conversion...
|
2017-02-09 15:27:34 +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 |
|
Magne Sjaastad
|
93954fece0
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
ApplicationCode/Commands/RicDeleteItemFeature.cpp
|
2017-02-08 07:35:20 +01:00 |
|
Jacob Støren
|
76bc449d1f
|
#1161 and #1188 Fixed problems with last MSW segments. Two errors: missing last segment ID, and missing drawing the last pipe segment.
|
2017-02-07 10:53:48 +01:00 |
|
Jacob Støren
|
94a90c8796
|
Fixed #1188 The connection number calculation was wrong
|
2017-02-07 10:53:48 +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 |
|
Jacob Støren
|
4a3ffb9238
|
#1166 Added the reservoir part of the well allocation plot
|
2017-02-03 15:52:37 +01:00 |
|
astridkbjorke
|
5630df5c1c
|
pre-proto - Deleting line segments shorter than tolerance used when connecting line segments to polygons.
|
2017-02-03 14:12:40 +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 |
|