diff --git a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake index 21ddac0704..33f6106e01 100644 --- a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake @@ -34,8 +34,8 @@ ${CEE_CURRENT_LIST_DIR}cvfGeometryTools.inl ${CEE_CURRENT_LIST_DIR}RigPipeInCellEvaluator.h ${CEE_CURRENT_LIST_DIR}RigResultAccessor2d.h ${CEE_CURRENT_LIST_DIR}RigTernaryResultAccessor2d.h -${CEE_CURRENT_LIST_DIR}RigNativeStatCalc.h -${CEE_CURRENT_LIST_DIR}RigMultipleDatasetStatCalc.h +${CEE_CURRENT_LIST_DIR}RigEclipseNativeStatCalc.h +${CEE_CURRENT_LIST_DIR}RigEclipseMultiPropertyStatCalc.h ${CEE_CURRENT_LIST_DIR}RigWellLogCurveData.h ) @@ -65,8 +65,8 @@ ${CEE_CURRENT_LIST_DIR}RigFault.cpp ${CEE_CURRENT_LIST_DIR}RigNNCData.cpp ${CEE_CURRENT_LIST_DIR}cvfGeometryTools.cpp ${CEE_CURRENT_LIST_DIR}RigTernaryResultAccessor2d.cpp -${CEE_CURRENT_LIST_DIR}RigNativeStatCalc.cpp -${CEE_CURRENT_LIST_DIR}RigMultipleDatasetStatCalc.cpp +${CEE_CURRENT_LIST_DIR}RigEclipseNativeStatCalc.cpp +${CEE_CURRENT_LIST_DIR}RigEclipseMultiPropertyStatCalc.cpp ${CEE_CURRENT_LIST_DIR}RigWellLogCurveData.cpp ) diff --git a/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp index 885b24d48e..48f2aa9083 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp @@ -23,8 +23,8 @@ #include "RigMainGrid.h" #include "RigStatisticsDataCache.h" #include "RigStatisticsMath.h" -#include "RigMultipleDatasetStatCalc.h" -#include "RigNativeStatCalc.h" +#include "RigEclipseMultiPropertyStatCalc.h" +#include "RigEclipseNativeStatCalc.h" #include #include @@ -249,7 +249,7 @@ size_t RigCaseCellResultsData::addEmptyScalarResult(RimDefines::ResultCatType ty if (resultName == RimDefines::combinedTransmissibilityResultName()) { - cvf::ref calc = new RigMultipleDatasetStatCalc(); + cvf::ref calc = new RigEclipseMultiPropertyStatCalc(); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, "TRANX")); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, "TRANY")); @@ -259,7 +259,7 @@ size_t RigCaseCellResultsData::addEmptyScalarResult(RimDefines::ResultCatType ty } else if (resultName == RimDefines::combinedMultResultName()) { - cvf::ref calc = new RigMultipleDatasetStatCalc(); + cvf::ref calc = new RigEclipseMultiPropertyStatCalc(); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, "MULTX")); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, "MULTX-")); @@ -272,7 +272,7 @@ size_t RigCaseCellResultsData::addEmptyScalarResult(RimDefines::ResultCatType ty } else if (resultName == RimDefines::combinedRiTranResultName()) { - cvf::ref calc = new RigMultipleDatasetStatCalc(); + cvf::ref calc = new RigEclipseMultiPropertyStatCalc(); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riTranXResultName())); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riTranYResultName())); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riTranZResultName())); @@ -280,7 +280,7 @@ size_t RigCaseCellResultsData::addEmptyScalarResult(RimDefines::ResultCatType ty } else if (resultName == RimDefines::combinedRiMultResultName()) { - cvf::ref calc = new RigMultipleDatasetStatCalc(); + cvf::ref calc = new RigEclipseMultiPropertyStatCalc(); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riMultXResultName())); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riMultYResultName())); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riMultZResultName())); @@ -288,7 +288,7 @@ size_t RigCaseCellResultsData::addEmptyScalarResult(RimDefines::ResultCatType ty } else if (resultName == RimDefines::combinedRiAreaNormTranResultName()) { - cvf::ref calc = new RigMultipleDatasetStatCalc(); + cvf::ref calc = new RigEclipseMultiPropertyStatCalc(); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riAreaNormTranXResultName())); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riAreaNormTranYResultName())); calc->addNativeStatisticsCalculator(this, findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::riAreaNormTranZResultName())); @@ -296,7 +296,7 @@ size_t RigCaseCellResultsData::addEmptyScalarResult(RimDefines::ResultCatType ty } else { - statisticsCalculator = new RigNativeStatCalc(this, scalarResultIndex); + statisticsCalculator = new RigEclipseNativeStatCalc(this, scalarResultIndex); } cvf::ref dataCache = new RigStatisticsDataCache(statisticsCalculator.p()); diff --git a/ApplicationCode/ReservoirDataModel/RigMultipleDatasetStatCalc.cpp b/ApplicationCode/ReservoirDataModel/RigEclipseMultiPropertyStatCalc.cpp similarity index 78% rename from ApplicationCode/ReservoirDataModel/RigMultipleDatasetStatCalc.cpp rename to ApplicationCode/ReservoirDataModel/RigEclipseMultiPropertyStatCalc.cpp index ba654ccf16..7bceecbf91 100644 --- a/ApplicationCode/ReservoirDataModel/RigMultipleDatasetStatCalc.cpp +++ b/ApplicationCode/ReservoirDataModel/RigEclipseMultiPropertyStatCalc.cpp @@ -17,21 +17,21 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RigMultipleDatasetStatCalc.h" -#include "RigNativeStatCalc.h" +#include "RigEclipseMultiPropertyStatCalc.h" +#include "RigEclipseNativeStatCalc.h" //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigMultipleDatasetStatCalc::RigMultipleDatasetStatCalc() +RigEclipseMultiPropertyStatCalc::RigEclipseMultiPropertyStatCalc() { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigMultipleDatasetStatCalc::addStatisticsCalculator(RigStatisticsCalculator* statisticsCalculator) +void RigEclipseMultiPropertyStatCalc::addStatisticsCalculator(RigStatisticsCalculator* statisticsCalculator) { if (statisticsCalculator) { @@ -42,7 +42,7 @@ void RigMultipleDatasetStatCalc::addStatisticsCalculator(RigStatisticsCalculator //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigMultipleDatasetStatCalc::minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max) +void RigEclipseMultiPropertyStatCalc::minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max) { for (size_t i = 0; i < m_nativeStatisticsCalculators.size(); i++) { @@ -56,7 +56,7 @@ void RigMultipleDatasetStatCalc::minMaxCellScalarValues(size_t timeStepIndex, do //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigMultipleDatasetStatCalc::posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg) +void RigEclipseMultiPropertyStatCalc::posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg) { for (size_t i = 0; i < m_nativeStatisticsCalculators.size(); i++) { @@ -71,7 +71,7 @@ void RigMultipleDatasetStatCalc::posNegClosestToZero(size_t timeStepIndex, doubl //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigMultipleDatasetStatCalc::valueSumAndSampleCount(size_t timeStepIndex, double& valueSum, size_t& sampleCount) +void RigEclipseMultiPropertyStatCalc::valueSumAndSampleCount(size_t timeStepIndex, double& valueSum, size_t& sampleCount) { for (size_t i = 0; i < m_nativeStatisticsCalculators.size(); i++) { @@ -86,7 +86,7 @@ void RigMultipleDatasetStatCalc::valueSumAndSampleCount(size_t timeStepIndex, do //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigMultipleDatasetStatCalc::addDataToHistogramCalculator(size_t timeStepIndex, RigHistogramCalculator& histogramCalculator) +void RigEclipseMultiPropertyStatCalc::addDataToHistogramCalculator(size_t timeStepIndex, RigHistogramCalculator& histogramCalculator) { for (size_t i = 0; i < m_nativeStatisticsCalculators.size(); i++) { @@ -100,7 +100,7 @@ void RigMultipleDatasetStatCalc::addDataToHistogramCalculator(size_t timeStepInd //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -size_t RigMultipleDatasetStatCalc::timeStepCount() +size_t RigEclipseMultiPropertyStatCalc::timeStepCount() { if (m_nativeStatisticsCalculators.size() > 0) { @@ -113,11 +113,11 @@ size_t RigMultipleDatasetStatCalc::timeStepCount() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigMultipleDatasetStatCalc::addNativeStatisticsCalculator(RigCaseCellResultsData* cellResultsData, size_t scalarResultIndex) +void RigEclipseMultiPropertyStatCalc::addNativeStatisticsCalculator(RigCaseCellResultsData* cellResultsData, size_t scalarResultIndex) { if (scalarResultIndex != cvf::UNDEFINED_SIZE_T) { - this->addStatisticsCalculator(new RigNativeStatCalc(cellResultsData, scalarResultIndex)); + this->addStatisticsCalculator(new RigEclipseNativeStatCalc(cellResultsData, scalarResultIndex)); } } diff --git a/ApplicationCode/ReservoirDataModel/RigMultipleDatasetStatCalc.h b/ApplicationCode/ReservoirDataModel/RigEclipseMultiPropertyStatCalc.h similarity index 94% rename from ApplicationCode/ReservoirDataModel/RigMultipleDatasetStatCalc.h rename to ApplicationCode/ReservoirDataModel/RigEclipseMultiPropertyStatCalc.h index b36e4e1aa3..6a85fa2afb 100644 --- a/ApplicationCode/ReservoirDataModel/RigMultipleDatasetStatCalc.h +++ b/ApplicationCode/ReservoirDataModel/RigEclipseMultiPropertyStatCalc.h @@ -34,10 +34,10 @@ class RigCaseCellResultsData; //================================================================================================== /// //================================================================================================== -class RigMultipleDatasetStatCalc : public RigStatisticsCalculator +class RigEclipseMultiPropertyStatCalc : public RigStatisticsCalculator { public: - RigMultipleDatasetStatCalc(); + RigEclipseMultiPropertyStatCalc(); void addStatisticsCalculator(RigStatisticsCalculator* statisticsCalculator); void addNativeStatisticsCalculator(RigCaseCellResultsData* cellResultsData, size_t scalarResultIndices); diff --git a/ApplicationCode/ReservoirDataModel/RigNativeStatCalc.cpp b/ApplicationCode/ReservoirDataModel/RigEclipseNativeStatCalc.cpp similarity index 85% rename from ApplicationCode/ReservoirDataModel/RigNativeStatCalc.cpp rename to ApplicationCode/ReservoirDataModel/RigEclipseNativeStatCalc.cpp index d6d1a6ac99..a152114abf 100644 --- a/ApplicationCode/ReservoirDataModel/RigNativeStatCalc.cpp +++ b/ApplicationCode/ReservoirDataModel/RigEclipseNativeStatCalc.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RigNativeStatCalc.h" +#include "RigEclipseNativeStatCalc.h" #include "RigStatisticsMath.h" #include "RigCaseCellResultsData.h" @@ -29,7 +29,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigNativeStatCalc::RigNativeStatCalc(RigCaseCellResultsData* cellResultsData, size_t scalarResultIndex) +RigEclipseNativeStatCalc::RigEclipseNativeStatCalc(RigCaseCellResultsData* cellResultsData, size_t scalarResultIndex) : m_resultsData(cellResultsData), m_scalarResultIndex(scalarResultIndex) { @@ -39,7 +39,7 @@ RigNativeStatCalc::RigNativeStatCalc(RigCaseCellResultsData* cellResultsData, si //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigNativeStatCalc::minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max) +void RigEclipseNativeStatCalc::minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max) { std::vector& values = m_resultsData->cellScalarResults(m_scalarResultIndex, timeStepIndex); @@ -66,7 +66,7 @@ void RigNativeStatCalc::minMaxCellScalarValues(size_t timeStepIndex, double& min //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigNativeStatCalc::posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg) +void RigEclipseNativeStatCalc::posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg) { std::vector& values = m_resultsData->cellScalarResults(m_scalarResultIndex, timeStepIndex); @@ -94,7 +94,7 @@ void RigNativeStatCalc::posNegClosestToZero(size_t timeStepIndex, double& pos, d //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigNativeStatCalc::addDataToHistogramCalculator(size_t timeStepIndex, RigHistogramCalculator& histogramCalculator) +void RigEclipseNativeStatCalc::addDataToHistogramCalculator(size_t timeStepIndex, RigHistogramCalculator& histogramCalculator) { std::vector& values = m_resultsData->cellScalarResults(m_scalarResultIndex, timeStepIndex); @@ -106,7 +106,7 @@ void RigNativeStatCalc::addDataToHistogramCalculator(size_t timeStepIndex, RigHi //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigNativeStatCalc::valueSumAndSampleCount(size_t timeStepIndex, double& valueSum, size_t& sampleCount) +void RigEclipseNativeStatCalc::valueSumAndSampleCount(size_t timeStepIndex, double& valueSum, size_t& sampleCount) { std::vector& values = m_resultsData->cellScalarResults(m_scalarResultIndex, timeStepIndex); size_t undefValueCount = 0; @@ -129,7 +129,7 @@ void RigNativeStatCalc::valueSumAndSampleCount(size_t timeStepIndex, double& val //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -size_t RigNativeStatCalc::timeStepCount() +size_t RigEclipseNativeStatCalc::timeStepCount() { return m_resultsData->timeStepCount(m_scalarResultIndex); } diff --git a/ApplicationCode/ReservoirDataModel/RigNativeStatCalc.h b/ApplicationCode/ReservoirDataModel/RigEclipseNativeStatCalc.h similarity index 91% rename from ApplicationCode/ReservoirDataModel/RigNativeStatCalc.h rename to ApplicationCode/ReservoirDataModel/RigEclipseNativeStatCalc.h index 929888dcae..2ad79f4c4d 100644 --- a/ApplicationCode/ReservoirDataModel/RigNativeStatCalc.h +++ b/ApplicationCode/ReservoirDataModel/RigEclipseNativeStatCalc.h @@ -31,10 +31,10 @@ class RigCaseCellResultsData; //================================================================================================== /// //================================================================================================== -class RigNativeStatCalc : public RigStatisticsCalculator +class RigEclipseNativeStatCalc : public RigStatisticsCalculator { public: - RigNativeStatCalc(RigCaseCellResultsData* cellResultsData, size_t scalarResultIndex); + RigEclipseNativeStatCalc(RigCaseCellResultsData* cellResultsData, size_t scalarResultIndex); virtual void minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max); virtual void posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg);