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

#1787 Removing code from constructor to separate calculate function

Browse Source
This commit is contained in:
astridkbjorke 2017-08-28 14:14:21 +02:00
parent ae8729f7f7
commit dc41644452
2 changed files with 69 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
ApplicationCode/ReservoirDataModel/RigNumberOfFloodedPoreVolumesCalculator.cpp
View File

@ -52,6 +52,8 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
{
scalarResultIndexTracers.push_back(gridCellResults->findOrLoadScalarResult(RiaDefines::STATIC_NATIVE, "FLRWATI+"));
}
std::vector<std::vector<double> > summedTracersAtAllTimesteps;
//TODO: Option for Oil and Gas instead of water
size_t scalarResultIndexFlowrateI = gridCellResults->findOrLoadScalarResult(RiaDefines::STATIC_NATIVE, "FLRWATI+");
@ -77,9 +79,11 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
const std::vector<double>* flowrateI = &(eclipseCaseData->results(RiaDefines::MATRIX_MODEL)->cellScalarResults(scalarResultIndexFlowrateI,
timeStep));
flowrateIatAllTimeSteps.push_back(flowrateI);
const std::vector<double>* flowrateJ = &(eclipseCaseData->results(RiaDefines::MATRIX_MODEL)->cellScalarResults(scalarResultIndexFlowrateJ,
timeStep));
flowrateJatAllTimeSteps.push_back(flowrateJ);
const std::vector<double>* flowrateK = &(eclipseCaseData->results(RiaDefines::MATRIX_MODEL)->cellScalarResults(scalarResultIndexFlowrateK,
timeStep));
flowrateKatAllTimeSteps.push_back(flowrateK);
@ -87,10 +91,47 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
const std::vector<double>* connectionFlowrate = nncData->dynamicConnectionScalarResultByName(nncConnectionProperty,
timeStep);
flowrateNNCatAllTimeSteps.push_back(connectionFlowrate);
//sum all tracers at current timestep
std::vector<double> summedTracerValues(porvResults->size());
for (size_t tracerIndex : scalarResultIndexTracers)
{
const std::vector<double>* tracerResult = &(eclipseCaseData->results(RiaDefines::MATRIX_MODEL)->cellScalarResults(tracerIndex, timeStep));
for (size_t i = 0; i < summedTracerValues.size(); i++)
{
summedTracerValues[i] += tracerResult->at(i);
}
}
summedTracersAtAllTimesteps.push_back(summedTracerValues);
}
calculate(mainGrid,
daysSinceSimulationStart,
porvResults, flowrateIatAllTimeSteps,
flowrateJatAllTimeSteps,
flowrateKatAllTimeSteps,
connections,
flowrateNNCatAllTimeSteps,
summedTracersAtAllTimesteps);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigNumberOfFloodedPoreVolumesCalculator::calculate(RigMainGrid* mainGrid,
std::vector<double> daysSinceSimulationStart,
const std::vector<double>* porvResults,
std::vector<const std::vector<double>* > flowrateIatAllTimeSteps,
std::vector<const std::vector<double>* > flowrateJatAllTimeSteps,
std::vector<const std::vector<double>* > flowrateKatAllTimeSteps,
const std::vector<RigConnection> connections,
std::vector<const std::vector<double>* > flowrateNNCatAllTimeSteps,
std::vector<std::vector<double> > summedTracersAtAllTimesteps)
{
size_t totalNumberOfCells = porvResults->size();
std::vector<std::vector<double>> cellQwInAtAllTimeSteps;
@ -111,28 +152,18 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
std::vector<double> totoalFlowrateIntoCell(totalNumberOfCells);
std::vector<double> summedTracerValues(totalNumberOfCells);
//sum all tracers at current timestep
for (size_t tracerIndex : scalarResultIndexTracers)
{
const std::vector<double>* tracerResult = &(eclipseCaseData->results(RiaDefines::MATRIX_MODEL)->cellScalarResults(tracerIndex, timeStep));
for (size_t i = 0; i < summedTracerValues.size(); i++)
{
summedTracerValues[i] += tracerResult->at(i);
}
}
distributeNeighbourCellFlow(mainGrid,
totalNumberOfCells,
summedTracerValues,
summedTracersAtAllTimesteps[timeStep],
flowrateI,
flowrateJ,
flowrateK,
totoalFlowrateIntoCell);
distributeNNCflow(connections,
summedTracerValues,
summedTracersAtAllTimesteps[timeStep],
flowrateNNC,
totoalFlowrateIntoCell);
@ -161,10 +192,8 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

14
ApplicationCode/ReservoirDataModel/RigNumberOfFloodedPoreVolumesCalculator.h
View File

@ -40,6 +40,19 @@ public:
);
private:
void calculate(RigMainGrid* mainGrid,
std::vector<double> daysSinceSimulationStart,
const std::vector<double>* porvResults,
std::vector<const std::vector<double>* > flowrateIatAllTimeSteps,
std::vector<const std::vector<double>* > flowrateJatAllTimeSteps,
std::vector<const std::vector<double>* > flowrateKatAllTimeSteps,
const std::vector<RigConnection> connections,
std::vector<const std::vector<double>* > flowrateNNCatAllTimeSteps,
std::vector<std::vector<double> > summedTracersAtAllTimesteps);
void distributeNNCflow(std::vector<RigConnection> connections,
std::vector<double> summedTracerValues,
const std::vector<double>* flowrateNNC,
@ -52,6 +65,7 @@ public:
const std::vector<double>* flrWatResultJ,
const std::vector<double>* flrWatResultK,
std::vector<double> &totalFlowrateIntoCell);
private:
std::vector<std::vector<double>> m_cumWinflowPVAllTimeSteps;