Commit Graph
4512 Commits
Author SHA1 Message Date
Magne Sjaastad f7521ad12f Merged branch pre-proto into pre-proto 2017-03-02 11:48:35 +01:00
Magne Sjaastad 914a2d9016 Upped to pre-proto.10 2017-03-02 11:47:26 +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 b8c2c8e943 Upped to version 2016.11.flow.9 2017-03-01 16:18:46 +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
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
Magne Sjaastad da416409aa #1266 Assign visible grid parts before appendStaticGeometryPartsToModel() 2017-03-01 14:20:27 +01:00
Magne Sjaastad 4559b9f31a #1263 Flow : Command : Show Contributing Wells command present when applicable 2017-03-01 13:23:16 +01:00
Magne Sjaastad e29c6474bd Minor refactoring 2017-02-28 19:17:36 +01:00
Magne Sjaastad e41979563b #1243 AppFwk : Added line width to mesh line effect 2017-02-28 19:00:26 +01:00
Magne Sjaastad a2e2c99167 #1243 AppFwk : Fixed typo in mesh line effect 2017-02-28 18:48:33 +01:00
Magne Sjaastad be6a2e0d39 #1243 Improved how enclosing polygon is visualized 2017-02-28 18:41:58 +01:00
Magne Sjaastad 61f94d90d9 #1243 AppFwk : Added line width to mesh line effect 2017-02-28 18:41:16 +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 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 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 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 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 28b87a1700 #1242 AppFwk : Effect Generator : Discard transparent fragments 2017-02-27 22:20:06 +01:00
Magne Sjaastad 1b01e98c0e Merged branch dev into pre-proto 2017-02-27 14:03:33 +01:00
Magne Sjaastad 48599f7a94 #1257 More null pointer guards based on CppCheck 2017-02-27 14:01:18 +01:00
Magne Sjaastad bf1f8fcbaa #1254 Use static methods instead of macros 2017-02-27 13:17:32 +01:00
Magne Sjaastad 97d7e5b809 Added RimSummaryCase 2017-02-27 12:01:23 +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
astridkbjorke de8dc2db3c pre-proto - Reading XML when creating new StimPlan fracture template 2017-02-27 10:49:46 +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 1792290ef0 #1255 Removed includes from RivReservoirWellSpheresPartMgr 2017-02-24 13:48:19 +01:00
Magne Sjaastad 6e960e74c3 #1255 Removed includes in Riv classes 2017-02-24 13:34:25 +01:00