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
Magne Sjaastad
426d42935f
Copy up from pre-proto
2017-02-03 10:23:07 +01:00
Magne Sjaastad
0633e6ca39
Fixed mix of signed and unsigned value compare
2017-02-03 10:14:02 +01:00
Magne Sjaastad
9493a1dfc0
Use hasWellResult instead of firstResultTimeStep
2017-02-02 12:52:32 +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
Jacob Støren
3f091aa884
#1112 Guard against none-connection segments in accumulation calculation
2017-01-31 16:35:49 +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
7d2ebd68bf
#1092 - pre-proto - Reading in Dx, Dy, Dz and permeabilities before calculation of transmissibilities.
2017-01-31 12:26:30 +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
b13ca8bb1c
#1135 Compute accumulated length along sim well and added slider
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
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
fccd7d9314
pre-proto - Fixing include
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
aedf184d14
Merge remote-tracking branch 'refs/remotes/origin/dev'
...
Conflicts:
ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
2017-01-26 14:30:13 +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
e845ae1ed8
Merge remote-tracking branch 'refs/remotes/origin/dev'
...
Conflicts:
ApplicationCode/CMakeLists.txt
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
ApplicationCode/ProjectDataModel/RimEclipseWell.h
ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
2017-01-24 15:23:02 +01:00
astridkbjorke
66e2bcd6d8
pre-proto - Fixing include error (and starting method to calculate fracture lenght)
2017-01-24 14:25:18 +01:00
Magne Sjaastad
1b517a8e5e
Added helper class for measured depth
2017-01-24 13:46:35 +01:00
astridkbjorke
08da3e926a
#1091 - pre-proto - Expanding the findCellAverageZdirection function to find local X, Y and Z for a cell.
2017-01-24 12:15:26 +01:00
astridkbjorke
030b405d7f
#1091 - pre-proto - Adding function for finding an "average" z direction, as the vector normal to the vectors between face centers in i and j.
2017-01-24 11:03:07 +01:00
astridkbjorke
02f4b94ca1
#1091 - pre-proto - Moving functions planeHexCellIntersection and createPolygonFromLineSegments from RimFracture to RigCellGeometryTools
2017-01-24 09:16:51 +01:00
Jacob Støren
825c505443
#1112 , #1106 Added and removed fields to make the allocation plot have the needed data to do its calculation. Refacord the CenterLine calculation interface yet again to make it usable.
2017-01-23 11:10:09 +01:00
Jacob Støren
0d7da9788a
#1112 Made conveninece methods to calculate well pipe centerline, and added possibility to do it pr timestep.
2017-01-20 17:20:09 +01:00
Jacob Støren
94f94af325
#1112 Added a flowrate to the well results. Waiting for ERT to include the reading.
2017-01-20 16:12:12 +01:00
Jacob Støren
06b9f13e41
#1112 Well centerline with cell centers improved, and moved to centerline calculator
2017-01-20 15:57:04 +01:00
Jacob Støren
d7782c6ddf
#1112 Refactored well centerline calculation a bit
2017-01-20 15:00:19 +01:00
Jacob Støren
51d6d21d77
Constified wellresultcell to cell
2017-01-20 14:56:08 +01:00
Magne Sjaastad
da371c099b
Merged branch dev into pre-proto
2017-01-19 10:45:22 +01:00
Magne Sjaastad
2edc090c89
Restored previous behaviour related to result accessor creation
2017-01-19 10:39:08 +01:00
Magne Sjaastad
9b42f1ca8c
Reverted 4ec7c97a77
...
Access of RimEclipseCase was done by firstAncestorOf from, and in several cases RimEclipseCase is not parent of RimEclipseCellColors. RimEclipseCase must be explicitly specified.
2017-01-19 10:37:59 +01:00
