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

Moved mock model identicators to RimDefines

Browse Source
This commit is contained in:
Magne Sjaastad 2013-10-28 07:30:00 +01:00
parent 48d6986954
commit 3e8a206f13
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Application/RiaApplication.cpp
View File

@ -699,7 +699,7 @@ bool RiaApplication::openInputEclipseCaseFromFileNames(const QStringList& fileNa
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiaApplication::createMockModel() void RiaApplication::createMockModel()
{ {
openEclipseCase("Result Mock Debug Model Simple", "Result Mock Debug Model Simple"); openEclipseCase(RimDefines::mockModelBasic(), RimDefines::mockModelBasic());
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -707,7 +707,7 @@ void RiaApplication::createMockModel()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiaApplication::createResultsMockModel() void RiaApplication::createResultsMockModel()
{ {
openEclipseCase("Result Mock Debug Model With Results", "Result Mock Debug Model With Results"); openEclipseCase(RimDefines::mockModelBasicWithResults(), RimDefines::mockModelBasicWithResults());
} }
@ -716,7 +716,7 @@ void RiaApplication::createResultsMockModel()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiaApplication::createLargeResultsMockModel() void RiaApplication::createLargeResultsMockModel()
{ {
openEclipseCase("Result Mock Debug Model Large With Results", "Result Mock Debug Model Large With Results"); openEclipseCase(RimDefines::mockModelLargeWithResults(), RimDefines::mockModelLargeWithResults());
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

9
ApplicationCode/ProjectDataModel/RimDefines.h
View File

@ -41,7 +41,14 @@ public:
static QString undefinedResultName() { return "None"; } static QString undefinedResultName() { return "None"; }
static QString undefinedGridFaultName() { return "Undefined grid faults"; } static QString undefinedGridFaultName() { return "Undefined grid faults"; }
static QString combinedTransmissibilityResultName() { return "TRANSXYZ"; } static QString combinedTransmissibilityResultName() { return "TRANSXYZ"; }
// Mock model text identifiers
static QString mockModelBasic() { return "Result Mock Debug Model Simple"; }
static QString mockModelBasicWithResults() { return "Result Mock Debug Model With Results"; }
static QString mockModelLargeWithResults() { return "Result Mock Debug Model Large With Results"; }
static QString mockModelBasicInputCase() { return "Input Mock Debug Model Simple"; }
}; };

6
ApplicationCode/ProjectDataModel/RimResultCase.cpp
View File

@ -199,7 +199,7 @@ cvf::ref<RifReaderInterface> RimResultCase::createMockModel(QString modelName)
cvf::ref<RifReaderMockModel> mockFileInterface = new RifReaderMockModel; cvf::ref<RifReaderMockModel> mockFileInterface = new RifReaderMockModel;
cvf::ref<RigCaseData> reservoir = new RigCaseData; cvf::ref<RigCaseData> reservoir = new RigCaseData;
if (modelName == "Result Mock Debug Model Simple") if (modelName == RimDefines::mockModelBasic())
{ {
// Create the mock file interface and and RigSerervoir and set them up. // Create the mock file interface and and RigSerervoir and set them up.
mockFileInterface->setWorldCoordinates(cvf::Vec3d(10, 10, 10), cvf::Vec3d(20, 20, 20)); mockFileInterface->setWorldCoordinates(cvf::Vec3d(10, 10, 10), cvf::Vec3d(20, 20, 20));
@ -221,7 +221,7 @@ cvf::ref<RifReaderInterface> RimResultCase::createMockModel(QString modelName)
//reservoir->mainGrid()->cell(idx).setActiveIndexInMatrixModel(cvf::UNDEFINED_SIZE_T); //reservoir->mainGrid()->cell(idx).setActiveIndexInMatrixModel(cvf::UNDEFINED_SIZE_T);
} }
} }
else if (modelName == "Result Mock Debug Model With Results") else if (modelName == RimDefines::mockModelBasicWithResults())
{ {
mockFileInterface->setWorldCoordinates(cvf::Vec3d(10, 10, 10), cvf::Vec3d(-20, -20, -20)); mockFileInterface->setWorldCoordinates(cvf::Vec3d(10, 10, 10), cvf::Vec3d(-20, -20, -20));
mockFileInterface->setGridPointDimensions(cvf::Vec3st(5, 10, 20)); mockFileInterface->setGridPointDimensions(cvf::Vec3st(5, 10, 20));
@ -234,7 +234,7 @@ cvf::ref<RifReaderInterface> RimResultCase::createMockModel(QString modelName)
cvf::Vec3d& tmp = reservoir->mainGrid()->nodes()[1]; cvf::Vec3d& tmp = reservoir->mainGrid()->nodes()[1];
tmp += cvf::Vec3d(1, 0, 0); tmp += cvf::Vec3d(1, 0, 0);
} }
else if (modelName =="Result Mock Debug Model Large With Results") else if (modelName == RimDefines::mockModelLargeWithResults())
{ {
double startX = 0; double startX = 0;
double startY = 0; double startY = 0;

6
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -1446,9 +1446,9 @@ void RiuMainWindow::slotOpenMultipleCases()
if (1) if (1)
{ {
gridFileNames += "Result Mock Debug Model With Results"; gridFileNames += RimDefines::mockModelBasicWithResults();
gridFileNames += "Result Mock Debug Model With Results"; gridFileNames += RimDefines::mockModelBasicWithResults();
gridFileNames += "Result Mock Debug Model With Results"; gridFileNames += RimDefines::mockModelBasicWithResults();
} }
else else
{ {