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

#1126 Fixing constructor

Browse Source
This commit is contained in:
astridkbjorke 2017-08-10 15:25:51 +02:00
parent 2ce81e9045
commit db6d471e9c
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ApplicationCode/ReservoirDataModel/RigTofAccumulatedPhaseFractionsCalculator.cpp
View File

@ -18,16 +18,17 @@
#include "RigTofAccumulatedPhaseFractionsCalculator.h"
#include "RigCaseCellResultsData.h"
#include "RigEclipseCaseData.h"
#include "RimEclipseCase.h"
#include "RimReservoirCellResultsStorage.h"
#include "RigFlowDiagResultAddress.h"
#include "RigFlowDiagResults.h"
#include "RigResultAccessor.h"
#include "RigResultAccessorFactory.h"
#include "RigSingleWellResultsData.h"
#include "RigFlowDiagResultAddress.h"
#include "RimEclipseResultCase.h"
#include "RimFlowDiagSolution.h"
#include "RigFlowDiagResults.h"
#include "RigCaseCellResultsData.h"
#include "RimReservoirCellResultsStorage.h"
#include <map>
@ -36,13 +37,15 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigTofAccumulatedPhaseFractionsCalculator::RigTofAccumulatedPhaseFractionsCalculator(RimEclipseCase* caseToApply,
RigTofAccumulatedPhaseFractionsCalculator::RigTofAccumulatedPhaseFractionsCalculator(RimEclipseResultCase* caseToApply,
QString wellname,
size_t timestep)
:m_case(caseToApply),
m_wellName(wellname),
m_timeStep(timestep)
{
m_flowDiagSolution = caseToApply->defaultFlowDiagSolution();
computeTOFaccumulations();
}
@ -80,23 +83,16 @@ void RigTofAccumulatedPhaseFractionsCalculator::computeTOFaccumulations()
m_wellName.toStdString()),
m_timeStep);
std::vector<double> accumulatedPhaseFractionSwat;
std::vector<double> accumulatedPhaseFractionSoil;
std::vector<double> accumulatedPhaseFractionSgas;
std::vector<double> tofInIncreasingOrder;
sortTofAndCalculateAccPhaseFraction(tofData,
fractionData,
porvResults,
swatResults,
soilResults,
sgasResults,
accumulatedPhaseFractionSwat,
accumulatedPhaseFractionSoil,
accumulatedPhaseFractionSgas,
tofInIncreasingOrder);
m_accumulatedPhaseFractionSwat,
m_accumulatedPhaseFractionSoil,
m_accumulatedPhaseFractionSgas,
m_tofInIncreasingOrder);

6
ApplicationCode/ReservoirDataModel/RigTofAccumulatedPhaseFractionsCalculator.h
View File

@ -28,7 +28,7 @@
#include <array>
#include "RimFlowDiagSolution.h"
class RimEclipseCase;
class RimEclipseResultCase;
//==================================================================================================
///
@ -38,7 +38,7 @@ class RigTofAccumulatedPhaseFractionsCalculator
{
public:
explicit RigTofAccumulatedPhaseFractionsCalculator(RimEclipseCase* caseToApply,
explicit RigTofAccumulatedPhaseFractionsCalculator(RimEclipseResultCase* caseToApply,
QString wellname,
size_t timestep);
@ -63,7 +63,7 @@ private:
private:
RimEclipseCase* m_case;
RimEclipseResultCase* m_case;
QString m_wellName;
size_t m_timeStep;