Commit Graph

539 Commits

Author SHA1 Message Date
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
Magne Sjaastad
36bcdab426 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
2017-01-18 12:19:07 +01:00
Magne Sjaastad
e0ba009e34 Cleaned up includes
Removed includes to cvfLibCore and friends. Removed several includes from header files.
2017-01-17 15:11:02 +01:00
Jacob Støren
96396eed10 #1122 Added a progress bar when calculating flowdiagnostics results 2017-01-12 16:39:12 +01:00
Magne Sjaastad
894b4468b4 #1125 Limit size of string in legend and info, reordered tracer combo 2017-01-12 15:00:23 +01:00
Jacob Støren
53400a1497 #1099 Not necessary with both Gas and Oil phases 2017-01-12 14:39:30 +01:00
Jacob Støren
bd31317000 #1099 Flow results only available when the case has fluxes 2017-01-12 14:16:39 +01:00
astridkbjorke
89bf71b664 #1041 - pre-proto - Adding new functions transformMatrix (for calculating transform Matrix for fracture) and getPotentiallyFracturedCells (finding all cells in bounding box for fracture geometry) in RimFracture. Relevant code is updated to use these functions. 2017-01-12 12:19:52 +01:00
Jacob Støren
3d7d3096eb #1123 Fixed missing timestep problem. Using Report Step Number, not timestep index. 2017-01-12 12:07:07 +01:00
Jacob Støren
b584590588 #1115 Fixed crash on norne due to missing handling of closed wells/inoperative wells 2017-01-12 12:07:07 +01:00
astridkbjorke
63e975f6ff pre-proto - Rename (and adding todo-s for further work) 2017-01-12 10:24:01 +01:00
Magne Sjaastad
c638def4d6 Fixed missing includes 2017-01-12 08:20:50 +01:00
Magne Sjaastad
b104b1a97c #1056 Simplified TimeHistoryResultAccessor
#1056 Simplified TimeHistoryResultAccessor
2017-01-12 07:22:19 +01:00
Magne Sjaastad
4ec7c97a77 #1056 Removed obsolete code 2017-01-11 21:41:22 +01:00
astridkbjorke
dc1e29c419 #1041 - pre-proto - started on function to calculate transmissibility. Not yet complete. 2017-01-11 14:32:42 +01:00
Magne Sjaastad
9cd17ec508 Merge dev into pre-proto
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseView.cpp
	ApplicationCode/ProjectDataModel/RimEclipseView.h
2017-01-10 10:09:44 +01:00
Magne Sjaastad
8970d93a4d #1068 Renamed to RigEclipseCaseData 2017-01-10 09:51:39 +01:00
Magne Sjaastad
36c008a12c #1068 Removed obsolute include 2017-01-10 09:20:03 +01:00
Magne Sjaastad
50b9fe0ece #1068 Removed obsolete include of RigCaseData 2017-01-10 09:20:03 +01:00
Magne Sjaastad
f70806e056 #1068 Avoid include of RigCell.h and RigSingleWellResultsData in RigCaseData.h 2017-01-10 09:20:03 +01:00
Magne Sjaastad
93032a23eb #1068 Avoid include of RigActiveCellInfo.h in RigCaseData.h 2017-01-10 09:20:03 +01:00
Magne Sjaastad
ccd4cb24c9 #1068 Avoid include of RigMainGrid.h in RigCaseData.h 2017-01-10 09:20:03 +01:00
Jacob Støren
396069ae28 Fixed Linux comiler warnings 2017-01-10 08:48:58 +01:00
astridkbjorke
3f052976f5 #1040 - pre-proto - Converting facture coordinates to display coordinates for visualization. Fractures not yet shown at correct possition. 2017-01-06 15:55:53 +01:00
Jacob Støren
c65c9b1c58 #1058 Convert time of flight to days 2017-01-06 15:12:13 +01:00
Jacob Støren
c19fc232c8 #1049 Reuse Opm::ECLGraph and Opm::Flowdiagnostics::Toolbox for each timestep. 2017-01-06 14:41:00 +01:00
astridkbjorke
7e0417b310 pre-proto - Updated handling of negative measured depth values in function for interpolating point along well path 2017-01-04 14:09:40 +01:00
astridkbjorke
996aebc7ac pre-proto - For WellPathFractures, position along well path is updated when setting a new value for measured depth 2017-01-04 13:29:25 +01:00
Jacob Støren
03cf09d90a System: Created a general basename cleanup function, and applied that when creating filenames from userdescription etc. Related to #1054 preparations 2017-01-04 10:45:04 +01:00
Magne Sjaastad
d1bf189154 #1040 Established basis for fracture visualization 2017-01-04 08:10:02 +01:00
Magne Sjaastad
f8ef9bddc7 #1069 Added ellipsis tesselator 2017-01-04 07:39:08 +01:00