diff --git a/ApplicationCode/Application/RiaApplication.h b/ApplicationCode/Application/RiaApplication.h index 3f5ec65924..f15298266a 100644 --- a/ApplicationCode/Application/RiaApplication.h +++ b/ApplicationCode/Application/RiaApplication.h @@ -43,7 +43,7 @@ class RiaPreferences; class RiaProjectModifier; class RiaSocketServer; -class RigCaseData; +class RigEclipseCaseData; class RimCommandObject; class RimEclipseCase; diff --git a/ApplicationCode/Commands/RicExportFaultsFeature.cpp b/ApplicationCode/Commands/RicExportFaultsFeature.cpp index 3d60b1c69f..22a22c59bc 100644 --- a/ApplicationCode/Commands/RicExportFaultsFeature.cpp +++ b/ApplicationCode/Commands/RicExportFaultsFeature.cpp @@ -21,7 +21,7 @@ #include "RiaApplication.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFault.h" #include "RigMainGrid.h" diff --git a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp index 397cf72316..2d282db937 100644 --- a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp +++ b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp @@ -24,7 +24,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RigResultAccessorFactory.h" @@ -73,7 +73,7 @@ RifEclipseInputFileTools::~RifEclipseInputFileTools() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigCaseData* eclipseCase, bool readFaultData) +bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigEclipseCaseData* eclipseCase, bool readFaultData) { CVF_ASSERT(eclipseCase); @@ -202,7 +202,7 @@ bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigCaseData //-------------------------------------------------------------------------------------------------- /// Read known properties from the input file //-------------------------------------------------------------------------------------------------- -std::map RifEclipseInputFileTools::readProperties(const QString& fileName, RigCaseData* caseData) +std::map RifEclipseInputFileTools::readProperties(const QString& fileName, RigEclipseCaseData* caseData) { CVF_ASSERT(caseData); @@ -252,7 +252,7 @@ std::map RifEclipseInputFileTools::readProperties(const QStrin /// Reads the property data requested into the \a reservoir, overwriting any previous /// properties with the same name. //-------------------------------------------------------------------------------------------------- -bool RifEclipseInputFileTools::readProperty(const QString& fileName, RigCaseData* caseData, const QString& eclipseKeyWord, const QString& resultName) +bool RifEclipseInputFileTools::readProperty(const QString& fileName, RigEclipseCaseData* caseData, const QString& eclipseKeyWord, const QString& resultName) { CVF_ASSERT(caseData); @@ -278,7 +278,7 @@ bool RifEclipseInputFileTools::readProperty(const QString& fileName, RigCaseData //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifEclipseInputFileTools::readDataFromKeyword(ecl_kw_type* eclipseKeywordData, RigCaseData* caseData, const QString& resultName) +bool RifEclipseInputFileTools::readDataFromKeyword(ecl_kw_type* eclipseKeywordData, RigEclipseCaseData* caseData, const QString& resultName) { CVF_ASSERT(caseData); CVF_ASSERT(eclipseKeywordData); @@ -443,7 +443,7 @@ const std::vector& RifEclipseInputFileTools::invalidPropertyDataKeyword //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifEclipseInputFileTools::writePropertyToTextFile(const QString& fileName, RigCaseData* eclipseCase, size_t timeStep, const QString& resultName, const QString& eclipseKeyWord) +bool RifEclipseInputFileTools::writePropertyToTextFile(const QString& fileName, RigEclipseCaseData* eclipseCase, size_t timeStep, const QString& resultName, const QString& eclipseKeyWord) { CVF_ASSERT(eclipseCase); @@ -476,7 +476,7 @@ bool RifEclipseInputFileTools::writePropertyToTextFile(const QString& fileName, /// undefinedValue is used for cells with no result //-------------------------------------------------------------------------------------------------- bool RifEclipseInputFileTools::writeBinaryResultToTextFile(const QString& fileName, - RigCaseData* eclipseCase, + RigEclipseCaseData* eclipseCase, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStep, const QString& resultName, @@ -723,7 +723,7 @@ qint64 RifEclipseInputFileTools::findKeyword(const QString& keyword, QFile& file //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -size_t RifEclipseInputFileTools::findOrCreateResult(const QString& newResultName, RigCaseData* reservoir) +size_t RifEclipseInputFileTools::findOrCreateResult(const QString& newResultName, RigEclipseCaseData* reservoir) { size_t resultIndex = reservoir->results(RifReaderInterface::MATRIX_RESULTS)->findScalarResultIndex(newResultName); if (resultIndex == cvf::UNDEFINED_SIZE_T) diff --git a/ApplicationCode/FileInterface/RifEclipseInputFileTools.h b/ApplicationCode/FileInterface/RifEclipseInputFileTools.h index 87de0bc5a1..5f2df60a1c 100644 --- a/ApplicationCode/FileInterface/RifEclipseInputFileTools.h +++ b/ApplicationCode/FileInterface/RifEclipseInputFileTools.h @@ -34,7 +34,7 @@ #include -class RigCaseData; +class RigEclipseCaseData; class QFile; @@ -59,11 +59,11 @@ public: RifEclipseInputFileTools(); virtual ~RifEclipseInputFileTools(); - static bool openGridFile(const QString& fileName, RigCaseData* eclipseCase, bool readFaultData); + static bool openGridFile(const QString& fileName, RigEclipseCaseData* eclipseCase, bool readFaultData); // Returns map of assigned resultName and Eclipse Keyword. - static std::map readProperties(const QString& fileName, RigCaseData* eclipseCase); - static bool readProperty (const QString& fileName, RigCaseData* eclipseCase, const QString& eclipseKeyWord, const QString& resultName ); + static std::map readProperties(const QString& fileName, RigEclipseCaseData* eclipseCase); + static bool readProperty (const QString& fileName, RigEclipseCaseData* eclipseCase, const QString& eclipseKeyWord, const QString& resultName ); static void readFaultsInGridSection(const QString& fileName, cvf::Collection* faults, std::vector* filenamesWithFaults); static void readFaults(const QString& fileName, const std::vector< RifKeywordAndFilePos >& fileKeywords, cvf::Collection* faults); @@ -75,8 +75,8 @@ public: static void parseAndReadPathAliasKeyword(const QString &fileName, std::vector< std::pair >* pathAliasDefinitions); - static bool writePropertyToTextFile(const QString& fileName, RigCaseData* eclipseCase, size_t timeStep, const QString& resultName, const QString& eclipseKeyWord); - static bool writeBinaryResultToTextFile(const QString& fileName, RigCaseData* eclipseCase, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStep, const QString& resultName, const QString& eclipseKeyWord, const double undefinedValue); + static bool writePropertyToTextFile(const QString& fileName, RigEclipseCaseData* eclipseCase, size_t timeStep, const QString& resultName, const QString& eclipseKeyWord); + static bool writeBinaryResultToTextFile(const QString& fileName, RigEclipseCaseData* eclipseCase, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStep, const QString& resultName, const QString& eclipseKeyWord, const double undefinedValue); static bool readFaultsAndParseIncludeStatementsRecursively( QFile& file, qint64 startPos, @@ -88,14 +88,14 @@ public: static cvf::StructGridInterface::FaceEnum faceEnumFromText(const QString& faceString); private: - static bool readDataFromKeyword(ecl_kw_type* eclipseKeywordData, RigCaseData* caseData, const QString& resultName); + static bool readDataFromKeyword(ecl_kw_type* eclipseKeywordData, RigEclipseCaseData* caseData, const QString& resultName); static void writeDataToTextFile(QFile* file, const QString& eclipseKeyWord, const std::vector& resultData); static void findGridKeywordPositions(const std::vector< RifKeywordAndFilePos >& keywords, qint64* coordPos, qint64* zcornPos, qint64* specgridPos, qint64* actnumPos, qint64* mapaxesPos); static size_t findFaultByName(const cvf::Collection& faults, const QString& name); static qint64 findKeyword(const QString& keyword, QFile& file, qint64 startPos); - static size_t findOrCreateResult(const QString& newResultName, RigCaseData* reservoir); + static size_t findOrCreateResult(const QString& newResultName, RigEclipseCaseData* reservoir); static bool isValidDataKeyword(const QString& keyword); private: diff --git a/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp index 2cc07aad74..d9b002fa9f 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp @@ -22,7 +22,7 @@ #include "RifEclipseInputFileTools.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" //================================================================================================== @@ -48,7 +48,7 @@ RifReaderEclipseInput::~RifReaderEclipseInput() //-------------------------------------------------------------------------------------------------- /// Open file and read geometry into given reservoir object //-------------------------------------------------------------------------------------------------- -bool RifReaderEclipseInput::open(const QString& fileName, RigCaseData* eclipseCase) +bool RifReaderEclipseInput::open(const QString& fileName, RigEclipseCaseData* eclipseCase) { CVF_ASSERT(eclipseCase); diff --git a/ApplicationCode/FileInterface/RifReaderEclipseInput.h b/ApplicationCode/FileInterface/RifReaderEclipseInput.h index 32499507e4..4a608885fb 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseInput.h +++ b/ApplicationCode/FileInterface/RifReaderEclipseInput.h @@ -32,7 +32,7 @@ public: virtual ~RifReaderEclipseInput(); // Virtual interface implementation - virtual bool open(const QString& fileName, RigCaseData* eclipseCase); + virtual bool open(const QString& fileName, RigEclipseCaseData* eclipseCase); diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp index 2ba175c576..125b40d198 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp @@ -22,7 +22,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RifEclipseOutputFileTools.h" @@ -231,7 +231,7 @@ void RifReaderEclipseOutput::close() //-------------------------------------------------------------------------------------------------- /// Read geometry from file given by name into given reservoir object //-------------------------------------------------------------------------------------------------- -bool RifReaderEclipseOutput::transferGeometry(const ecl_grid_type* mainEclGrid, RigCaseData* eclipseCase) +bool RifReaderEclipseOutput::transferGeometry(const ecl_grid_type* mainEclGrid, RigEclipseCaseData* eclipseCase) { CVF_ASSERT(eclipseCase); @@ -349,7 +349,7 @@ bool RifReaderEclipseOutput::transferGeometry(const ecl_grid_type* mainEclGrid, //-------------------------------------------------------------------------------------------------- /// Open file and read geometry into given reservoir object //-------------------------------------------------------------------------------------------------- -bool RifReaderEclipseOutput::open(const QString& fileName, RigCaseData* eclipseCase) +bool RifReaderEclipseOutput::open(const QString& fileName, RigEclipseCaseData* eclipseCase) { CVF_ASSERT(eclipseCase); caf::ProgressInfo progInfo(100, ""); @@ -523,7 +523,7 @@ void RifReaderEclipseOutput::transferNNCData( const ecl_grid_type * mainEclGrid //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifReaderEclipseOutput::openAndReadActiveCellData(const QString& fileName, const std::vector& mainCaseTimeSteps, RigCaseData* eclipseCase) +bool RifReaderEclipseOutput::openAndReadActiveCellData(const QString& fileName, const std::vector& mainCaseTimeSteps, RigEclipseCaseData* eclipseCase) { CVF_ASSERT(eclipseCase); @@ -704,16 +704,16 @@ void RifReaderEclipseOutput::buildMetaData() } // Default units type is METRIC - RigCaseData::UnitsType unitsType = RigCaseData::UNITS_METRIC; + RigEclipseCaseData::UnitsType unitsType = RigEclipseCaseData::UNITS_METRIC; { int unitsTypeValue = m_dynamicResultsAccess->readUnitsType(); if (unitsTypeValue == 2) { - unitsType = RigCaseData::UNITS_FIELD; + unitsType = RigEclipseCaseData::UNITS_FIELD; } else if (unitsTypeValue == 3) { - unitsType = RigCaseData::UNITS_LAB; + unitsType = RigEclipseCaseData::UNITS_LAB; } } diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.h b/ApplicationCode/FileInterface/RifReaderEclipseOutput.h index 431d4cc39b..7f32d2d532 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.h +++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.h @@ -49,15 +49,15 @@ public: RifReaderEclipseOutput(); virtual ~RifReaderEclipseOutput(); - bool open(const QString& fileName, RigCaseData* eclipseCase); + bool open(const QString& fileName, RigEclipseCaseData* eclipseCase); - virtual bool openAndReadActiveCellData(const QString& fileName, const std::vector& mainCaseTimeSteps, RigCaseData* eclipseCase); + virtual bool openAndReadActiveCellData(const QString& fileName, const std::vector& mainCaseTimeSteps, RigEclipseCaseData* eclipseCase); void close(); bool staticResult(const QString& result, PorosityModelResultType matrixOrFracture, std::vector* values); bool dynamicResult(const QString& result, PorosityModelResultType matrixOrFracture, size_t stepIndex, std::vector* values); - static bool transferGeometry(const ecl_grid_type* mainEclGrid, RigCaseData* eclipseCase); + static bool transferGeometry(const ecl_grid_type* mainEclGrid, RigEclipseCaseData* eclipseCase); static void transferCoarseningInfo(const ecl_grid_type* eclGrid, RigGridBase* grid); private: @@ -89,7 +89,7 @@ private: QString m_fileName; // Name of file used to start accessing Eclipse output files QStringList m_filesWithSameBaseName; // Set of files in filename's path with same base name as filename - RigCaseData* m_eclipseCase; + RigEclipseCaseData* m_eclipseCase; std::vector m_timeSteps; diff --git a/ApplicationCode/FileInterface/RifReaderInterface.h b/ApplicationCode/FileInterface/RifReaderInterface.h index abf9160268..240c2b36f3 100644 --- a/ApplicationCode/FileInterface/RifReaderInterface.h +++ b/ApplicationCode/FileInterface/RifReaderInterface.h @@ -31,7 +31,7 @@ #include -class RigCaseData; +class RigEclipseCaseData; class RifReaderSettings; @@ -59,7 +59,7 @@ public: bool isImportOfCompleteMswDataEnabled(); bool isNNCsEnabled(); - virtual bool open(const QString& fileName, RigCaseData* eclipseCase) = 0; + virtual bool open(const QString& fileName, RigEclipseCaseData* eclipseCase) = 0; virtual void close() = 0; virtual bool staticResult(const QString& result, PorosityModelResultType matrixOrFracture, std::vector* values) = 0; diff --git a/ApplicationCode/FileInterface/RifReaderMockModel.cpp b/ApplicationCode/FileInterface/RifReaderMockModel.cpp index 4f5841c048..a158dc0c60 100644 --- a/ApplicationCode/FileInterface/RifReaderMockModel.cpp +++ b/ApplicationCode/FileInterface/RifReaderMockModel.cpp @@ -23,12 +23,12 @@ #include "RifReaderInterface.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifReaderMockModel::open(const QString& fileName, RigCaseData* eclipseCase) +bool RifReaderMockModel::open(const QString& fileName, RigEclipseCaseData* eclipseCase) { m_reservoirBuilder.populateReservoir(eclipseCase); @@ -173,7 +173,7 @@ void RifReaderMockModel::addLocalGridRefinement(const cvf::Vec3st& minCellPositi //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifReaderMockModel::populateReservoir(RigCaseData* eclipseCase) +void RifReaderMockModel::populateReservoir(RigEclipseCaseData* eclipseCase) { m_reservoirBuilder.populateReservoir(eclipseCase); } diff --git a/ApplicationCode/FileInterface/RifReaderMockModel.h b/ApplicationCode/FileInterface/RifReaderMockModel.h index dbe4a083ee..33f5204f5b 100644 --- a/ApplicationCode/FileInterface/RifReaderMockModel.h +++ b/ApplicationCode/FileInterface/RifReaderMockModel.h @@ -36,17 +36,17 @@ public: void addLocalGridRefinement(const cvf::Vec3st& minCellPosition, const cvf::Vec3st& maxCellPosition, const cvf::Vec3st& singleCellRefinementFactors); - virtual bool open( const QString& fileName, RigCaseData* eclipseCase ); + virtual bool open( const QString& fileName, RigEclipseCaseData* eclipseCase ); virtual void close(); virtual bool staticResult( const QString& result, RifReaderInterface::PorosityModelResultType matrixOrFracture, std::vector* values ); virtual bool dynamicResult( const QString& result, RifReaderInterface::PorosityModelResultType matrixOrFracture, size_t stepIndex, std::vector* values ); private: - void populateReservoir(RigCaseData* eclipseCase); + void populateReservoir(RigEclipseCaseData* eclipseCase); bool inputProperty( const QString& propertyName, std::vector* values ); RigReservoirBuilderMock m_reservoirBuilder; - RigCaseData* m_reservoir; + RigEclipseCaseData* m_reservoir; }; diff --git a/ApplicationCode/FileInterface/RifReaderOpmParserInput.cpp b/ApplicationCode/FileInterface/RifReaderOpmParserInput.cpp index 226d5e5114..ec254ed2bd 100644 --- a/ApplicationCode/FileInterface/RifReaderOpmParserInput.cpp +++ b/ApplicationCode/FileInterface/RifReaderOpmParserInput.cpp @@ -20,7 +20,7 @@ #include "RifReaderEclipseOutput.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RimEclipseInputCaseOpm.h" @@ -45,7 +45,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifReaderOpmParserInput::importGridPropertiesFaults(const QString& fileName, RigCaseData* caseData) +void RifReaderOpmParserInput::importGridPropertiesFaults(const QString& fileName, RigEclipseCaseData* caseData) { RiuMainWindow::instance()->processMonitor()->addStringToLog(QString("\nStarted reading of grid and properties from file : " + fileName + "\n")); @@ -432,7 +432,7 @@ void RifReaderOpmParserInput::initUsingWarnings(Opm::ParseContext* parseContext) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -size_t RifReaderOpmParserPropertyReader::findOrCreateResult(const QString& newResultName, RigCaseData* reservoir) +size_t RifReaderOpmParserPropertyReader::findOrCreateResult(const QString& newResultName, RigEclipseCaseData* reservoir) { size_t resultIndex = reservoir->results(RifReaderInterface::MATRIX_RESULTS)->findScalarResultIndex(newResultName); if (resultIndex == cvf::UNDEFINED_SIZE_T) @@ -446,7 +446,7 @@ size_t RifReaderOpmParserPropertyReader::findOrCreateResult(const QString& newRe //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifReaderOpmParserPropertyReader::readAllProperties(std::shared_ptr< Opm::Deck > deck, RigCaseData* caseData, std::map* newResults) +void RifReaderOpmParserPropertyReader::readAllProperties(std::shared_ptr< Opm::Deck > deck, RigEclipseCaseData* caseData, std::map* newResults) { std::set uniqueKeywords; for (auto it = deck->begin(); it != deck->end(); it++) @@ -549,7 +549,7 @@ std::set RifReaderOpmParserPropertyReader::keywords() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifReaderOpmParserPropertyReader::copyPropertyToCaseData(const std::string& keywordName, RigCaseData* caseData, const QString& resultName) +bool RifReaderOpmParserPropertyReader::copyPropertyToCaseData(const std::string& keywordName, RigEclipseCaseData* caseData, const QString& resultName) { { std::string errorMessage; @@ -629,7 +629,7 @@ void RifReaderOpmParserPropertyReader::getAllValuesForKeyword(std::shared_ptr< O //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifReaderOpmParserPropertyReader::isDataItemCountIdenticalToMainGridCellCount(std::shared_ptr< Opm::Deck > deck, const std::string& keyword, RigCaseData* caseData) +bool RifReaderOpmParserPropertyReader::isDataItemCountIdenticalToMainGridCellCount(std::shared_ptr< Opm::Deck > deck, const std::string& keyword, RigEclipseCaseData* caseData) { bool isEqual = false; { diff --git a/ApplicationCode/FileInterface/RifReaderOpmParserInput.h b/ApplicationCode/FileInterface/RifReaderOpmParserInput.h index 4949929d87..8701094262 100644 --- a/ApplicationCode/FileInterface/RifReaderOpmParserInput.h +++ b/ApplicationCode/FileInterface/RifReaderOpmParserInput.h @@ -30,7 +30,7 @@ #include -class RigCaseData; +class RigEclipseCaseData; namespace Opm { class Deck; @@ -46,7 +46,7 @@ namespace Opm { class RifReaderOpmParserInput { public: - static void importGridPropertiesFaults(const QString& fileName, RigCaseData* eclipseCase); + static void importGridPropertiesFaults(const QString& fileName, RigEclipseCaseData* eclipseCase); static void readFaults(const QString& fileName, cvf::Collection* faults); @@ -75,14 +75,14 @@ public: std::set keywords() const; - bool copyPropertyToCaseData(const std::string& keywordName, RigCaseData* eclipseCase, const QString& resultName); + bool copyPropertyToCaseData(const std::string& keywordName, RigEclipseCaseData* eclipseCase, const QString& resultName); - static size_t findOrCreateResult(const QString& newResultName, RigCaseData* reservoir); + static size_t findOrCreateResult(const QString& newResultName, RigEclipseCaseData* reservoir); private: - static void readAllProperties(std::shared_ptr< Opm::Deck > deck, RigCaseData* caseData, std::map* newResults); + static void readAllProperties(std::shared_ptr< Opm::Deck > deck, RigEclipseCaseData* caseData, std::map* newResults); static void getAllValuesForKeyword(std::shared_ptr< Opm::Deck > deck, const std::string& keyword, std::vector& allValues); - static bool isDataItemCountIdenticalToMainGridCellCount(std::shared_ptr< Opm::Deck > deck, const std::string& keyword, RigCaseData* caseData); + static bool isDataItemCountIdenticalToMainGridCellCount(std::shared_ptr< Opm::Deck > deck, const std::string& keyword, RigEclipseCaseData* caseData); bool open(const QString& fileName); private: diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp index 33560880b9..7d3c8cc9bf 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp @@ -94,7 +94,7 @@ void RivIntersectionBoxPartMgr::updateCellResultColor(size_t timeStepIndex) CVF_ASSERT(cellResultColors); RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(cellResultColors->porosityModel()); - RigCaseData* eclipseCase = eclipseView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = eclipseView->eclipseCase()->reservoirData(); // CrossSections if (m_intersectionBoxFaces.notNull()) diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp index 9ec2fd79bc..fd39efd9c8 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp @@ -99,7 +99,7 @@ void RivIntersectionPartMgr::updateCellResultColor(size_t timeStepIndex) CVF_ASSERT(cellResultColors); RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(cellResultColors->porosityModel()); - RigCaseData* eclipseCase = eclipseView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = eclipseView->eclipseCase()->reservoirData(); // CrossSections if (m_crossSectionFaces.notNull()) diff --git a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp index 7ef9d0aa1b..5b3306d5d9 100644 --- a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp +++ b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp @@ -21,7 +21,7 @@ #include "RivCellEdgeGeometryUtils.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigCellEdgeResultAccessor.h" #include "RigGridBase.h" #include "RigResultAccessor.h" @@ -55,7 +55,7 @@ void RivCellEdgeGeometryUtils::addCellEdgeResultsToDrawableGeo( bool useDefaultValueForHugeVals, float opacityLevel) { - RigCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); CVF_ASSERT(eclipseCase != NULL); // Create result access objects @@ -199,7 +199,7 @@ void RivCellEdgeGeometryUtils::addTernaryCellEdgeResultsToDrawableGeo(size_t tim const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper, cvf::DrawableGeo* geo, size_t gridIndex, float opacityLevel) { - RigCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); CVF_ASSERT(eclipseCase != NULL); cvf::ref cellEdgeResultAccessor = createCellEdgeResultAccessor(cellResultColors, cellEdgeResultColors, timeStepIndex, eclipseCase, eclipseCase->grid(gridIndex)); @@ -294,7 +294,7 @@ cvf::ref RivCellEdgeGeometryUtils::createCellEdgeResultAccess RimEclipseCellColors* cellResultColors, RimCellEdgeColors* cellEdgeResultColors, size_t timeStepIndex, - RigCaseData* eclipseCase, + RigEclipseCaseData* eclipseCase, const RigGridBase* grid) { cvf::ref cellEdgeResultAccessor = new RigCellEdgeResultAccessor(); @@ -326,7 +326,7 @@ cvf::ref RivCellEdgeGeometryUtils::createCellEdgeResultAccess //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RivCellEdgeGeometryUtils::createCellCenterResultAccessor(RimEclipseCellColors* cellResultColors, size_t timeStepIndex, RigCaseData* eclipseCase, const RigGridBase* grid) +cvf::ref RivCellEdgeGeometryUtils::createCellCenterResultAccessor(RimEclipseCellColors* cellResultColors, size_t timeStepIndex, RigEclipseCaseData* eclipseCase, const RigGridBase* grid) { cvf::ref resultAccessor = NULL; diff --git a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h index 6dbdc7f7f7..4a8a313736 100644 --- a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h +++ b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h @@ -32,7 +32,7 @@ class RimCellEdgeColors; class RimEclipseCellColors; class RigGridBase; class RigResultAccessor; -class RigCaseData; +class RigEclipseCaseData; class RivCellEdgeGeometryUtils @@ -60,14 +60,14 @@ private: static cvf::ref createCellCenterResultAccessor( RimEclipseCellColors* cellResultColors, size_t timeStepIndex, - RigCaseData* eclipseCase, + RigEclipseCaseData* eclipseCase, const RigGridBase* grid); static cvf::ref createCellEdgeResultAccessor( RimEclipseCellColors* cellResultColors, RimCellEdgeColors* cellEdgeResultColors, size_t timeStepIndex, - RigCaseData* eclipseCase, + RigEclipseCaseData* eclipseCase, const RigGridBase* grid); static bool hideScalarValue(double scalarValue, double scalarValueToHide, double tolerance); diff --git a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp index 329b569532..e6d3088633 100644 --- a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp @@ -103,7 +103,7 @@ void RivFaultPartMgr::updateCellResultColor(size_t timeStepIndex, RimEclipseCell RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(cellResultColors->porosityModel()); RimEclipseView* eclipseView = cellResultColors->reservoirView(); - RigCaseData* eclipseCase = eclipseView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = eclipseView->eclipseCase()->reservoirData(); // Faults if (m_nativeFaultFaces.notNull()) diff --git a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp index 0b2d4d620a..10a630be8c 100644 --- a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp @@ -24,7 +24,7 @@ #include "RiaPreferences.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigResultAccessorFactory.h" #include "RimCellEdgeColors.h" diff --git a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp index fbe87a2c21..4cfe9b7d80 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp @@ -20,7 +20,7 @@ #include "RivReservoirPartMgr.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RivGridPartMgr.h" #include "RivReservoirFaultsPartMgr.h" @@ -30,7 +30,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RivReservoirPartMgr::clearAndSetReservoir(const RigCaseData* eclipseCase, RimEclipseView* reservoirView) +void RivReservoirPartMgr::clearAndSetReservoir(const RigEclipseCaseData* eclipseCase, RimEclipseView* reservoirView) { m_allGrids.clear(); diff --git a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h index 005817b625..a99b5e150b 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h @@ -32,7 +32,7 @@ namespace cvf class RimEclipseCellColors; class RimCellEdgeColors; -class RigCaseData; +class RigEclipseCaseData; class RimEclipseView; class RivReservoirFaultsPartMgr; class RivGridPartMgr; @@ -47,7 +47,7 @@ class RivGridPartMgr; class RivReservoirPartMgr: public cvf::Object { public: - void clearAndSetReservoir(const RigCaseData* eclipseCase, RimEclipseView* reservoirView); + void clearAndSetReservoir(const RigEclipseCaseData* eclipseCase, RimEclipseView* reservoirView); void setTransform(cvf::Transform* scaleTransform); void setCellVisibility(size_t gridIndex, cvf::UByteArray* cellVisibilities ); diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp index 564c06cb03..0a970889a9 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp @@ -22,7 +22,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigCaseToCaseCellMapper.h" #include "RigCell.h" #include "RigGridBase.h" @@ -149,7 +149,7 @@ void RivReservoirViewPartMgr::scheduleGeometryRegen(RivCellSetEnum geometryType) //-------------------------------------------------------------------------------------------------- void RivReservoirViewPartMgr::clearGeometryCache(RivCellSetEnum geomType) { - RigCaseData* eclipseCase = NULL; + RigEclipseCaseData* eclipseCase = NULL; if (m_reservoirView != NULL && m_reservoirView->eclipseCase()) { eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); @@ -249,7 +249,7 @@ void RivReservoirViewPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicL //-------------------------------------------------------------------------------------------------- void RivReservoirViewPartMgr::createGeometry(RivCellSetEnum geometryType) { - RigCaseData* res = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* res = m_reservoirView->eclipseCase()->reservoirData(); m_geometries[geometryType].clearAndSetReservoir(res, m_reservoirView); m_geometries[geometryType].setTransform(m_scaleTransform.p()); @@ -272,7 +272,7 @@ void RivReservoirViewPartMgr::createGeometry(RivCellSetEnum geometryType) //-------------------------------------------------------------------------------------------------- void RivReservoirViewPartMgr::computeVisibility(cvf::UByteArray* cellVisibility, RivCellSetEnum geometryType, RigGridBase* grid, size_t gridIdx) { - RigCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); RigActiveCellInfo* activeCellInfo = m_reservoirView->currentActiveCellInfo(); switch (geometryType) @@ -399,7 +399,7 @@ void RivReservoirViewPartMgr::computeVisibility(cvf::UByteArray* cellVisibility, //-------------------------------------------------------------------------------------------------- void RivReservoirViewPartMgr::createPropertyFilteredNoneWellCellGeometry(size_t frameIndex) { - RigCaseData* res = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* res = m_reservoirView->eclipseCase()->reservoirData(); if ( frameIndex >= m_propFilteredGeometryFrames.size()) { @@ -476,7 +476,7 @@ void RivReservoirViewPartMgr::createPropertyFilteredNoneWellCellGeometry(size_t //-------------------------------------------------------------------------------------------------- void RivReservoirViewPartMgr::createPropertyFilteredWellGeometry(size_t frameIndex) { - RigCaseData* res = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* res = m_reservoirView->eclipseCase()->reservoirData(); if ( frameIndex >= m_propFilteredWellGeometryFrames.size()) { @@ -789,7 +789,7 @@ void RivReservoirViewPartMgr::computePropertyVisibility(cvf::UByteArray* cellVis { const RimCellFilter::FilterModeType filterType = propertyFilter->filterMode(); - RigCaseData* eclipseCase = propFilterColl->reservoirView()->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = propFilterColl->reservoirView()->eclipseCase()->reservoirData(); cvf::ref resultAccessor = RigResultAccessorFactory::createFromResultDefinition(eclipseCase, grid->gridIndex(), timeStepIndex, propertyFilter->resultDefinition); diff --git a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp index 5eb5040f17..b3942b69bc 100644 --- a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp @@ -20,7 +20,7 @@ #include "RivSimWellPipesPartMgr.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigCell.h" #include "RigMainGrid.h" #include "RigSimulationWellCenterLineCalculator.h" diff --git a/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.cpp b/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.cpp index 1c070503a4..6001c9f4d0 100644 --- a/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.cpp +++ b/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.cpp @@ -19,7 +19,7 @@ #include "RivSingleCellPartGenerator.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFemPartCollection.h" #include "RigGeoMechCaseData.h" #include "RigGridBase.h" @@ -37,7 +37,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RivSingleCellPartGenerator::RivSingleCellPartGenerator(RigCaseData* rigCaseData, size_t gridIndex, size_t cellIndex) +RivSingleCellPartGenerator::RivSingleCellPartGenerator(RigEclipseCaseData* rigCaseData, size_t gridIndex, size_t cellIndex) : m_rigCaseData(rigCaseData), m_gridIndex(gridIndex), m_cellIndex(cellIndex), diff --git a/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.h b/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.h index 93a2fa370b..665acd59ce 100644 --- a/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.h +++ b/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.h @@ -27,7 +27,7 @@ namespace cvf class Part; } -class RigCaseData; +class RigEclipseCaseData; class RimGeoMechCase; //================================================================================================== @@ -37,7 +37,7 @@ class RimGeoMechCase; class RivSingleCellPartGenerator { public: - RivSingleCellPartGenerator(RigCaseData* rigCaseData, size_t gridIndex, size_t cellIndex); + RivSingleCellPartGenerator(RigEclipseCaseData* rigCaseData, size_t gridIndex, size_t cellIndex); RivSingleCellPartGenerator(RimGeoMechCase* rimGeoMechCase, size_t gridIndex, size_t cellIndex); cvf::ref createPart(const cvf::Color3f color); @@ -46,7 +46,7 @@ private: cvf::ref createMeshDrawable(); private: - RigCaseData* m_rigCaseData; + RigEclipseCaseData* m_rigCaseData; RimGeoMechCase* m_geoMechCase; size_t m_gridIndex; size_t m_cellIndex; diff --git a/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp b/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp index d9772df78b..1974525c37 100644 --- a/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp +++ b/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp @@ -20,7 +20,7 @@ #include "RivTernaryTextureCoordsCreator.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigPipeInCellEvaluator.h" #include "RigResultAccessorFactory.h" #include "RigTernaryResultAccessor2d.h" @@ -49,7 +49,7 @@ RivTernaryTextureCoordsCreator::RivTernaryTextureCoordsCreator( CVF_ASSERT(quadMapper); m_quadMapper = quadMapper; - RigCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); size_t resTimeStepIdx = timeStepIndex; @@ -83,7 +83,7 @@ RivTernaryTextureCoordsCreator::RivTernaryTextureCoordsCreator( size_t timeStepIndex) : m_quadMapper(NULL) { - RigCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); size_t resTimeStepIdx = timeStepIndex; diff --git a/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp b/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp index e97cb2bce0..c75de10969 100644 --- a/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp +++ b/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp @@ -20,7 +20,7 @@ #include "RivTextureCoordsCreator.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigPipeInCellEvaluator.h" #include "RigResultAccessorFactory.h" @@ -40,7 +40,7 @@ //-------------------------------------------------------------------------------------------------- RivTextureCoordsCreator::RivTextureCoordsCreator(RimEclipseCellColors* cellResultColors, size_t timeStepIndex, size_t gridIndex, const cvf::StructGridQuadToCellFaceMapper* quadMapper) { - RigCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); m_quadMapper = quadMapper; CVF_ASSERT(quadMapper && eclipseCase ); diff --git a/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp index 092a50056b..2f801be906 100644 --- a/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp @@ -25,7 +25,7 @@ #include "RiaApplication.h" #include "RigActiveCellInfo.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigCell.h" #include "RigMainGrid.h" @@ -87,7 +87,7 @@ void RivWellHeadPartMgr::buildWellHeadParts(size_t frameIndex) if (m_rimReservoirView.isNull()) return; - RigCaseData* rigReservoir = m_rimReservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* rigReservoir = m_rimReservoirView->eclipseCase()->reservoirData(); RimEclipseWell* well = m_rimWell; diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index d51a1998ac..a9d6db3ed5 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -21,7 +21,7 @@ #include "Rim3dOverlayInfoConfig.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigEclipseNativeVisibleCellsStatCalc.h" #include "RigFemNativeVisibleCellsStatCalc.h" #include "RigFemPartCollection.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp index 6229ef0dcb..4f8bf2f9fb 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp @@ -25,7 +25,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RimCaseCollection.h" @@ -120,7 +120,7 @@ RimEclipseCase::~RimEclipseCase() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigCaseData* RimEclipseCase::reservoirData() +RigEclipseCaseData* RimEclipseCase::reservoirData() { return m_rigEclipseCase.p(); } @@ -128,7 +128,7 @@ RigCaseData* RimEclipseCase::reservoirData() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const RigCaseData* RimEclipseCase::reservoirData() const +const RigEclipseCaseData* RimEclipseCase::reservoirData() const { return m_rigEclipseCase.p(); } @@ -294,7 +294,7 @@ void RimEclipseCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c } else if (changedField == &flipXAxis || changedField == &flipYAxis) { - RigCaseData* rigEclipseCase = reservoirData(); + RigEclipseCaseData* rigEclipseCase = reservoirData(); if (rigEclipseCase) { rigEclipseCase->mainGrid()->setFlipAxis(flipXAxis, flipYAxis); @@ -323,7 +323,7 @@ void RimEclipseCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c //-------------------------------------------------------------------------------------------------- void RimEclipseCase::updateFormationNamesData() { - RigCaseData* rigEclipseCase = reservoirData(); + RigEclipseCaseData* rigEclipseCase = reservoirData(); if(rigEclipseCase) { if(activeFormationNames()) @@ -381,7 +381,7 @@ void RimEclipseCase::updateFormationNamesData() //-------------------------------------------------------------------------------------------------- void RimEclipseCase::computeCachedData() { - RigCaseData* rigEclipseCase = reservoirData(); + RigEclipseCaseData* rigEclipseCase = reservoirData(); if (rigEclipseCase) { caf::ProgressInfo pInf(30, ""); @@ -425,7 +425,7 @@ RimCaseCollection* RimEclipseCase::parentCaseCollection() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimEclipseCase::setReservoirData(RigCaseData* eclipseCase) +void RimEclipseCase::setReservoirData(RigEclipseCaseData* eclipseCase) { m_rigEclipseCase = eclipseCase; if (this->reservoirData()) diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.h b/ApplicationCode/ProjectDataModel/RimEclipseCase.h index 67c100bbb9..d9305e3b92 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.h @@ -36,7 +36,7 @@ class QString; -class RigCaseData; +class RigEclipseCaseData; class RigGridBase; class RimCaseCollection; class RimIdenticalGridCaseGroup; @@ -68,8 +68,8 @@ public: bool openReserviorCase(); virtual bool openEclipseGridFile() = 0; - RigCaseData* reservoirData(); - const RigCaseData* reservoirData() const; + RigEclipseCaseData* reservoirData(); + const RigEclipseCaseData* reservoirData() const; RimReservoirCellResultsStorage* results(RifReaderInterface::PorosityModelResultType porosityModel); @@ -104,10 +104,10 @@ protected: // Internal methods protected: void computeCachedData(); - void setReservoirData(RigCaseData* eclipseCase); + void setReservoirData(RigEclipseCaseData* eclipseCase); private: - cvf::ref m_rigEclipseCase; + cvf::ref m_rigEclipseCase; private: caf::PdmChildField m_matrixModelResults; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp index db52994995..f080f2e62c 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp @@ -22,7 +22,7 @@ #include "RiaApplication.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigGridManager.h" #include "RigMainGrid.h" @@ -76,7 +76,7 @@ RimIdenticalGridCaseGroup* RimEclipseCaseCollection::createIdenticalCaseGroupFro { CVF_ASSERT(mainCase); - RigCaseData* rigEclipseCase = mainCase->reservoirData(); + RigEclipseCaseData* rigEclipseCase = mainCase->reservoirData(); RigMainGrid* equalGrid = registerCaseInGridCollection(rigEclipseCase); CVF_ASSERT(equalGrid); @@ -101,7 +101,7 @@ void RimEclipseCaseCollection::moveEclipseCaseIntoCaseGroup(RimEclipseCase* rimR { CVF_ASSERT(rimReservoir); - RigCaseData* rigEclipseCase = rimReservoir->reservoirData(); + RigEclipseCaseData* rigEclipseCase = rimReservoir->reservoirData(); RigMainGrid* equalGrid = registerCaseInGridCollection(rigEclipseCase); CVF_ASSERT(equalGrid); @@ -155,7 +155,7 @@ void RimEclipseCaseCollection::removeCaseFromAllGroups(RimEclipseCase* reservoir //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigMainGrid* RimEclipseCaseCollection::registerCaseInGridCollection(RigCaseData* rigEclipseCase) +RigMainGrid* RimEclipseCaseCollection::registerCaseInGridCollection(RigEclipseCaseData* rigEclipseCase) { CVF_ASSERT(rigEclipseCase); @@ -188,7 +188,7 @@ void RimEclipseCaseCollection::insertCaseInCaseGroup(RimIdenticalGridCaseGroup* { CVF_ASSERT(rimReservoir); - RigCaseData* rigEclipseCase = rimReservoir->reservoirData(); + RigEclipseCaseData* rigEclipseCase = rimReservoir->reservoirData(); registerCaseInGridCollection(rigEclipseCase); caseGroup->addCase(rimReservoir); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.h b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.h index 7ec132f3ae..ce843ceabb 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.h @@ -27,7 +27,7 @@ #include "cvfObject.h" -class RigCaseData; +class RigEclipseCaseData; class RigGridManager; class RigMainGrid; class RimEclipseCase; @@ -59,6 +59,6 @@ public: void recomputeStatisticsForAllCaseGroups(); private: - RigMainGrid* registerCaseInGridCollection(RigCaseData* rigEclipseCase); + RigMainGrid* registerCaseInGridCollection(RigEclipseCaseData* rigEclipseCase); cvf::ref m_gridCollection; }; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp index 142472a6b3..daf8892417 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp @@ -30,7 +30,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RimDefines.h" @@ -96,7 +96,7 @@ void RimEclipseInputCase::openDataFileSet(const QStringList& fileNames) if (this->reservoirData() == NULL) { - this->setReservoirData(new RigCaseData); + this->setReservoirData(new RigEclipseCaseData); } // First find and read the grid data @@ -193,7 +193,7 @@ bool RimEclipseInputCase::openEclipseGridFile() readerInterface = new RifReaderEclipseInput; readerInterface->setReaderSetting(prefs->readerSettings()); - cvf::ref eclipseCase = new RigCaseData; + cvf::ref eclipseCase = new RigEclipseCaseData; if (!readerInterface->open(m_gridFileName, eclipseCase.p())) { return false; @@ -335,7 +335,7 @@ void RimEclipseInputCase::loadAndSyncronizeInputProperties() //-------------------------------------------------------------------------------------------------- cvf::ref RimEclipseInputCase::createMockModel(QString modelName) { - cvf::ref reservoir = new RigCaseData; + cvf::ref reservoir = new RigEclipseCaseData; cvf::ref mockFileInterface = new RifReaderMockModel; if (modelName == RimDefines::mockModelBasicInputCase()) diff --git a/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp b/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp index f5a5ec8b86..e23b805ef9 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp @@ -25,7 +25,7 @@ #include "RifReaderSettings.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RimEclipseCase.h" @@ -162,7 +162,7 @@ void RimEclipseInputCaseOpm::importEclipseGridAndProperties(const QString& fileN { if (this->reservoirData() == NULL) { - this->setReservoirData(new RigCaseData); + this->setReservoirData(new RigEclipseCaseData); RifReaderOpmParserInput::importGridPropertiesFaults(fileName, reservoirData()); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseInputProperty.cpp b/ApplicationCode/ProjectDataModel/RimEclipseInputProperty.cpp index bf4c9918d3..1b973d5ff7 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseInputProperty.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseInputProperty.cpp @@ -21,7 +21,7 @@ #include "RimEclipseInputProperty.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RimEclipseInputCase.h" #include "RimEclipseResultDefinition.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp index 9c47f1c756..9f314294f2 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp @@ -21,7 +21,7 @@ #include "RimEclipsePropertyFilter.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFormationNames.h" #include "RimEclipseCase.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp index e463cc7209..8b8942e219 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp @@ -28,7 +28,7 @@ #include "RifReaderSettings.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RimMockModelSettings.h" @@ -110,7 +110,7 @@ bool RimEclipseResultCase::openEclipseGridFile() readerInterface->setReaderSetting(prefs->readerSettings()); readerInterface->setFilenamesWithFaults(this->filesContainingFaults()); - cvf::ref eclipseCase = new RigCaseData; + cvf::ref eclipseCase = new RigEclipseCaseData; if (!readerInterface->open(caseFileName(), eclipseCase.p())) { return false; @@ -141,7 +141,7 @@ bool RimEclipseResultCase::openEclipseGridFile() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimEclipseResultCase::openAndReadActiveCellData(RigCaseData* mainEclipseCase) +bool RimEclipseResultCase::openAndReadActiveCellData(RigEclipseCaseData* mainEclipseCase) { // Early exit if data is already read if (m_activeCellInfoIsReadFromFile) return true; @@ -158,7 +158,7 @@ bool RimEclipseResultCase::openAndReadActiveCellData(RigCaseData* mainEclipseCas return false; } - cvf::ref eclipseCase = new RigCaseData; + cvf::ref eclipseCase = new RigEclipseCaseData; CVF_ASSERT(mainEclipseCase && mainEclipseCase->mainGrid()); eclipseCase->setMainGrid(mainEclipseCase->mainGrid()); @@ -204,7 +204,7 @@ bool RimEclipseResultCase::openAndReadActiveCellData(RigCaseData* mainEclipseCas cvf::ref RimEclipseResultCase::createMockModel(QString modelName) { cvf::ref mockFileInterface = new RifReaderMockModel; - cvf::ref reservoir = new RigCaseData; + cvf::ref reservoir = new RigEclipseCaseData; if (modelName == RimDefines::mockModelBasic()) { diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.h b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.h index 4543cec58e..cf9f7caddb 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.h @@ -44,7 +44,7 @@ public: void setCaseInfo(const QString& userDescription, const QString& caseFileName); virtual bool openEclipseGridFile(); - bool openAndReadActiveCellData(RigCaseData* mainEclipseCase); + bool openAndReadActiveCellData(RigEclipseCaseData* mainEclipseCase); void readGridDimensions(std::vector< std::vector >& gridDimensions); // Overrides from RimCase diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 227122f604..d4aba7afd7 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -22,7 +22,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RimCellEdgeColors.h" #include "RimEclipseCase.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp index 3822fb9356..fca61379c8 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp @@ -23,7 +23,7 @@ #include "RicNewViewFeature.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigSingleWellResultsData.h" #include "RimCaseCollection.h" @@ -143,7 +143,7 @@ bool RimEclipseStatisticsCase::openEclipseGridFile() { if (this->reservoirData()) return true; - cvf::ref eclipseCase = new RigCaseData; + cvf::ref eclipseCase = new RigEclipseCaseData; CVF_ASSERT(parentStatisticsCaseCollection()); @@ -228,7 +228,7 @@ void RimEclipseStatisticsCase::computeStatistics() timeStepIndices.push_back(i); } - RigCaseData* resultCase = reservoirData(); + RigEclipseCaseData* resultCase = reservoirData(); QList resultSpecification; @@ -395,7 +395,7 @@ QList RimEclipseStatisticsCase::calculateValueOptions(co return options; } - RigCaseData* caseData = idgcg->mainCase()->reservoirData(); + RigEclipseCaseData* caseData = idgcg->mainCase()->reservoirData(); if (&m_selectedDynamicProperties == fieldNeedingOptions) { @@ -716,7 +716,7 @@ void RimEclipseStatisticsCase::populateResultSelection() return; } - RigCaseData* caseData = idgcg->mainCase()->reservoirData(); + RigEclipseCaseData* caseData = idgcg->mainCase()->reservoirData(); if (m_selectedDynamicProperties().size() == 0) { diff --git a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp index 722a0cfe77..2e2410e306 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp @@ -21,7 +21,7 @@ #include "RimEclipseStatisticsCaseEvaluator.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RigResultAccessorFactory.h" #include "RigResultModifier.h" @@ -317,7 +317,7 @@ void RimEclipseStatisticsCaseEvaluator::evaluateForResults(const QList& //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimEclipseStatisticsCaseEvaluator::RimEclipseStatisticsCaseEvaluator(const std::vector& sourceCases, const std::vector& timeStepIndices, const RimStatisticsConfig& statisticsConfig, RigCaseData* destinationCase, RimIdenticalGridCaseGroup* identicalGridCaseGroup) +RimEclipseStatisticsCaseEvaluator::RimEclipseStatisticsCaseEvaluator(const std::vector& sourceCases, const std::vector& timeStepIndices, const RimStatisticsConfig& statisticsConfig, RigEclipseCaseData* destinationCase, RimIdenticalGridCaseGroup* identicalGridCaseGroup) : m_sourceCases(sourceCases), m_statisticsConfig(statisticsConfig), m_destinationCase(destinationCase), diff --git a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.h b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.h index 3b24b093b6..73ef9aaa23 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.h @@ -28,7 +28,7 @@ class RimEclipseCase; -class RigCaseData; +class RigEclipseCaseData; class RigCaseCellResultsData; @@ -59,7 +59,7 @@ public: RimEclipseStatisticsCaseEvaluator(const std::vector& sourceCases, const std::vector& timeStepIndices, const RimStatisticsConfig& statisticsConfig, - RigCaseData* destinationCase, + RigEclipseCaseData* destinationCase, RimIdenticalGridCaseGroup* identicalGridCaseGroup); struct ResSpec @@ -90,7 +90,7 @@ private: size_t m_reservoirCellCount; RimStatisticsConfig m_statisticsConfig; - RigCaseData* m_destinationCase; + RigEclipseCaseData* m_destinationCase; RimIdenticalGridCaseGroup* m_identicalGridCaseGroup; bool m_useZeroAsInactiveCellValue; }; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index 31a2cfbad2..f19403c9b4 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -25,7 +25,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFlowDiagResults.h" #include "RigFormationNames.h" #include "RigMainGrid.h" @@ -944,7 +944,7 @@ void RimEclipseView::updateLegends() return; } - RigCaseData* eclipseCase = m_reservoir->reservoirData(); + RigEclipseCaseData* eclipseCase = m_reservoir->reservoirData(); CVF_ASSERT(eclipseCase); RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(cellResult()->porosityModel()); diff --git a/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp b/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp index 1f4be83932..c74a261d92 100644 --- a/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp +++ b/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp @@ -22,7 +22,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFlowDiagResults.h" #include "RigMainGrid.h" #include "RigSingleWellResultsData.h" diff --git a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp index 25137f34ac..19dfffb8f4 100644 --- a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp +++ b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp @@ -23,7 +23,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigGridManager.h" #include "RigMainGrid.h" @@ -181,7 +181,7 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo() return; } - RigCaseData* rigCaseData = mainCase->reservoirData(); + RigEclipseCaseData* rigCaseData = mainCase->reservoirData(); CVF_ASSERT(rigCaseData); RifReaderInterface::PorosityModelResultType poroModel = RifReaderInterface::MATRIX_RESULTS; diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index 2ead2498ef..c483b04ca9 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -23,7 +23,7 @@ #include "RiaApplication.h" #include "RiaVersionInfo.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigGridBase.h" #include "RimCalcScript.h" diff --git a/ApplicationCode/ProjectDataModel/RimProject.h b/ApplicationCode/ProjectDataModel/RimProject.h index fefadad18f..63d8c151a5 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.h +++ b/ApplicationCode/ProjectDataModel/RimProject.h @@ -26,7 +26,7 @@ #include -class RigCaseData; +class RigEclipseCaseData; class RigGridManager; class RigMainGrid; diff --git a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp index fc8db4dc07..0e479a3087 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp +++ b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp @@ -21,7 +21,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigCell.h" #include "RigMainGrid.h" @@ -1518,17 +1518,17 @@ double RimReservoirCellResultsStorage::darchysValue() if (rimCase && rimCase->reservoirData()) { - RigCaseData::UnitsType unitsType = rimCase->reservoirData()->unitsType(); + RigEclipseCaseData::UnitsType unitsType = rimCase->reservoirData()->unitsType(); - if (unitsType == RigCaseData::UNITS_FIELD) + if (unitsType == RigEclipseCaseData::UNITS_FIELD) { darchy = 0.001127; } - else if (unitsType == RigCaseData::UNITS_METRIC) + else if (unitsType == RigEclipseCaseData::UNITS_METRIC) { darchy = 0.008527; } - else if (unitsType == RigCaseData::UNITS_LAB) + else if (unitsType == RigEclipseCaseData::UNITS_LAB) { darchy = 3.6; } diff --git a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp index 7c05d222ed..2d950c2054 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp @@ -22,7 +22,7 @@ #include "RiaApplication.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigEclipseWellLogExtractor.h" #include "RigFemPartResultsCollection.h" #include "RigGeoMechCaseData.h" @@ -260,8 +260,8 @@ void RimWellLogExtractionCurve::onLoadDataAndUpdate() eclExtractor->curveData(resAcc.p(), &values); } - RigCaseData::UnitsType eclipseUnitsType = eclipseCase->reservoirData()->unitsType(); - if (eclipseUnitsType == RigCaseData::UNITS_FIELD) + RigEclipseCaseData::UnitsType eclipseUnitsType = eclipseCase->reservoirData()->unitsType(); + if (eclipseUnitsType == RigEclipseCaseData::UNITS_FIELD) { // See https://github.com/OPM/ResInsight/issues/538 diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp index fed2b8043d..3c59d00ffd 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp @@ -62,7 +62,7 @@ RigEclipseWellLogExtractor* RimWellLogPlotCollection::findOrCreateExtractor(RimW return NULL; } - RigCaseData* eclCaseData = eclCase->reservoirData(); + RigEclipseCaseData* eclCaseData = eclCase->reservoirData(); RigWellPath* wellPathGeom = wellPath->wellPathGeometry(); for (size_t exIdx = 0; exIdx < m_extractors.size(); ++exIdx) { @@ -131,7 +131,7 @@ void RimWellLogPlotCollection::removeExtractors(const RigWellPath* wellPath) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellLogPlotCollection::removeExtractors(const RigCaseData* caseData) +void RimWellLogPlotCollection::removeExtractors(const RigEclipseCaseData* caseData) { for (int eIdx = (int) m_extractors.size() - 1; eIdx >= 0; eIdx--) { diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h index dbd475c392..dba85804d5 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h +++ b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h @@ -28,7 +28,7 @@ class RimWellLogPlot; class RigEclipseWellLogExtractor; class RigGeoMechWellLogExtractor; class RimGeoMechCase; -class RigCaseData; +class RigEclipseCaseData; class RigGeoMechCaseData; class RigWellPath; class RimWellPath; @@ -50,7 +50,7 @@ public: RigGeoMechWellLogExtractor* findOrCreateExtractor(RimWellPath* wellPath, RimGeoMechCase* eclCase); void removeExtractors(const RigWellPath* wellPath); - void removeExtractors(const RigCaseData* caseData); + void removeExtractors(const RigEclipseCaseData* caseData); void removeExtractors(const RigGeoMechCaseData* caseData); caf::PdmChildArrayField wellLogPlots; diff --git a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake index 598b7806e8..2314978edd 100644 --- a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake @@ -7,7 +7,7 @@ endif() set (SOURCE_GROUP_HEADER_FILES ${CEE_CURRENT_LIST_DIR}RigActiveCellInfo.h ${CEE_CURRENT_LIST_DIR}RigCell.h -${CEE_CURRENT_LIST_DIR}RigCaseData.h +${CEE_CURRENT_LIST_DIR}RigEclipseCaseData.h ${CEE_CURRENT_LIST_DIR}RigGridBase.h ${CEE_CURRENT_LIST_DIR}RigGridManager.h ${CEE_CURRENT_LIST_DIR}RigResultAccessor.h @@ -54,7 +54,7 @@ ${CEE_CURRENT_LIST_DIR}RigLasFileExporter.h set (SOURCE_GROUP_SOURCE_FILES ${CEE_CURRENT_LIST_DIR}RigActiveCellInfo.cpp ${CEE_CURRENT_LIST_DIR}RigCell.cpp -${CEE_CURRENT_LIST_DIR}RigCaseData.cpp +${CEE_CURRENT_LIST_DIR}RigEclipseCaseData.cpp ${CEE_CURRENT_LIST_DIR}RigGridBase.cpp ${CEE_CURRENT_LIST_DIR}RigGridManager.cpp ${CEE_CURRENT_LIST_DIR}RigResultAccessor.cpp diff --git a/ApplicationCode/ReservoirDataModel/RigCaseData.cpp b/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.cpp similarity index 90% rename from ApplicationCode/ReservoirDataModel/RigCaseData.cpp rename to ApplicationCode/ReservoirDataModel/RigEclipseCaseData.cpp index 751c7a91ba..5d56bd8881 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.cpp @@ -18,7 +18,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" @@ -32,7 +32,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigCaseData::RigCaseData() +RigEclipseCaseData::RigEclipseCaseData() { m_mainGrid = new RigMainGrid(); @@ -51,7 +51,7 @@ RigCaseData::RigCaseData() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigCaseData::~RigCaseData() +RigEclipseCaseData::~RigEclipseCaseData() { } @@ -59,7 +59,7 @@ RigCaseData::~RigCaseData() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigMainGrid* RigCaseData::mainGrid() +RigMainGrid* RigEclipseCaseData::mainGrid() { return m_mainGrid.p(); } @@ -67,7 +67,7 @@ RigMainGrid* RigCaseData::mainGrid() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const RigMainGrid* RigCaseData::mainGrid() const +const RigMainGrid* RigEclipseCaseData::mainGrid() const { return m_mainGrid.p(); } @@ -75,7 +75,7 @@ const RigMainGrid* RigCaseData::mainGrid() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::setMainGrid(RigMainGrid* mainGrid) +void RigEclipseCaseData::setMainGrid(RigMainGrid* mainGrid) { m_mainGrid = mainGrid; @@ -86,7 +86,7 @@ void RigCaseData::setMainGrid(RigMainGrid* mainGrid) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::allGrids(std::vector* grids) +void RigEclipseCaseData::allGrids(std::vector* grids) { CVF_ASSERT(grids); @@ -105,7 +105,7 @@ void RigCaseData::allGrids(std::vector* grids) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::allGrids(std::vector* grids) const +void RigEclipseCaseData::allGrids(std::vector* grids) const { CVF_ASSERT(grids); @@ -124,7 +124,7 @@ void RigCaseData::allGrids(std::vector* grids) const //-------------------------------------------------------------------------------------------------- /// Get grid by index. The main grid has index 0, so the first lgr has index 1 //-------------------------------------------------------------------------------------------------- -const RigGridBase* RigCaseData::grid(size_t index) const +const RigGridBase* RigEclipseCaseData::grid(size_t index) const { CVF_ASSERT(m_mainGrid.notNull()); return m_mainGrid->gridByIndex(index); @@ -134,7 +134,7 @@ const RigGridBase* RigCaseData::grid(size_t index) const //-------------------------------------------------------------------------------------------------- /// Get grid by index. The main grid has index 0, so the first lgr has index 1 //-------------------------------------------------------------------------------------------------- -RigGridBase* RigCaseData::grid(size_t index) +RigGridBase* RigEclipseCaseData::grid(size_t index) { CVF_ASSERT(m_mainGrid.notNull()); return m_mainGrid->gridByIndex(index); @@ -143,7 +143,7 @@ RigGridBase* RigCaseData::grid(size_t index) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -size_t RigCaseData::gridCount() const +size_t RigEclipseCaseData::gridCount() const { CVF_ASSERT(m_mainGrid.notNull()); return m_mainGrid->gridCount(); @@ -153,7 +153,7 @@ size_t RigCaseData::gridCount() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::computeWellCellsPrGrid() +void RigEclipseCaseData::computeWellCellsPrGrid() { // If we have computed this already, return if (m_wellCellsInGrid.size()) return; @@ -253,7 +253,7 @@ void RigCaseData::computeWellCellsPrGrid() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::setWellResults(const cvf::Collection& data) +void RigEclipseCaseData::setWellResults(const cvf::Collection& data) { m_wellResults = data; m_wellCellsInGrid.clear(); @@ -265,7 +265,7 @@ void RigCaseData::setWellResults(const cvf::Collection //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const cvf::UByteArray* RigCaseData::wellCellsInGrid(size_t gridIndex) +const cvf::UByteArray* RigEclipseCaseData::wellCellsInGrid(size_t gridIndex) { computeWellCellsPrGrid(); CVF_ASSERT(gridIndex < m_wellCellsInGrid.size()); @@ -277,7 +277,7 @@ const cvf::UByteArray* RigCaseData::wellCellsInGrid(size_t gridIndex) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const cvf::UIntArray* RigCaseData::gridCellToResultWellIndex(size_t gridIndex) +const cvf::UIntArray* RigEclipseCaseData::gridCellToResultWellIndex(size_t gridIndex) { computeWellCellsPrGrid(); CVF_ASSERT(gridIndex < m_gridCellToResultWellIndex.size()); @@ -288,7 +288,7 @@ const cvf::UIntArray* RigCaseData::gridCellToResultWellIndex(size_t gridIndex) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigCell& RigCaseData::cellFromWellResultCell(const RigWellResultPoint& wellResultCell) +RigCell& RigEclipseCaseData::cellFromWellResultCell(const RigWellResultPoint& wellResultCell) { CVF_ASSERT(wellResultCell.isCell()); @@ -304,7 +304,7 @@ RigCell& RigCaseData::cellFromWellResultCell(const RigWellResultPoint& wellResul //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RigCaseData::findSharedSourceFace(cvf::StructGridInterface::FaceType& sharedSourceFace,const RigWellResultPoint& sourceWellCellResult, const RigWellResultPoint& otherWellCellResult) const +bool RigEclipseCaseData::findSharedSourceFace(cvf::StructGridInterface::FaceType& sharedSourceFace,const RigWellResultPoint& sourceWellCellResult, const RigWellResultPoint& otherWellCellResult) const { size_t gridIndex = sourceWellCellResult.m_gridIndex; size_t gridCellIndex = sourceWellCellResult.m_gridCellIndex; @@ -380,7 +380,7 @@ public: //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::computeActiveCellIJKBBox() +void RigEclipseCaseData::computeActiveCellIJKBBox() { if (m_mainGrid.notNull() && m_activeCellInfo.notNull() && m_fractureActiveCellInfo.notNull()) { @@ -411,7 +411,7 @@ void RigCaseData::computeActiveCellIJKBBox() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::computeActiveCellBoundingBoxes() +void RigEclipseCaseData::computeActiveCellBoundingBoxes() { computeActiveCellIJKBBox(); computeActiveCellsGeometryBoundingBox(); @@ -420,7 +420,7 @@ void RigCaseData::computeActiveCellBoundingBoxes() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigActiveCellInfo* RigCaseData::activeCellInfo(RifReaderInterface::PorosityModelResultType porosityModel) +RigActiveCellInfo* RigEclipseCaseData::activeCellInfo(RifReaderInterface::PorosityModelResultType porosityModel) { if (porosityModel == RifReaderInterface::MATRIX_RESULTS) { @@ -433,7 +433,7 @@ RigActiveCellInfo* RigCaseData::activeCellInfo(RifReaderInterface::PorosityModel //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const RigActiveCellInfo* RigCaseData::activeCellInfo(RifReaderInterface::PorosityModelResultType porosityModel) const +const RigActiveCellInfo* RigEclipseCaseData::activeCellInfo(RifReaderInterface::PorosityModelResultType porosityModel) const { if (porosityModel == RifReaderInterface::MATRIX_RESULTS) { @@ -446,7 +446,7 @@ const RigActiveCellInfo* RigCaseData::activeCellInfo(RifReaderInterface::Porosit //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::setActiveCellInfo(RifReaderInterface::PorosityModelResultType porosityModel, RigActiveCellInfo* activeCellInfo) +void RigEclipseCaseData::setActiveCellInfo(RifReaderInterface::PorosityModelResultType porosityModel, RigActiveCellInfo* activeCellInfo) { if (porosityModel == RifReaderInterface::MATRIX_RESULTS) { @@ -464,7 +464,7 @@ void RigCaseData::setActiveCellInfo(RifReaderInterface::PorosityModelResultType //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::computeActiveCellsGeometryBoundingBox() +void RigEclipseCaseData::computeActiveCellsGeometryBoundingBox() { if (m_activeCellInfo.isNull() || m_fractureActiveCellInfo.isNull()) { @@ -518,7 +518,7 @@ void RigCaseData::computeActiveCellsGeometryBoundingBox() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigCaseData::setActiveFormationNames(RigFormationNames* activeFormationNames) +void RigEclipseCaseData::setActiveFormationNames(RigFormationNames* activeFormationNames) { m_activeFormationNamesData = activeFormationNames; @@ -582,7 +582,7 @@ void RigCaseData::setActiveFormationNames(RigFormationNames* activeFormationName //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigFormationNames* RigCaseData::activeFormationNames() +RigFormationNames* RigEclipseCaseData::activeFormationNames() { return m_activeFormationNamesData.p(); } @@ -590,7 +590,7 @@ RigFormationNames* RigCaseData::activeFormationNames() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigCaseCellResultsData* RigCaseData::results(RifReaderInterface::PorosityModelResultType porosityModel) +RigCaseCellResultsData* RigEclipseCaseData::results(RifReaderInterface::PorosityModelResultType porosityModel) { if (porosityModel == RifReaderInterface::MATRIX_RESULTS) { @@ -603,7 +603,7 @@ RigCaseCellResultsData* RigCaseData::results(RifReaderInterface::PorosityModelRe //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const RigCaseCellResultsData* RigCaseData::results(RifReaderInterface::PorosityModelResultType porosityModel) const +const RigCaseCellResultsData* RigEclipseCaseData::results(RifReaderInterface::PorosityModelResultType porosityModel) const { if (porosityModel == RifReaderInterface::MATRIX_RESULTS) { diff --git a/ApplicationCode/ReservoirDataModel/RigCaseData.h b/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h similarity index 98% rename from ApplicationCode/ReservoirDataModel/RigCaseData.h rename to ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h index f6503d132b..5e135b0d8a 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseData.h +++ b/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h @@ -44,7 +44,7 @@ struct RigWellResultPoint; //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -class RigCaseData : public cvf::Object +class RigEclipseCaseData : public cvf::Object { public: enum UnitsType @@ -55,8 +55,8 @@ public: }; public: - RigCaseData(); - ~RigCaseData(); + RigEclipseCaseData(); + ~RigEclipseCaseData(); RigMainGrid* mainGrid(); const RigMainGrid* mainGrid() const; diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp index b994d24d80..d3840eec23 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp +++ b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp @@ -19,7 +19,7 @@ #include "RigEclipseWellLogExtractor.h" #include -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigWellPath.h" #include "RigResultAccessor.h" #include "cvfBoundingBox.h" @@ -32,7 +32,7 @@ /// //================================================================================================== -RigEclipseWellLogExtractor::RigEclipseWellLogExtractor(const RigCaseData* aCase, const RigWellPath* wellpath, const std::string& wellCaseErrorMsgName) +RigEclipseWellLogExtractor::RigEclipseWellLogExtractor(const RigEclipseCaseData* aCase, const RigWellPath* wellpath, const std::string& wellCaseErrorMsgName) : m_caseData(aCase), RigWellLogExtractor(wellpath, wellCaseErrorMsgName) { calculateIntersection(); diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h index d92a362377..abb0c3b03b 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h +++ b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h @@ -29,7 +29,7 @@ #include #include "cvfStructGrid.h" -class RigCaseData; +class RigEclipseCaseData; class RigWellPath; class RigResultAccessor; @@ -43,14 +43,14 @@ namespace cvf { class RigEclipseWellLogExtractor : public RigWellLogExtractor { public: - RigEclipseWellLogExtractor(const RigCaseData* aCase, const RigWellPath* wellpath, const std::string& wellCaseErrorMsgName); + RigEclipseWellLogExtractor(const RigEclipseCaseData* aCase, const RigWellPath* wellpath, const std::string& wellCaseErrorMsgName); void curveData(const RigResultAccessor* resultAccessor, std::vector* values ); - const RigCaseData* caseData() { return m_caseData.p();} + const RigEclipseCaseData* caseData() { return m_caseData.p();} protected: void calculateIntersection(); std::vector findCloseCells(const cvf::BoundingBox& bb); - cvf::cref m_caseData; + cvf::cref m_caseData; }; diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp index a1e9312c56..c6751d67a2 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp @@ -19,7 +19,7 @@ #include "RigFlowDiagResults.h" #include "RigActiveCellInfo.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFlowDiagSolverInterface.h" #include "RigFlowDiagStatCalc.h" diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp index 81063c2a56..d163e95eed 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp @@ -23,7 +23,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFlowDiagInterfaceTools.h" #include "RimEclipseCase.h" diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h index e1d5bdac32..d602a45602 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h @@ -49,7 +49,7 @@ private: }; -class RigCaseData; +class RigEclipseCaseData; class RigOpmFldStaticData; class RigFlowDiagSolverInterface : public cvf::Object diff --git a/ApplicationCode/ReservoirDataModel/RigGridManager.cpp b/ApplicationCode/ReservoirDataModel/RigGridManager.cpp index d02816ce5d..e52d0525e6 100644 --- a/ApplicationCode/ReservoirDataModel/RigGridManager.cpp +++ b/ApplicationCode/ReservoirDataModel/RigGridManager.cpp @@ -17,14 +17,14 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RigGridManager.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigGridManager::addCase(RigCaseData* eclipseCase) +void RigGridManager::addCase(RigEclipseCaseData* eclipseCase) { cvf::ref caseAndGrid = new CaseToGridMap(eclipseCase, eclipseCase->mainGrid()); m_caseToGrid.push_back(caseAndGrid.p()); @@ -33,7 +33,7 @@ void RigGridManager::addCase(RigCaseData* eclipseCase) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigGridManager::removeCase(RigCaseData* eclipseCase) +void RigGridManager::removeCase(RigEclipseCaseData* eclipseCase) { for (size_t i = 0; i < m_caseToGrid.size(); i++) { @@ -121,7 +121,7 @@ bool RigGridManager::isGridDimensionsEqual(const std::vector< std::vector > //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigGridManager::CaseToGridMap::CaseToGridMap(RigCaseData* eclipseCase, RigMainGrid* mainGrid) : +RigGridManager::CaseToGridMap::CaseToGridMap(RigEclipseCaseData* eclipseCase, RigMainGrid* mainGrid) : m_eclipseCase(eclipseCase), m_mainGrid(mainGrid) { diff --git a/ApplicationCode/ReservoirDataModel/RigGridManager.h b/ApplicationCode/ReservoirDataModel/RigGridManager.h index 7f5f2adc45..6f96b20f16 100644 --- a/ApplicationCode/ReservoirDataModel/RigGridManager.h +++ b/ApplicationCode/ReservoirDataModel/RigGridManager.h @@ -25,14 +25,14 @@ #include class RigMainGrid; -class RigCaseData; +class RigEclipseCaseData; class RigGridManager : public cvf::Object { public: - void addCase(RigCaseData* eclipseCase); + void addCase(RigEclipseCaseData* eclipseCase); - void removeCase(RigCaseData* eclipseCase); + void removeCase(RigEclipseCaseData* eclipseCase); RigMainGrid* findEqualGrid(RigMainGrid* candidateGrid); @@ -44,9 +44,9 @@ private: class CaseToGridMap : public cvf::Object { public: - CaseToGridMap(RigCaseData* eclipseCase, RigMainGrid* mainGrid); + CaseToGridMap(RigEclipseCaseData* eclipseCase, RigMainGrid* mainGrid); - RigCaseData* m_eclipseCase; + RigEclipseCaseData* m_eclipseCase; RigMainGrid* m_mainGrid; }; diff --git a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp index 88529379ae..9fd1189e02 100644 --- a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp +++ b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp @@ -21,7 +21,7 @@ #include "RigReservoirBuilderMock.h" #include "RigActiveCellInfo.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigCell.h" #include "RigMainGrid.h" #include "RigSingleWellResultsData.h" @@ -168,7 +168,7 @@ void RigReservoirBuilderMock::appendCells(size_t nodeStartIndex, size_t cellCoun //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigReservoirBuilderMock::populateReservoir(RigCaseData* eclipseCase) +void RigReservoirBuilderMock::populateReservoir(RigEclipseCaseData* eclipseCase) { std::vector& mainGridNodes = eclipseCase->mainGrid()->nodes(); appendNodes(m_minWorldCoordinate, m_maxWorldCoordinate, cellDimension(), mainGridNodes); @@ -293,7 +293,7 @@ void RigReservoirBuilderMock::setWorldCoordinates(cvf::Vec3d minWorldCoordinate, //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RigReservoirBuilderMock::inputProperty(RigCaseData* eclipseCase, const QString& propertyName, std::vector* values) +bool RigReservoirBuilderMock::inputProperty(RigEclipseCaseData* eclipseCase, const QString& propertyName, std::vector* values) { size_t k; @@ -314,7 +314,7 @@ bool RigReservoirBuilderMock::inputProperty(RigCaseData* eclipseCase, const QStr //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RigReservoirBuilderMock::staticResult(RigCaseData* eclipseCase, const QString& result, std::vector* values) +bool RigReservoirBuilderMock::staticResult(RigEclipseCaseData* eclipseCase, const QString& result, std::vector* values) { values->resize(eclipseCase->mainGrid()->globalCellArray().size()); @@ -330,7 +330,7 @@ bool RigReservoirBuilderMock::staticResult(RigCaseData* eclipseCase, const QStri //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RigReservoirBuilderMock::dynamicResult(RigCaseData* eclipseCase, const QString& result, size_t stepIndex, std::vector* values) +bool RigReservoirBuilderMock::dynamicResult(RigEclipseCaseData* eclipseCase, const QString& result, size_t stepIndex, std::vector* values) { int resultIndex = 1; @@ -365,7 +365,7 @@ bool RigReservoirBuilderMock::dynamicResult(RigCaseData* eclipseCase, const QStr //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigReservoirBuilderMock::addWellData(RigCaseData* eclipseCase, RigGridBase* grid) +void RigReservoirBuilderMock::addWellData(RigEclipseCaseData* eclipseCase, RigGridBase* grid) { CVF_ASSERT(eclipseCase); CVF_ASSERT(grid); @@ -481,7 +481,7 @@ void RigReservoirBuilderMock::addWellData(RigCaseData* eclipseCase, RigGridBase* //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigReservoirBuilderMock::addFaults(RigCaseData* eclipseCase) +void RigReservoirBuilderMock::addFaults(RigEclipseCaseData* eclipseCase) { if (!eclipseCase) return; diff --git a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h index eb805b2077..682c548210 100644 --- a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h +++ b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h @@ -25,11 +25,7 @@ #include "cvfArray.h" #include "cvfVector3.h" -//#include "RigCell.h" -//#include "RigCaseData.h" -//#include "RigMainGrid.h" - -class RigCaseData; +class RigEclipseCaseData; class RigMainGrid; class RigConnection; class RigGridBase; @@ -68,17 +64,17 @@ public: void addLocalGridRefinement(const cvf::Vec3st& minCellPosition, const cvf::Vec3st& maxCellPosition, const cvf::Vec3st& singleCellRefinementFactors); - void populateReservoir(RigCaseData* eclipseCase); + void populateReservoir(RigEclipseCaseData* eclipseCase); - bool inputProperty(RigCaseData* eclipseCase, const QString& propertyName, std::vector* values ); - bool staticResult(RigCaseData* eclipseCase, const QString& result, std::vector* values ); - bool dynamicResult(RigCaseData* eclipseCase, const QString& result, size_t stepIndex, std::vector* values ); + bool inputProperty(RigEclipseCaseData* eclipseCase, const QString& propertyName, std::vector* values ); + bool staticResult(RigEclipseCaseData* eclipseCase, const QString& result, std::vector* values ); + bool dynamicResult(RigEclipseCaseData* eclipseCase, const QString& result, size_t stepIndex, std::vector* values ); private: - void addFaults(RigCaseData* eclipseCase); + void addFaults(RigEclipseCaseData* eclipseCase); static void addNnc(RigMainGrid* grid, size_t i1, size_t j1, size_t k1, size_t i2, size_t j2, size_t k2, std::vector &nncConnections); - void addWellData(RigCaseData* eclipseCase, RigGridBase* grid); + void addWellData(RigEclipseCaseData* eclipseCase, RigGridBase* grid); static void appendCells(size_t nodeStartIndex, size_t cellCount, RigGridBase* hostGrid, std::vector& cells); static void appendNodes(const cvf::Vec3d& min, const cvf::Vec3d& max, const cvf::Vec3st& cubeDimension, std::vector& nodes); diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp index b96971d0fc..7dd7f21d25 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp +++ b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp @@ -23,7 +23,7 @@ #include "RigActiveCellsResultAccessor.h" #include "RigAllGridCellsResultAccessor.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigCombMultResultAccessor.h" #include "RigCombTransResultAccessor.h" #include "RigGridBase.h" @@ -44,7 +44,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultAccessorFactory::createFromUiResultName(RigCaseData* eclipseCase, +cvf::ref RigResultAccessorFactory::createFromUiResultName(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -137,7 +137,7 @@ cvf::ref RigResultAccessorFactory::createFromUiResultName(Rig //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultAccessorFactory::createFromNameAndType(RigCaseData* eclipseCase, +cvf::ref RigResultAccessorFactory::createFromNameAndType(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -172,7 +172,7 @@ cvf::ref RigResultAccessorFactory::createFromNameAndType(RigC //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultAccessorFactory::createFromResultDefinition(RigCaseData* eclipseCase, +cvf::ref RigResultAccessorFactory::createFromResultDefinition(RigEclipseCaseData* eclipseCase, size_t gridIndex, size_t timeStepIndex, RimEclipseResultDefinition* resultDefinition) @@ -214,7 +214,7 @@ cvf::ref RigResultAccessorFactory::createFromResultDefinition //-------------------------------------------------------------------------------------------------- /// This function must be harmonized with RigResultModifierFactory::createResultModifier() //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultAccessorFactory::createNativeFromUiResultName(RigCaseData* eclipseCase, +cvf::ref RigResultAccessorFactory::createNativeFromUiResultName(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -242,7 +242,7 @@ cvf::ref RigResultAccessorFactory::createNativeFromUiResultNa //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultAccessorFactory::createFromResultIdx(RigCaseData* eclipseCase, +cvf::ref RigResultAccessorFactory::createFromResultIdx(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h index f3e995e0d6..5cb2e83b13 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h +++ b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h @@ -33,20 +33,20 @@ class RigResultAccessorFactory { public: static cvf::ref - createFromResultDefinition(RigCaseData* eclipseCase, + createFromResultDefinition(RigEclipseCaseData* eclipseCase, size_t gridIndex, size_t timeStepIndex, RimEclipseResultDefinition* resultDefinition); static cvf::ref - createFromUiResultName(RigCaseData* eclipseCase, + createFromUiResultName(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, const QString& uiResultName); static cvf::ref - createFromNameAndType(RigCaseData* eclipseCase, + createFromNameAndType(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -54,7 +54,7 @@ public: RimDefines::ResultCatType resultType); static cvf::ref - createFromResultIdx(RigCaseData* eclipseCase, + createFromResultIdx(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -62,7 +62,7 @@ public: private: static cvf::ref - createNativeFromUiResultName(RigCaseData* eclipseCase, + createNativeFromUiResultName(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, diff --git a/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp b/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp index 3b9064324f..0515009f7f 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp +++ b/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp @@ -20,7 +20,7 @@ #include "RigResultModifierFactory.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigResultModifier.h" #include @@ -29,7 +29,7 @@ //-------------------------------------------------------------------------------------------------- /// This function must be harmonized with RigResultAccessorFactory::createNativeResultAccessor() //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultModifierFactory::createResultModifier(RigCaseData* eclipseCase, +cvf::ref RigResultModifierFactory::createResultModifier(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -51,7 +51,7 @@ cvf::ref RigResultModifierFactory::createResultModifier(RigCa //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultModifierFactory::createResultModifier(RigCaseData* eclipseCase, +cvf::ref RigResultModifierFactory::createResultModifier(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, size_t scalarResultIndex) diff --git a/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.h b/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.h index 0ca58f7800..61b36d3425 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.h +++ b/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.h @@ -21,21 +21,21 @@ #include "RifReaderInterface.h" -class RigCaseData; +class RigEclipseCaseData; class RigResultModifier; class RigResultModifierFactory { public: static cvf::ref - createResultModifier(RigCaseData* eclipseCase, + createResultModifier(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, QString& uiResultName); static cvf::ref - createResultModifier(RigCaseData* eclipseCase, + createResultModifier(RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, diff --git a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp index 1bf3e2748d..96e66e6629 100644 --- a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp +++ b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp @@ -19,7 +19,7 @@ #include "RigSimulationWellCenterLineCalculator.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigCell.h" #include "RimEclipseCase.h" @@ -39,7 +39,7 @@ void RigSimulationWellCenterLineCalculator::calculateWellPipeCenterline(RimEclip std::vector< std::vector >& pipeBranchesCellIds) { bool isAutoDetectBranches = false; - RigCaseData* eclipseCaseData = NULL; + RigEclipseCaseData* eclipseCaseData = NULL; RigSingleWellResultsData* wellResults = NULL; { diff --git a/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp b/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp index b07b4bed89..7706782176 100644 --- a/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp +++ b/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp @@ -20,7 +20,7 @@ #include "RigTimeHistoryResultAccessor.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigGridBase.h" #include "RigResultAccessor.h" #include "RigResultAccessorFactory.h" @@ -30,7 +30,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigTimeHistoryResultAccessor::RigTimeHistoryResultAccessor(RigCaseData* eclipseCaseData, size_t gridIndex, size_t cellIndex, size_t scalarResultIndex, RifReaderInterface::PorosityModelResultType porosityModel) +RigTimeHistoryResultAccessor::RigTimeHistoryResultAccessor(RigEclipseCaseData* eclipseCaseData, size_t gridIndex, size_t cellIndex, size_t scalarResultIndex, RifReaderInterface::PorosityModelResultType porosityModel) : m_eclipseCaseData(eclipseCaseData), m_gridIndex(gridIndex), m_cellIndex(cellIndex), diff --git a/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.h b/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.h index 1caacfb575..7451a2e6ba 100644 --- a/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.h +++ b/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.h @@ -22,13 +22,13 @@ #include "cvfStructGrid.h" #include "RifReaderInterface.h" -class RigCaseData; +class RigEclipseCaseData; class RigTimeHistoryResultAccessor { public: - RigTimeHistoryResultAccessor(RigCaseData* eclipseCaseData, size_t gridIndex, size_t cellIndex, size_t scalarResultIndex, RifReaderInterface::PorosityModelResultType porosityModel); + RigTimeHistoryResultAccessor(RigEclipseCaseData* eclipseCaseData, size_t gridIndex, size_t cellIndex, size_t scalarResultIndex, RifReaderInterface::PorosityModelResultType porosityModel); void setFace(cvf::StructGridInterface::FaceType face); QString topologyText() const; @@ -38,7 +38,7 @@ private: void computeTimeHistoryData(); private: - RigCaseData* m_eclipseCaseData; + RigEclipseCaseData* m_eclipseCaseData; size_t m_gridIndex; size_t m_cellIndex; diff --git a/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp b/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp index 1b1b299c1e..f3f6625771 100644 --- a/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp @@ -27,7 +27,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "Rim3dOverlayInfoConfig.h" diff --git a/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp b/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp index 3984a7b0c3..94c4184307 100644 --- a/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp @@ -27,7 +27,7 @@ #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "Rim3dOverlayInfoConfig.h" diff --git a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp index 96eba45585..2f824abc25 100644 --- a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp @@ -24,7 +24,7 @@ #include "RiaSocketTools.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigMainGrid.h" #include "RigResultAccessor.h" #include "RigResultAccessorFactory.h" diff --git a/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp b/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp index f51efc9b36..6df39fd03d 100644 --- a/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp @@ -23,7 +23,7 @@ #include "RiaSocketTools.h" #include "RigGridBase.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigSingleWellResultsData.h" #include "RimEclipseCase.h" diff --git a/ApplicationCode/UnitTests/RifEclipseInputFileTools-Test.cpp b/ApplicationCode/UnitTests/RifEclipseInputFileTools-Test.cpp index 98b071f106..b25013e84f 100644 --- a/ApplicationCode/UnitTests/RifEclipseInputFileTools-Test.cpp +++ b/ApplicationCode/UnitTests/RifEclipseInputFileTools-Test.cpp @@ -1,6 +1,6 @@ #include "gtest/gtest.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RifEclipseInputFileTools.h" diff --git a/ApplicationCode/UnitTests/RifReaderEclipseOutput-Test.cpp b/ApplicationCode/UnitTests/RifReaderEclipseOutput-Test.cpp index df75bfdbf3..e58cb7a0f2 100644 --- a/ApplicationCode/UnitTests/RifReaderEclipseOutput-Test.cpp +++ b/ApplicationCode/UnitTests/RifReaderEclipseOutput-Test.cpp @@ -20,7 +20,7 @@ #include "gtest/gtest.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include @@ -441,7 +441,7 @@ TEST(RigReservoirTest, BasicTest) TEST(RigReservoirTest, WellTest) { cvf::ref readerInterfaceEcl = new RifReaderEclipseOutput; - cvf::ref reservoir = new RigCaseData; + cvf::ref reservoir = new RigEclipseCaseData; // Location of test dataset received from Håkon Høgstøl in July 2011 with 10k active cells #ifdef WIN32 diff --git a/ApplicationCode/UnitTests/RigReservoir-Test.cpp b/ApplicationCode/UnitTests/RigReservoir-Test.cpp index ab85e79344..e074f1d067 100644 --- a/ApplicationCode/UnitTests/RigReservoir-Test.cpp +++ b/ApplicationCode/UnitTests/RigReservoir-Test.cpp @@ -20,7 +20,7 @@ #include "gtest/gtest.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigGridManager.h" #include "RigMainGrid.h" @@ -32,7 +32,7 @@ TEST(RigGridManager, BasicTest) { cvf::ref mainGridA = new RigMainGrid; - cvf::ref eclipseCase = new RigCaseData; + cvf::ref eclipseCase = new RigEclipseCaseData; eclipseCase->setMainGrid(mainGridA.p()); int count = mainGridA->refCount(); @@ -59,7 +59,7 @@ TEST(RigGridManager, EqualTests) mainGridA->nodes().push_back(cvf::Vec3d(0, 0, 1)); mainGridA->nodes().push_back(cvf::Vec3d(0, 0, 2)); - cvf::ref eclipseCase = new RigCaseData; + cvf::ref eclipseCase = new RigEclipseCaseData; eclipseCase->setMainGrid(mainGridA.p()); diff --git a/ApplicationCode/UnitTests/opm-parser-Performance-Test.cpp b/ApplicationCode/UnitTests/opm-parser-Performance-Test.cpp index dd673675c9..cd1cfd4f86 100644 --- a/ApplicationCode/UnitTests/opm-parser-Performance-Test.cpp +++ b/ApplicationCode/UnitTests/opm-parser-Performance-Test.cpp @@ -2,7 +2,7 @@ #include "opm/parser/eclipse/Parser/Parser.hpp" #include "gtest/gtest.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RifEclipseInputFileTools.h" #include "RifReaderOpmParserInput.h" diff --git a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp index 49d3ecfcd5..a870232f5f 100644 --- a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp +++ b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp @@ -20,7 +20,7 @@ #include "RiuResultTextBuilder.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFormationNames.h" #include "RigMainGrid.h" #include "RigResultAccessor.h" @@ -139,7 +139,7 @@ QString RiuResultTextBuilder::topologyText(QString itemSeparator) if (m_reservoirView && m_reservoirView->eclipseCase()) { - const RigCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); + const RigEclipseCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); if (eclipseCase) { if (m_cellIndex != cvf::UNDEFINED_SIZE_T) @@ -187,7 +187,7 @@ QString RiuResultTextBuilder::gridResultDetails() if (m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData()) { - RigCaseData* eclipseCaseData = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCaseData = m_reservoirView->eclipseCase()->reservoirData(); RigGridBase* grid = eclipseCaseData->grid(m_gridIndex); this->appendTextFromResultColors(eclipseCaseData, m_gridIndex, m_cellIndex, m_timeStepIndex, m_reservoirView->cellResult(), &text); @@ -210,7 +210,7 @@ QString RiuResultTextBuilder::faultResultDetails() if (m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData()) { - RigCaseData* eclipseCaseData = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCaseData = m_reservoirView->eclipseCase()->reservoirData(); RigGridBase* grid = eclipseCaseData->grid(m_gridIndex); RigMainGrid* mainGrid = grid->mainGrid(); @@ -251,7 +251,7 @@ QString RiuResultTextBuilder::formationDetails() size_t k = cvf::UNDEFINED_SIZE_T; { - const RigCaseData* eclipseData = m_reservoirView->eclipseCase()->reservoirData(); + const RigEclipseCaseData* eclipseData = m_reservoirView->eclipseCase()->reservoirData(); if(eclipseData) { if(m_cellIndex != cvf::UNDEFINED_SIZE_T) @@ -301,7 +301,7 @@ QString RiuResultTextBuilder::faultResultText() if (m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData()) { - RigCaseData* eclipseCaseData = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCaseData = m_reservoirView->eclipseCase()->reservoirData(); RigGridBase* grid = eclipseCaseData->grid(m_gridIndex); RigMainGrid* mainGrid = grid->mainGrid(); @@ -331,7 +331,7 @@ QString RiuResultTextBuilder::nncResultText() { if (m_reservoirView.notNull() && m_reservoirView->eclipseCase()) { - RigCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); RigMainGrid* grid = eclipseCase->mainGrid(); CVF_ASSERT(grid); @@ -366,7 +366,7 @@ QString RiuResultTextBuilder::nncResultText() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuResultTextBuilder::appendTextFromResultColors(RigCaseData* eclipseCase, size_t gridIndex, size_t cellIndex, size_t timeStepIndex, RimEclipseCellColors* resultColors, QString* resultInfoText) +void RiuResultTextBuilder::appendTextFromResultColors(RigEclipseCaseData* eclipseCase, size_t gridIndex, size_t cellIndex, size_t timeStepIndex, RimEclipseCellColors* resultColors, QString* resultInfoText) { if (!resultColors) { @@ -561,7 +561,7 @@ QString RiuResultTextBuilder::nncDetails() { if (m_reservoirView.notNull() && m_reservoirView->eclipseCase()) { - RigCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); RigMainGrid* grid = eclipseCase->mainGrid(); CVF_ASSERT(grid); @@ -649,7 +649,7 @@ QString RiuResultTextBuilder::cellResultText(RimEclipseCellColors* resultColors) if (m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData()) { - RigCaseData* eclipseCaseData = m_reservoirView->eclipseCase()->reservoirData(); + RigEclipseCaseData* eclipseCaseData = m_reservoirView->eclipseCase()->reservoirData(); RigGridBase* grid = eclipseCaseData->grid(m_gridIndex); RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(resultColors->porosityModel()); diff --git a/ApplicationCode/UserInterface/RiuResultTextBuilder.h b/ApplicationCode/UserInterface/RiuResultTextBuilder.h index 543214c57f..012f1a5624 100644 --- a/ApplicationCode/UserInterface/RiuResultTextBuilder.h +++ b/ApplicationCode/UserInterface/RiuResultTextBuilder.h @@ -27,7 +27,7 @@ class RimEclipseView; class RimEclipseCellColors; class QString; -class RigCaseData; +class RigEclipseCaseData; namespace cvf { class Part; @@ -65,7 +65,7 @@ private: QString cellResultText(RimEclipseCellColors* resultColors); - void appendTextFromResultColors(RigCaseData* eclipseCase, size_t gridIndex, size_t cellIndex, size_t timeStepIndex, RimEclipseCellColors* resultColors, QString* resultInfoText); + void appendTextFromResultColors(RigEclipseCaseData* eclipseCase, size_t gridIndex, size_t cellIndex, size_t timeStepIndex, RimEclipseCellColors* resultColors, QString* resultInfoText); private: caf::PdmPointer m_reservoirView; diff --git a/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp b/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp index 35e3bce98b..11014de619 100644 --- a/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp +++ b/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp @@ -22,7 +22,7 @@ #include "RiaApplication.h" #include "RigCaseCellResultsData.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RiuFemTimeHistoryResultAccessor.h" #include "RigGeoMechCaseData.h" #include "RigTimeHistoryResultAccessor.h" diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp index 6a6f76af06..e9e454ab9c 100644 --- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp +++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp @@ -27,7 +27,7 @@ #include "RicRangeFilterNewExec.h" #include "WellPathCommands/RicWellPathViewerEventHandler.h" -#include "RigCaseData.h" +#include "RigEclipseCaseData.h" #include "RigFault.h" #include "RigFemPartCollection.h" #include "RigFemPartGrid.h"