Magne Sjaastad
|
07b9eba3a8
|
Fixed missing include
|
2017-01-18 13:38:34 +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
|
539db3cc52
|
#1128m Cleaned up includes
|
2017-01-18 09:56:42 +01:00 |
|
Magne Sjaastad
|
f5000766c4
|
#1077 Added option to draw simulation well pipes from center to center
|
2017-01-18 08:06:03 +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 |
|
Magne Sjaastad
|
07865268b1
|
Snapshot : Set fields read only based on state of other fields
|
2017-01-17 12:59:13 +01:00 |
|
Magne Sjaastad
|
3488ada29d
|
#1083 Snapshot : Added None to view list
|
2017-01-17 11:05:21 +01:00 |
|
Magne Sjaastad
|
9c1e9f0970
|
#1080 Snapshot : Show parameter and case as default
|
2017-01-17 10:40:38 +01:00 |
|
Magne Sjaastad
|
22f870bff0
|
#1082 Snapshot : Added four empty rows
|
2017-01-16 23:21:28 +01:00 |
|
Magne Sjaastad
|
2292debc6b
|
#1085 Snapshots : Added toggle to control if a snapshot definition is active
|
2017-01-16 22:55:22 +01:00 |
|
astridkbjorke
|
e476364362
|
pre-proto - Fixing include statements after build error
|
2017-01-16 15:01:39 +01:00 |
|
astridkbjorke
|
9e822382b1
|
#1041 - pre-proto - Adding function for finding overlap polygon between fracture and cell/frac-plane-polygon. Calculating area for use in transmissibiity calculation.
|
2017-01-16 14:50:25 +01:00 |
|
astridkbjorke
|
990a6b3d3b
|
#1041 - pre-proto - Finding polygons for intersections between each cell and fracture plane.
|
2017-01-13 15:49:21 +01:00 |
|
Magne Sjaastad
|
723e0f9286
|
#1107 #1111 Added update of well allocation plot from 3D view
|
2017-01-13 13:32:17 +01:00 |
|
Magne Sjaastad
|
ccb88c6520
|
Rename
|
2017-01-13 13:32:17 +01:00 |
|
Magne Sjaastad
|
0cbdcd587d
|
#1105 Stripped down basic infrastructure code
|
2017-01-13 13:32:17 +01:00 |
|
astridkbjorke
|
ed8d237b7b
|
#1041 - pre-proto - Adding functions for returning fracture geometry and polygon
|
2017-01-13 08:58:36 +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 |
|
Magne Sjaastad
|
8ce8b4e7f1
|
#1105 Added framework files for Well Allocation plot
|
2017-01-12 15:00:23 +01:00 |
|
Magne Sjaastad
|
fcd2a09f83
|
#1105 Created new folder for flow project files
|
2017-01-12 15:00:23 +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
|
ba2362ffce
|
pre-proto - Update cmake file after rename (forgotten in last commit)
|
2017-01-12 13:31:33 +01:00 |
|
astridkbjorke
|
703bdb9669
|
pre-proto - Rename
|
2017-01-12 13:29:18 +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 |
|
Magne Sjaastad
|
597dc46945
|
#1102 Possible to select all injectors/all producers
|
2017-01-12 11:13:33 +01:00 |
|
astridkbjorke
|
86d98cb55b
|
pre-proto - Adding function for getting the transformMatrix of polygon
|
2017-01-12 10:52:47 +01:00 |
|
astridkbjorke
|
44aefe6ed7
|
pre-proto - Rename RimFractureDefinition to RimFractureEllipseDefinition
|
2017-01-12 10:33:33 +01:00 |
|
astridkbjorke
|
63e975f6ff
|
pre-proto - Rename (and adding todo-s for further work)
|
2017-01-12 10:24:01 +01:00 |
|
Magne Sjaastad
|
4ec7c97a77
|
#1056 Removed obsolete code
|
2017-01-11 21:41:22 +01:00 |
|
Magne Sjaastad
|
4a9fec49bf
|
#1056 Added cell edge picking text info
|
2017-01-11 21:07:03 +01:00 |
|
Magne Sjaastad
|
392e08a2ab
|
#1056 Flow diagnostics cell edge min/max in info box
|
2017-01-11 20:44:32 +01:00 |
|
Magne Sjaastad
|
f16228ecc5
|
#1056 Added support for flow data for cell edge in 3D view
|
2017-01-11 15:03:39 +01:00 |
|
astridkbjorke
|
97cdf836cd
|
#1092 - pre-proto - Update export function to be able to handle multple cells for each fracture. Calculated / exported values not yet correct.
|
2017-01-11 14:32:42 +01:00 |
|
astridkbjorke
|
a7ecea983c
|
#1092 - pre-proto - Adding function writeFracturesToTextFile which replaces old functions which were separate for SimWellFractures and WellPathFractures.
|
2017-01-11 14:32:42 +01:00 |
|
astridkbjorke
|
2817e0d34d
|
#1092 - pre-proto - Renaming RicExportFractureWellCompletionFeature to RicExportSimWellFractureWellCompletionFeature
|
2017-01-11 14:32:42 +01:00 |
|
astridkbjorke
|
9f82319a86
|
#1092 - pre-proto - Adding feature for exporting COMPDAT file for well path fractures.
|
2017-01-11 14:32:42 +01:00 |
|
astridkbjorke
|
dc1e29c419
|
#1041 - pre-proto - started on function to calculate transmissibility. Not yet complete.
|
2017-01-11 14:32:42 +01:00 |
|
astridkbjorke
|
524f39e434
|
#1092 - pre-proto - Saving file with COMPDAT keyword for sim well fractures. Transmissibilities still dummy values.
|
2017-01-11 14:32:42 +01:00 |
|
astridkbjorke
|
9bba00999e
|
#1092 - pre-proto - Added feature for exporting fracture data to file. File is written, but not with any useful information yet.
|
2017-01-11 14:32:42 +01:00 |
|
Magne Sjaastad
|
6c84f9f59e
|
#1101 Added azimuth to fracture, and update visualization
|
2017-01-10 13:37:50 +01:00 |
|
Magne Sjaastad
|
bb89994dbc
|
#1101 Added azimuth
|
2017-01-10 10:53:54 +01:00 |
|
Magne Sjaastad
|
a3cbf7da85
|
Fixup after merge
|
2017-01-10 10:12:14 +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
|
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 |
|