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

Move RigCurveDataTools and RigTimeHistoryCurveMerger to Application/Tools plus rename

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-06-08 15:10:45 +02:00
parent 68f965f6bb
commit eebd8bef2d
19 changed files with 528 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp
View File

@@ -18,7 +18,7 @@
#include "Rim3dWellLogCurve.h"
#include "RigCurveDataTools.h"
#include "RiaCurveDataTools.h"
#include "Riv3dWellLogCurveGeometryGenerator.h"
#include "Rim3dWellLogCurveCollection.h"
@@ -268,7 +268,7 @@ void Rim3dWellLogCurve::resetMinMaxValues()
double foundMaxValue = -std::numeric_limits<float>::infinity();
for (double value : values)
{
if (RigCurveDataTools::isValidValue(value, false))
if (RiaCurveDataTools::isValidValue(value, false))
{
foundMinValue = std::min(foundMinValue, value);
foundMaxValue = std::max(foundMaxValue, value);

4
ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp
View File

@@ -23,7 +23,7 @@
#include "RiaSummaryCurveDefinition.h"
#include "RiaSummaryTools.h"
#include "RigTimeHistoryCurveMerger.h"
#include "RiaTimeHistoryCurveMerger.h"
#include "RimProject.h"
#include "RimSummaryAddress.h"
@@ -240,7 +240,7 @@ bool RimSummaryCalculation::calculate()
{
QString leftHandSideVariableName = RimSummaryCalculation::findLeftHandSide(m_expression);
RigTimeHistoryCurveMerger timeHistoryCurveMerger;
RiaTimeHistoryCurveMerger timeHistoryCurveMerger;
for (size_t i = 0; i < m_variables.size(); i++)
{

2
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@@ -27,7 +27,7 @@
#include "RifReaderEclipseSummary.h"
#include "RigStatisticsMath.h"
#include "RigTimeHistoryCurveMerger.h"
#include "RiaTimeHistoryCurveMerger.h"
#include "RimEnsembleCurveFilter.h"
#include "RimEnsembleCurveFilterCollection.h"

2
ApplicationCode/ProjectDataModel/Summary/RimEnsembleStatistics.cpp
View File

@@ -21,7 +21,7 @@
#include "RifSummaryReaderInterface.h"
#include "RigStatisticsMath.h"
#include "RigTimeHistoryCurveMerger.h"
#include "RiaTimeHistoryCurveMerger.h"
#include "RimEnsembleCurveSet.h"
#include "RimSummaryCase.h"

4
ApplicationCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp
View File

@@ -21,7 +21,7 @@
#include "RifEnsembleStatisticsReader.h"
#include "RigStatisticsMath.h"
#include "RigTimeHistoryCurveMerger.h"
#include "RiaTimeHistoryCurveMerger.h"
#include "RimEnsembleCurveSet.h"
@@ -111,7 +111,7 @@ const RimEnsembleCurveSet* RimEnsembleStatisticsCase::curveSet() const
//--------------------------------------------------------------------------------------------------
void RimEnsembleStatisticsCase::calculate(const RimSummaryCaseCollection* ensemble, const RifEclipseSummaryAddress& inputAddress)
{
RigTimeHistoryCurveMerger curveMerger;
RiaTimeHistoryCurveMerger curveMerger;
int caseCount = (int)ensemble->allSummaryCases().size();
{

6
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@@ -23,7 +23,7 @@
#include "RifReaderEclipseSummary.h"
#include "RigTimeHistoryCurveMerger.h"
#include "RiaTimeHistoryCurveMerger.h"
#include "RimEclipseResultCase.h"
#include "RimProject.h"
@@ -433,7 +433,7 @@ void RimSummaryCurve::onLoadDataAndUpdate(bool updateParentPlot)
}
else
{
RigTimeHistoryCurveMerger curveMerger;
RiaTimeHistoryCurveMerger curveMerger;
curveMerger.addCurveData(curveValuesX, curveTimeStepsX);
curveMerger.addCurveData(curveValuesY, curveTimeStepsY);
curveMerger.computeInterpolatedValues();
@@ -771,7 +771,7 @@ void RimSummaryCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
if (!curveValuesX.empty() && !curveValuesY.empty())
{
RigTimeHistoryCurveMerger curveMerger;
RiaTimeHistoryCurveMerger curveMerger;
curveMerger.addCurveData(curveValuesX, curveTimeStepsX);
curveMerger.addCurveData(curveValuesY, curveTimeStepsY);
curveMerger.computeInterpolatedValues();