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

..

Flow

#1118 Calculate and display flow rate

2017-01-24 14:25:31 +01:00

Summary

#1107 Moved showWindow field to RimViewWindow and removed showWindow field from derived classes

2017-01-20 16:25:05 +01:00

CMakeLists_files.cmake

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

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

Rim3dOverlayInfoConfig.cpp

#1125 Limit size of string in legend and info, reordered tracer combo

2017-01-12 15:00:23 +01:00

Rim3dOverlayInfoConfig.h

#1052 3D info box: Added Flow Diag results statistics etc.

2017-01-03 13:15:27 +01:00

RimBinaryExportSettings.cpp

(#495) Removed use of StdInclude

2015-09-25 15:57:50 +02:00

RimBinaryExportSettings.h

Updated to version 0.8.0

2012-06-26 16:10:41 +02:00

RimCalcScript.cpp

(#495) Removed use of StdInclude

2015-09-25 15:57:50 +02:00

RimCalcScript.h

Removed obsolete code

2013-04-22 14:44:43 +02:00

RimCase.cpp

#1059 Rename

2017-01-05 07:57:37 +01:00

RimCase.h

#811, #812 WIP, Formation names coloring of cells. First shot. Works but needs refinment.

2016-09-06 10:27:30 +02:00

RimCaseCollection.cpp

Fixed new tree view regarding Statisics Cases

2015-08-12 10:51:48 +02:00

RimCaseCollection.h

Major modularization adjustments

2015-07-31 18:58:23 +02:00

RimCellEdgeColors.cpp

#1125 Limit size of string in legend and info, reordered tracer combo

2017-01-12 15:00:23 +01:00

RimCellEdgeColors.h

#1125 Limit size of string in legend and info, reordered tracer combo

2017-01-12 15:00:23 +01:00

RimCellFilter.cpp

#1059 Rename

2017-01-05 07:57:37 +01:00

RimCellFilter.h

#837 GeoMech: Added formation property filter. Moved some functionality to RimCellFilter

2016-09-13 13:43:27 +02:00

RimCellRangeFilter.cpp

#1068 Removed obsolete include of RigCaseData

2017-01-10 09:20:03 +01:00

RimCellRangeFilter.h

(#483) Improved how filters and filter collections are grayed out

2015-11-02 09:50:44 +01:00

RimCellRangeFilterCollection.cpp

#1068 Removed obsolete include of RigCaseData

2017-01-10 09:20:03 +01:00

RimCellRangeFilterCollection.h

(#483) Improved disabled state (gray icon) for range filters/filtercollection

2015-11-02 09:50:43 +01:00

RimCommandObject.cpp

#922 Replace use of setValueFromUi

2016-10-20 11:25:22 +02:00

RimCommandObject.h

Fixed includes for linux

2015-08-04 13:40:57 +02:00

RimContextCommandBuilder.cpp

pre-proto - Rename

2017-01-12 13:29:18 +01:00

RimContextCommandBuilder.h

(#657) Improved 3D view commands and context menu creation

2015-11-19 18:57:32 +01:00

RimDefines.cpp

#1028 Flow Diag Solution object. #1029 Flow Diag Result type in Result Definition along with some refactoring.

2016-12-14 09:50:30 +01:00

RimDefines.h

#1028 Flow Diag Solution object. #1029 Flow Diag Result type in Result Definition along with some refactoring.

2016-12-14 09:50:30 +01:00

RimEclipseCase.cpp

#1068 Renamed to RigEclipseCaseData

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

RimEclipseCase.h

#1068 Renamed to RigEclipseCaseData

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

RimEclipseCaseCollection.cpp

#1068 Renamed to RigEclipseCaseData

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

RimEclipseCaseCollection.h

#1068 Renamed to RigEclipseCaseData

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

RimEclipseCellColors.cpp

#1056 Added support for flow data for cell edge in 3D view

2017-01-11 15:03:39 +01:00

RimEclipseCellColors.h

#1056 Added support for flow data for cell edge in 3D view

2017-01-11 15:03:39 +01:00

RimEclipseFaultColors.cpp

#1068 Removed obsolete include of RigCaseData

2017-01-10 09:20:03 +01:00

RimEclipseFaultColors.h

#1029 Refactored to prepare for more Flow Diag. Removed use of specific field visibility methods

2016-12-14 10:27:46 +01:00

RimEclipseInputCase.cpp

#1068 Renamed to RigEclipseCaseData

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

RimEclipseInputCase.h

[System] Cleaned up unused variables and functions

2015-11-19 07:57:45 +01:00

RimEclipseInputCaseOpm.cpp

#1068 Renamed to RigEclipseCaseData

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

RimEclipseInputCaseOpm.h

#789 Add properties from standalone files to opm-parser Input Cases

2016-07-12 18:54:55 +02:00

RimEclipseInputProperty.cpp

#1068 Renamed to RigEclipseCaseData

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

RimEclipseInputProperty.h

#760 Include cleanup

2016-10-21 14:02:06 +02:00

RimEclipseInputPropertyCollection.cpp

Fixed memory leak and removed unused code

2015-12-10 11:39:10 +01:00

RimEclipseInputPropertyCollection.h

Fixed memory leak and removed unused code

2015-12-10 11:39:10 +01:00

RimEclipsePropertyFilter.cpp

#1125 Limit size of string in legend and info, reordered tracer combo

2017-01-12 15:00:23 +01:00

RimEclipsePropertyFilter.h

#1029 Removed updateFieldVisibility methods. Replaced with simpler control in the defineUiOrdering method. Prep. for Flow Diag.

2016-12-14 11:13:54 +01:00

RimEclipsePropertyFilterCollection.cpp

#950 Improved the updates, but there is still work to be done.

2016-11-04 08:08:55 +01:00

RimEclipsePropertyFilterCollection.h

#950 Improved the updates, but there is still work to be done.

2016-11-04 08:08:55 +01:00

RimEclipseResultCase.cpp

#1099 Flow results only available when the case has fluxes

2017-01-12 14:16:39 +01:00

RimEclipseResultCase.h

#1068 Renamed to RigEclipseCaseData

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

RimEclipseResultDefinition.cpp

Fixed type compare

2017-01-23 13:51:44 +01:00

RimEclipseResultDefinition.h

#1125 Limit size of string in legend and info, reordered tracer combo

2017-01-12 15:00:23 +01:00

RimEclipseStatisticsCase.cpp

#1068 Renamed to RigEclipseCaseData

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

RimEclipseStatisticsCase.h

#991 Statistics: Do not modify selected results when loading project file

2016-11-23 10:23:59 +01:00

RimEclipseStatisticsCaseCollection.cpp

Fixed several todo for RimEclipseStatisticsCaseCollection::parentCaseGroup(), removed comments

2015-08-11 18:42:44 +02:00

RimEclipseStatisticsCaseCollection.h

Major modularization adjustments

2015-07-31 18:58:23 +02:00

RimEclipseStatisticsCaseEvaluator.cpp

#1123 Fixed missing timestep problem. Using Report Step Number, not timestep index.

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

RimEclipseStatisticsCaseEvaluator.h

#1068 Renamed to RigEclipseCaseData

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

RimEclipseView.cpp

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

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

RimEclipseView.h

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

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

RimEclipseWell.cpp

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

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

RimEclipseWell.h

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

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

RimEclipseWellCollection.cpp

#1077 Added option to draw simulation well pipes from center to center

2017-01-18 08:06:03 +01:00

RimEclipseWellCollection.h

#1077 Added option to draw simulation well pipes from center to center

2017-01-18 08:06:03 +01:00

RimEllipseFractureTemplate.cpp

#1040 Switch a and b when computing fracture geometry

2017-01-24 15:11:20 +01:00

RimEllipseFractureTemplate.h

#1090 #1089 - pre-proto - Adding perforation length to fracture template and fracture, and azimuth angle to fracture template.

2017-01-24 09:16:51 +01:00

RimExportInputPropertySettings.cpp

Fixed invalid keyword used only in UI

2017-01-07 08:59:19 +01:00

RimExportInputPropertySettings.h

Updated to version 0.8.0

2012-06-26 16:10:41 +02:00

RimFault.cpp

AppFwk : Fixed typo of firstAncestorOrThisOfType

2016-09-21 13:59:41 +02:00

RimFault.h

Updated file header for new files

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

RimFaultCollection.cpp

#1068 Removed obsolete include of RigCaseData

2017-01-10 09:20:03 +01:00

RimFaultCollection.h

Major modularization adjustments

2015-07-31 18:58:23 +02:00

RimFormationNames.cpp

#930, #925, #914

2016-10-21 14:31:31 +02:00

RimFormationNames.h

#903 Fixed formation names file name presentation in UI. Use filename wo/path

2016-10-05 15:43:27 +02:00

RimFormationNamesCollection.cpp

#930, #925, #914

2016-10-21 14:31:31 +02:00

RimFormationNamesCollection.h

#810, #813, #808 Display formation name when picking

2016-08-24 15:19:39 +02:00

RimFracture.cpp

#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

RimFracture.h

#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

RimFractureDefinitionCollection.cpp

pre-proto - Rename

2017-01-12 13:29:18 +01:00

RimFractureDefinitionCollection.h

pre-proto - Rename

2017-01-12 13:29:18 +01:00

RimFractureExportSettings.cpp

#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

RimFractureExportSettings.h

#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

RimGeoMechCase.cpp

#995 Well Log Plot : Crash when opening project file

2016-11-22 11:41:18 +01:00

RimGeoMechCase.h

#913 Added SFI as a derived results depending on two user controllable case constants

2016-10-27 15:03:27 +02:00

RimGeoMechCellColors.cpp

AppFwk : Fixed typo of firstAncestorOrThisOfType

2016-09-21 13:59:41 +02:00

RimGeoMechCellColors.h

#811 Setting default legend type for category results

2016-09-06 14:03:02 +02:00

RimGeoMechModels.cpp

Fixed the GeoMech part of the tree.

2015-08-11 15:23:57 +02:00

RimGeoMechModels.h

Major modularization adjustments

2015-07-31 18:58:23 +02:00

RimGeoMechPropertyFilter.cpp

#1029 Removed updateFieldVisibility methods. Replaced with simpler control in the defineUiOrdering method. Prep. for Flow Diag.

2016-12-14 11:13:54 +01:00

RimGeoMechPropertyFilter.h

#1029 Removed updateFieldVisibility methods. Replaced with simpler control in the defineUiOrdering method. Prep. for Flow Diag.

2016-12-14 11:13:54 +01:00

RimGeoMechPropertyFilterCollection.cpp

#1029 Removed updateFieldVisibility methods. Replaced with simpler control in the defineUiOrdering method. Prep. for Flow Diag.

2016-12-14 11:13:54 +01:00

RimGeoMechPropertyFilterCollection.h

#950 Fixed formation name changes updating for geomech views

2016-11-04 15:10:58 +01:00

RimGeoMechResultDefinition.cpp

#914 Added calculation of element face aligned stress

2016-10-20 10:50:29 +02:00

RimGeoMechResultDefinition.h

#885 Modified Gui texts to show the time lapse state "_DN"

2016-10-10 16:37:13 +02:00

RimGeoMechView.cpp

#1107 Moved showWindow field to RimViewWindow and removed showWindow field from derived classes

2017-01-20 16:25:05 +01:00

RimGeoMechView.h

Refactor related to #1106, #1107, #1109, #1113. Refactored the MDI control

2017-01-19 17:54:01 +01:00

RimGridCollection.cpp

AppFwk : Fixed typo of firstAncestorOrThisOfType

2016-09-21 13:59:41 +02:00

RimGridCollection.h

(#667) Make Grids toggle follow toggle button in toolbar

2015-11-27 13:47:02 +01:00

RimIdenticalGridCaseGroup.cpp

#1123 Fixed missing timestep problem. Using Report Step Number, not timestep index.

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

RimIdenticalGridCaseGroup.h

Major modularization adjustments

2015-07-31 18:58:23 +02:00

RimIntersection.cpp

#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

RimIntersection.h

#927 Rename from cross section to intersection

2016-10-25 10:03:55 +02:00

RimIntersectionBox.cpp

#932 Intersection box : Added xy step size and depth step size

2016-10-25 13:12:43 +02:00

RimIntersectionBox.h

#932 Intersection box : Added xy step size and depth step size

2016-10-25 13:12:43 +02:00

RimIntersectionCollection.cpp

#927 Rename from cross section to intersection

2016-10-25 10:03:55 +02:00

RimIntersectionCollection.h

#927 Rename from cross section to intersection

2016-10-25 10:03:55 +02:00

RimLegendConfig.cpp

Fixed Linux comiler warnings

2017-01-10 08:48:58 +01:00

RimLegendConfig.h

#1053 Disabled the All Timesteps option in Legend range selection

2017-01-03 14:58:34 +01:00

RimMainPlotCollection.cpp

#1118 Calculate and display flow rate

2017-01-24 14:25:31 +01:00

RimMainPlotCollection.h

#1105 Stripped down basic infrastructure code

2017-01-13 13:32:17 +01:00

RimMdiWindowController.cpp

#1107 Moved showWindow field to RimViewWindow and removed showWindow field from derived classes

2017-01-20 16:25:05 +01:00

RimMdiWindowController.h

#1107 Moved showWindow field to RimViewWindow and removed showWindow field from derived classes

2017-01-20 16:25:05 +01:00

RimMimeData.cpp

(#495) Removed use of StdInclude

2015-09-25 15:57:50 +02:00

RimMimeData.h

Added CopyReferencesToClipboardFeature

2015-08-14 10:17:31 +02:00

RimMockModelSettings.cpp

System : Replaced tab with four spaces in ApplicationCode and subfolders

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

RimMockModelSettings.h

Updated file header for new files

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

RimMultiSnapshotDefinition.cpp

Snapshot : Set fields read only based on state of other fields

2017-01-17 12:59:13 +01:00

RimMultiSnapshotDefinition.h

Snapshot : Set fields read only based on state of other fields

2017-01-17 12:59:13 +01:00

RimNoCommonAreaNNC.cpp

Use uiCapability/xmlCapability instead of capability<caf::PdmUiFieldHandle>()(capability<caf::PdmXmlFieldHandle>()

2015-08-05 13:27:36 +02:00

RimNoCommonAreaNNC.h

Updated file header for new files

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

RimNoCommonAreaNncCollection.cpp

(#566) Do not write or read "no common area NNCs" as they are always computed

2015-10-14 13:23:54 +02:00

RimNoCommonAreaNncCollection.h

Major modularization adjustments

2015-07-31 18:58:23 +02:00

RimOilField.cpp

(#1038) - pre-proto - Added new well path fracture from context menu in 3D view. Measured depth along well path for fracture is not yet updated.

2016-12-21 08:35:44 +01:00

RimOilField.h

(#1038) - pre-proto - Added new well path fracture from context menu in 3D view. Measured depth along well path for fracture is not yet updated.

2016-12-21 08:35:44 +01:00

RimPlotCurve.cpp

#871 Curve Filter toggle added

2016-10-05 12:02:15 +02:00

RimPlotCurve.h

#871 Curve Filter toggle added

2016-10-05 12:02:15 +02:00

RimProject.cpp

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

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

RimProject.h

pre-proto - Rename

2017-01-12 13:29:18 +01:00

RimPropertyFilterCollection.cpp

AppFwk : Fixed typo of firstAncestorOrThisOfType

2016-09-21 13:59:41 +02:00

RimPropertyFilterCollection.h

(#625) Added access to the generalized propertyFilterCollection in the view

2015-11-12 10:48:13 +01:00

RimReservoirCellResultsStorage.cpp

#1123 Fixed missing timestep problem. Using Report Step Number, not timestep index.

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

RimReservoirCellResultsStorage.h

Major modularization adjustments

2015-07-31 18:58:23 +02:00

RimScriptCollection.cpp

(#355) Removed source code files for old project tree view

2015-08-24 17:31:20 +02:00

RimScriptCollection.h

(#384) Fixed Script tree in the new project tree

2015-08-20 15:48:37 +02:00

RimSimWellFracture.cpp

Cleanup includes

2017-01-19 13:35:07 +01:00

RimSimWellFracture.h

Cleanup includes

2017-01-19 13:35:07 +01:00

RimSimWellFractureCollection.cpp

#1071 Updated icons for fractures

2017-01-05 14:57:04 +01:00

RimSimWellFractureCollection.h

#1037 - pre-proto - added classes RimSimWellFracture and RimSimWellFractureCollection, and functions for creating new / deleting.

2017-01-02 11:10:25 +01:00

RimTernaryLegendConfig.cpp

#559 : Linked views : Use writeObjectToXmlString to copy field values

2016-12-13 22:15:06 +01:00

RimTernaryLegendConfig.h

#559 Linked views : Removed obsolete storage of RimView

2016-12-13 22:14:57 +01:00

RimTools.cpp

#1059 System : Use PdmOptionItemInfo constructor for PdmObjects

2017-01-05 07:53:14 +01:00

RimTools.h

#1059 System : Use PdmOptionItemInfo constructor for PdmObjects

2017-01-05 07:53:14 +01:00

RimTreeViewStateSerializer.cpp

(#379)(#377) Moved store/restore of tree view state to new tree

2015-08-17 09:38:27 +02:00

RimTreeViewStateSerializer.h

(#379)(#377) Moved store/restore of tree view state to new tree

2015-08-17 09:38:27 +02:00

RimView.cpp

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

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

RimView.h

#1107 Moved showWindow field to RimViewWindow and removed showWindow field from derived classes

2017-01-20 16:25:05 +01:00

RimViewController.cpp

#1068 Removed obsolete include of RigCaseData

2017-01-10 09:20:03 +01:00

RimViewController.h

#552 Linked Views : Added const for clarity

2016-12-15 18:34:42 +01:00

RimViewLinker.cpp

#1068 Access mainGrid directly from RimEclipseView

2017-01-10 09:20:03 +01:00

RimViewLinker.h

#552 Linked Views : Added const for clarity

2016-12-15 18:34:42 +01:00

RimViewLinkerCollection.cpp

(#539) When view is unlinked, ask user to keep either override or original range filter collection

2015-10-21 13:16:09 +02:00

RimViewLinkerCollection.h

(#446) Changed from list of ViewLinkers to one single ViewLinker

2015-09-16 14:26:25 +02:00

RimViewWindow.cpp

#1107 Moved showWindow field to RimViewWindow and removed showWindow field from derived classes

2017-01-20 16:25:05 +01:00

RimViewWindow.h

Made method protected

2017-01-20 17:20:28 +01:00

RimWellLogCurve.cpp

AppFwk : Fixed typo of firstAncestorOrThisOfType

2016-09-21 13:59:41 +02:00

RimWellLogCurve.h

#836 Fixed missing/wrong zoom update for well log plots when opening project.

2016-09-13 09:59:34 +02:00

RimWellLogExtractionCurve.cpp

Reverted 4ec7c97a77

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

RimWellLogExtractionCurve.h

#1032 : WLP Added setter and getter for well path and case

2016-12-17 16:30:38 +01:00

RimWellLogFile.cpp

AppFwk : Fixed typo of firstAncestorOrThisOfType

2016-09-21 13:59:41 +02:00

RimWellLogFile.h

Moved static method to the class where it belongs (more than it did).

2015-09-25 18:14:25 +02:00

RimWellLogFileChannel.cpp

Renamed class/flies

2015-09-18 09:16:59 +02:00

RimWellLogFileChannel.h

Renamed class/flies

2015-09-18 09:16:59 +02:00

RimWellLogFileCurve.cpp

#1059 Rename

2017-01-05 07:57:37 +01:00

RimWellLogFileCurve.h

#739 Renamed and trimmed inside RimPlotCurve

2016-05-23 17:13:03 +02:00

RimWellLogPlot.cpp

#1107 Moved showWindow field to RimViewWindow and removed showWindow field from derived classes

2017-01-20 16:25:05 +01:00

RimWellLogPlot.h

#1107 Moved showWindow field to RimViewWindow and removed showWindow field from derived classes

2017-01-20 16:25:05 +01:00

RimWellLogPlotCollection.cpp

#1068 Renamed to RigEclipseCaseData

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

RimWellLogPlotCollection.h

#1068 Renamed to RigEclipseCaseData

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

RimWellLogTrack.cpp

Refactor related to #1106, #1107, #1109, #1113. Refactored the MDI control

2017-01-19 17:54:01 +01:00

RimWellLogTrack.h

#836 Fixed missing/wrong zoom update for well log plots when opening project.

2016-09-13 09:59:34 +02:00

RimWellPath.cpp

#1037 - pre-proto - Changed RimFracture to RimWellPathFracture (and same for FractureCollection and commands to create / delete fractures)

2017-01-02 11:59:30 +01:00

RimWellPath.h

#1037 - pre-proto - Changed RimFracture to RimWellPathFracture (and same for FractureCollection and commands to create / delete fractures)

2017-01-02 11:59:30 +01:00

RimWellPathCollection.cpp

#1037 - pre-proto - Changed RimFracture to RimWellPathFracture (and same for FractureCollection and commands to create / delete fractures)

2017-01-02 11:59:30 +01:00

RimWellPathCollection.h

#1037 - pre-proto - Moved fractureCollection from wellPathCollection to WellPath

2016-12-21 14:19:52 +01:00

RimWellPathFracture.cpp

Call method in base class when overriding defineEditorAttributes

2017-01-24 15:12:13 +01:00

RimWellPathFracture.h

Added double slider to well path fracture

2017-01-24 14:59:41 +01:00

RimWellPathFractureCollection.cpp

#1071 Updated icons for fractures

2017-01-05 14:57:04 +01:00

RimWellPathFractureCollection.h

pre-proto - Renaming function

2017-01-04 11:39:49 +01:00