diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index f10595a388..9ff31cc740 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -699,7 +699,7 @@ bool RiaApplication::openInputEclipseCaseFromFileNames(const QStringList& fileNa //-------------------------------------------------------------------------------------------------- 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() { - 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() { - openEclipseCase("Result Mock Debug Model Large With Results", "Result Mock Debug Model Large With Results"); + openEclipseCase(RimDefines::mockModelLargeWithResults(), RimDefines::mockModelLargeWithResults()); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimDefines.h b/ApplicationCode/ProjectDataModel/RimDefines.h index 95313686a3..cfb31f48ad 100644 --- a/ApplicationCode/ProjectDataModel/RimDefines.h +++ b/ApplicationCode/ProjectDataModel/RimDefines.h @@ -41,7 +41,14 @@ public: static QString undefinedResultName() { return "None"; } static QString undefinedGridFaultName() { return "Undefined grid faults"; } - 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"; } + }; diff --git a/ApplicationCode/ProjectDataModel/RimResultCase.cpp b/ApplicationCode/ProjectDataModel/RimResultCase.cpp index 4e9157ac22..558245c5f6 100644 --- a/ApplicationCode/ProjectDataModel/RimResultCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimResultCase.cpp @@ -199,7 +199,7 @@ cvf::ref RimResultCase::createMockModel(QString modelName) cvf::ref mockFileInterface = new RifReaderMockModel; cvf::ref 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. mockFileInterface->setWorldCoordinates(cvf::Vec3d(10, 10, 10), cvf::Vec3d(20, 20, 20)); @@ -221,7 +221,7 @@ cvf::ref RimResultCase::createMockModel(QString modelName) //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->setGridPointDimensions(cvf::Vec3st(5, 10, 20)); @@ -234,7 +234,7 @@ cvf::ref RimResultCase::createMockModel(QString modelName) cvf::Vec3d& tmp = reservoir->mainGrid()->nodes()[1]; 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 startY = 0; diff --git a/ApplicationCode/UserInterface/RiuMainWindow.cpp b/ApplicationCode/UserInterface/RiuMainWindow.cpp index 930a0c337c..dd1e7090c2 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.cpp +++ b/ApplicationCode/UserInterface/RiuMainWindow.cpp @@ -1446,9 +1446,9 @@ void RiuMainWindow::slotOpenMultipleCases() if (1) { - gridFileNames += "Result Mock Debug Model With Results"; - gridFileNames += "Result Mock Debug Model With Results"; - gridFileNames += "Result Mock Debug Model With Results"; + gridFileNames += RimDefines::mockModelBasicWithResults(); + gridFileNames += RimDefines::mockModelBasicWithResults(); + gridFileNames += RimDefines::mockModelBasicWithResults(); } else {