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

..

GridBox

#719 Extended Grid Box axis to make sure a label coord is present both above max coord and below min coord

2016-09-02 14:04:17 +02:00

Intersections

Reverted 4ec7c97a77

2017-01-19 10:37:59 +01:00

CMakeLists_files.cmake

Refactored visualization : One part manager for each fracture

2017-01-19 07:28:04 +01:00

RivCellEdgeEffectGenerator.cpp

#168 Fixed shader based light in parallel projection

2016-08-16 10:58:07 +02:00

RivCellEdgeEffectGenerator.h

System : Replaced tab with four spaces in ApplicationCode and subfolders

2015-10-23 15:46:25 +02:00

RivCellEdgeGeometryUtils.cpp

Reverted 4ec7c97a77

2017-01-19 10:37:59 +01:00

RivCellEdgeGeometryUtils.h

Reverted 4ec7c97a77

2017-01-19 10:37:59 +01:00

RivCellSetEnum.h

Added comment

2016-11-17 10:05:00 +01:00

RivColorTableArray.cpp

Updated file header for new files

2014-09-24 07:14:52 +02:00

RivColorTableArray.h

Updated file header for new files

2014-09-24 07:14:52 +02:00

RivFaultGeometryGenerator.cpp

Updated file header for new files

2014-09-24 07:14:52 +02:00

RivFaultGeometryGenerator.h

System : Replaced tab with four spaces in ApplicationCode and subfolders

2015-10-23 15:46:25 +02:00

RivFaultPartMgr.cpp

#1068 Renamed to RigEclipseCaseData

2017-01-10 09:51:39 +01:00

RivFaultPartMgr.h

Fixed issued reported by CppDepends

2015-12-07 12:53:36 +01:00

RivGridPartMgr.cpp

#1068 Renamed to RigEclipseCaseData

2017-01-10 09:51:39 +01:00

RivGridPartMgr.h

Renamed variables according to newly renamed class names

2015-06-26 10:00:46 +02:00

RivNNCGeometryGenerator.cpp

Fixed compiler warnings for variables declared outside an OpenMP loop

2016-08-11 15:30:55 +02:00

RivNNCGeometryGenerator.h

Updated file header for new files

2014-09-24 07:14:52 +02:00

RivPipeGeometryGenerator.cpp

Merge remote-tracking branch 'refs/remotes/origin/dev'

2017-01-18 12:19:07 +01:00

RivPipeGeometryGenerator.h

Cleaned up includes

2017-01-17 14:27:30 +01:00

RivPipeQuadToSegmentMapper.cpp

(#404) WIP - Quad to segment mapper to determine well path depth

2015-09-10 14:03:59 +02:00

RivPipeQuadToSegmentMapper.h

Fixed Linux compile issue

2015-09-14 13:14:37 +02:00

RivReservoirFaultsPartMgr.cpp

#1068 Access mainGrid directly from RimEclipseView

2017-01-09 10:51:06 +01:00

RivReservoirFaultsPartMgr.h

#944 Added clear of watertight flag

2016-11-21 13:13:53 +01:00

RivReservoirPartMgr.cpp

#1068 Renamed to RigEclipseCaseData

2017-01-10 09:51:39 +01:00

RivReservoirPartMgr.h

#1068 Renamed to RigEclipseCaseData

2017-01-10 09:51:39 +01:00

RivReservoirPipesPartMgr.cpp

#1044 - pre-proto - Updates in infrastructure for finding i,j,k for simulation well

2017-01-04 09:28:10 +01:00

RivReservoirPipesPartMgr.h

#1044 - pre-proto - Updates in infrastructure for finding i,j,k for simulation well

2017-01-04 09:28:10 +01:00

RivReservoirViewPartMgr.cpp

Reverted 4ec7c97a77

2017-01-19 10:37:59 +01:00

RivReservoirViewPartMgr.h

#945 Use visible grid parts to force watertight faults

2016-11-21 13:13:53 +01:00

RivReservoirWellSpheresPartMgr.cpp

#1025 Removed unsused code and renamed to isWellPipe/SpheresVisible

2016-12-14 07:15:44 +01:00

RivReservoirWellSpheresPartMgr.h

#1025 Removed unsused code and renamed to isWellPipe/SpheresVisible

2016-12-14 07:15:44 +01:00

RivResultToTextureMapper.h

Updated file header for new files

2014-09-24 07:14:52 +02:00

RivScalarMapperUtils.cpp

(#805) Cleaned up includes and generalized access to overlayItemLegend

2016-08-05 17:19:49 +02:00

RivScalarMapperUtils.h

System : Replaced tab with four spaces in ApplicationCode and subfolders

2015-10-23 15:46:25 +02:00

RivSimWellPipeSourceInfo.cpp

#1044 - pre-proto - Updates in infrastructure for finding i,j,k for simulation well

2017-01-04 09:28:10 +01:00

RivSimWellPipeSourceInfo.h

#1044 - pre-proto - Updates in infrastructure for finding i,j,k for simulation well

2017-01-04 09:28:10 +01:00

RivSimWellPipesPartMgr.cpp

Merge remote-tracking branch 'refs/remotes/origin/dev'

2017-01-24 15:23:02 +01:00

RivSimWellPipesPartMgr.h

#1128 Use well color along pipe in undefined sections

2017-01-18 09:44:48 +01:00

RivSingleCellPartGenerator.cpp

#1068 Renamed to RigEclipseCaseData

2017-01-10 09:51:39 +01:00

RivSingleCellPartGenerator.h

#1068 Renamed to RigEclipseCaseData

2017-01-10 09:51:39 +01:00

RivSourceInfo.cpp

Updated file header for new files

2014-09-24 07:14:52 +02:00

RivSourceInfo.h

Implemented #310 Result info when picking

2015-06-11 11:38:51 +02:00

RivTernaryResultToTextureMapper.h

(#166) Improvements to ternary result visualization

2015-11-24 09:59:25 +01:00

RivTernarySaturationOverlayItem.cpp

Updated file header for new files

2014-09-24 07:14:52 +02:00

RivTernarySaturationOverlayItem.h

Updated file header for new files

2014-09-24 07:14:52 +02:00

RivTernaryScalarMapper.cpp

(#166) Improvements to ternary result visualization

2015-11-24 09:59:25 +01:00

RivTernaryScalarMapper.h

System : Replaced tab with four spaces in ApplicationCode and subfolders

2015-10-23 15:46:25 +02:00

RivTernaryScalarMapperEffectGenerator.cpp

#168 Fixed shader based light in parallel projection

2016-08-16 10:58:07 +02:00

RivTernaryScalarMapperEffectGenerator.h

System : Replaced tab with four spaces in ApplicationCode and subfolders

2015-10-23 15:46:25 +02:00

RivTernaryTextureCoordsCreator.cpp

#1068 Renamed to RigEclipseCaseData

2017-01-10 09:51:39 +01:00

RivTernaryTextureCoordsCreator.h

(#166) Improvements to ternary result visualization

2015-11-24 09:59:25 +01:00

RivTextureCoordsCreator.cpp

Reverted 4ec7c97a77

2017-01-19 10:37:59 +01:00

RivTextureCoordsCreator.h

System : Replaced tab with four spaces in ApplicationCode and subfolders

2015-10-23 15:46:25 +02:00

RivWellFracturePartMgr.cpp

Refactored visualization : One part manager for each fracture

2017-01-19 07:28:04 +01:00

RivWellFracturePartMgr.h

Refactored visualization : One part manager for each fracture

2017-01-19 07:28:04 +01:00

RivWellHeadPartMgr.cpp

Cleaned up includes

2017-01-17 14:27:30 +01:00

RivWellHeadPartMgr.h

#1127 Now possible to select well by clicking on well head geometry

2017-01-17 14:18:03 +01:00

RivWellPathCollectionPartMgr.cpp

#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

RivWellPathCollectionPartMgr.h

#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

RivWellPathPartMgr.cpp

Refactored visualization : One part manager for each fracture

2017-01-19 07:28:04 +01:00

RivWellPathPartMgr.h

#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

RivWellPathSourceInfo.cpp

(#694) Fixed missing assigment

2015-12-09 12:26:32 +01:00

RivWellPathSourceInfo.h

(#404) Added display of picked well path text in Result Info

2015-12-04 15:15:54 +01:00

RivWellSpheresPartMgr.cpp

#1128m Cleaned up includes

2017-01-18 09:56:42 +01:00

RivWellSpheresPartMgr.h

#1025 Removed unsused code and renamed to isWellPipe/SpheresVisible

2016-12-14 07:15:44 +01:00