OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Files fixed after merge conflicts

Browse Source
This commit is contained in:
Magne Sjaastad 2014-04-14 09:25:27 +02:00
commit ce33c00219
7 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/Application/RiaPreferences.cpp
View File

@ -59,7 +59,10 @@ RiaPreferences::RiaPreferences(void)
CAF_PDM_InitField(&autocomputeSOIL, "autocomputeSOIL", true, "SOIL", "", "SOIL = 1.0 - SGAS - SWAT", ""); CAF_PDM_InitField(&autocomputeSOIL, "autocomputeSOIL", true, "SOIL", "", "SOIL = 1.0 - SGAS - SWAT", "");
CAF_PDM_InitField(&autocomputeDepthRelatedProperties,"autocomputeDepth", true, "DEPTH related properties", "", "DEPTH, DX, DY, DZ, TOP, BOTTOM", ""); CAF_PDM_InitField(&autocomputeDepthRelatedProperties,"autocomputeDepth", true, "DEPTH related properties", "", "DEPTH, DX, DY, DZ, TOP, BOTTOM", "");
<<<<<<< HEAD
CAF_PDM_InitField(&readFaultData, "readFaultData", true, "Read fault data", "", "", ""); CAF_PDM_InitField(&readFaultData, "readFaultData", true, "Read fault data", "", "", "");
=======
>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
CAF_PDM_InitField(&useStreamTransfer, "useStreamTransfer", true, "Use stream transfer to Octave", "", "", ""); CAF_PDM_InitField(&useStreamTransfer, "useStreamTransfer", true, "Use stream transfer to Octave", "", "", "");
CAF_PDM_InitField(&blockSize, "blockSize", 10000, "blockSize", "", "", ""); CAF_PDM_InitField(&blockSize, "blockSize", 10000, "blockSize", "", "", "");
} }

3
ApplicationCode/Application/RiaPreferences.h
View File

@ -63,6 +63,9 @@ public: // Pdm Fields
caf::PdmField<bool> useStreamTransfer; caf::PdmField<bool> useStreamTransfer;
caf::PdmField<int> blockSize; caf::PdmField<int> blockSize;
caf::PdmField<bool> useStreamTransfer;
caf::PdmField<int> blockSize;
protected: protected:
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute); virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);

6
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@ -44,8 +44,11 @@ ${CEE_CURRENT_LIST_DIR}RimStatisticsCaseEvaluator.h
${CEE_CURRENT_LIST_DIR}RimMimeData.h ${CEE_CURRENT_LIST_DIR}RimMimeData.h
${CEE_CURRENT_LIST_DIR}RimCommandObject.h ${CEE_CURRENT_LIST_DIR}RimCommandObject.h
${CEE_CURRENT_LIST_DIR}RimTools.h ${CEE_CURRENT_LIST_DIR}RimTools.h
<<<<<<< HEAD
${CEE_CURRENT_LIST_DIR}RimFault.h ${CEE_CURRENT_LIST_DIR}RimFault.h
${CEE_CURRENT_LIST_DIR}RimFaultCollection.h ${CEE_CURRENT_LIST_DIR}RimFaultCollection.h
=======
>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
${CEE_CURRENT_LIST_DIR}RimMockModelSettings.h ${CEE_CURRENT_LIST_DIR}RimMockModelSettings.h
) )
@ -89,8 +92,11 @@ ${CEE_CURRENT_LIST_DIR}RimStatisticsCaseEvaluator.cpp
${CEE_CURRENT_LIST_DIR}RimMimeData.cpp ${CEE_CURRENT_LIST_DIR}RimMimeData.cpp
${CEE_CURRENT_LIST_DIR}RimCommandObject.cpp ${CEE_CURRENT_LIST_DIR}RimCommandObject.cpp
${CEE_CURRENT_LIST_DIR}RimTools.cpp ${CEE_CURRENT_LIST_DIR}RimTools.cpp
<<<<<<< HEAD
${CEE_CURRENT_LIST_DIR}RimFault.cpp ${CEE_CURRENT_LIST_DIR}RimFault.cpp
${CEE_CURRENT_LIST_DIR}RimFaultCollection.cpp ${CEE_CURRENT_LIST_DIR}RimFaultCollection.cpp
=======
>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
${CEE_CURRENT_LIST_DIR}RimMockModelSettings.cpp ${CEE_CURRENT_LIST_DIR}RimMockModelSettings.cpp
) )

7
ApplicationCode/ProjectDataModel/RimDefines.h
View File

@ -40,8 +40,11 @@ public:
}; };
static QString undefinedResultName() { return "None"; } static QString undefinedResultName() { return "None"; }
<<<<<<< HEAD
static QString undefinedGridFaultName() { return "Undefined grid faults"; } static QString undefinedGridFaultName() { return "Undefined grid faults"; }
static QString combinedTransmissibilityResultName() { return "TRANSXYZ"; } static QString combinedTransmissibilityResultName() { return "TRANSXYZ"; }
=======
>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
// Mock model text identifiers // Mock model text identifiers
@ -51,5 +54,9 @@ public:
static QString mockModelCustomized() { return "Result Mock Debug Model Customized"; } static QString mockModelCustomized() { return "Result Mock Debug Model Customized"; }
static QString mockModelBasicInputCase() { return "Input Mock Debug Model Simple"; } static QString mockModelBasicInputCase() { return "Input Mock Debug Model Simple"; }
<<<<<<< HEAD
=======
>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
}; };

3
ApplicationCode/ProjectDataModel/RimResultCase.cpp
View File

@ -49,7 +49,10 @@
#include "Rim3dOverlayInfoConfig.h" #include "Rim3dOverlayInfoConfig.h"
#include "RimOilField.h" #include "RimOilField.h"
#include "RimAnalysisModels.h" #include "RimAnalysisModels.h"
<<<<<<< HEAD
#include "RiaPreferences.h" #include "RiaPreferences.h"
=======
>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
#include "RimMockModelSettings.h" #include "RimMockModelSettings.h"
CAF_PDM_SOURCE_INIT(RimResultCase, "EclipseCase"); CAF_PDM_SOURCE_INIT(RimResultCase, "EclipseCase");

6
ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
View File

@ -253,8 +253,11 @@ void RigReservoirBuilderMock::populateReservoir(RigCaseData* eclipseCase)
{ {
addWellData(eclipseCase, eclipseCase->mainGrid()); addWellData(eclipseCase, eclipseCase->mainGrid());
} }
<<<<<<< HEAD
addFaults(eclipseCase); addFaults(eclipseCase);
=======
>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
// Set all cells active // Set all cells active
RigActiveCellInfo* activeCellInfo = eclipseCase->activeCellInfo(RifReaderInterface::MATRIX_RESULTS); RigActiveCellInfo* activeCellInfo = eclipseCase->activeCellInfo(RifReaderInterface::MATRIX_RESULTS);
@ -492,6 +495,7 @@ void RigReservoirBuilderMock::addWellData(RigCaseData* eclipseCase, RigGridBase*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
<<<<<<< HEAD
void RigReservoirBuilderMock::addFaults(RigCaseData* eclipseCase) void RigReservoirBuilderMock::addFaults(RigCaseData* eclipseCase)
{ {
if (!eclipseCase) return; if (!eclipseCase) return;
@ -529,6 +533,8 @@ void RigReservoirBuilderMock::addFaults(RigCaseData* eclipseCase)
grid->setFaults(faults); grid->setFaults(faults);
} }
=======
>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
void RigReservoirBuilderMock::enableWellData(bool enableWellData) void RigReservoirBuilderMock::enableWellData(bool enableWellData)
{ {
m_enableWellData = false; m_enableWellData = false;

5
Fwk/AppFwk/cafUserInterface/CMakeLists.txt
View File

@ -38,8 +38,13 @@ endif()
add_library( ${PROJECT_NAME} add_library( ${PROJECT_NAME}
<<<<<<< HEAD
cafAboutDialog.cpp cafAboutDialog.cpp
cafAboutDialog.h cafAboutDialog.h
=======
cafBasicAboutDialog.cpp
cafBasicAboutDialog.h
>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
cafPdmSettings.cpp cafPdmSettings.cpp
cafPdmUiCheckBoxEditor.cpp cafPdmUiCheckBoxEditor.cpp
cafPdmUiCheckBoxEditor.h cafPdmUiCheckBoxEditor.h