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

79
ApplicationCode/ReservoirDataModel/RigNumberOfFloodedPoreVolumesCalculator.cpp
View File

@ -52,6 +52,8 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
{ {
scalarResultIndexTracers.push_back(gridCellResults->findOrLoadScalarResult(RiaDefines::STATIC_NATIVE, "FLRWATI+")); scalarResultIndexTracers.push_back(gridCellResults->findOrLoadScalarResult(RiaDefines::STATIC_NATIVE, "FLRWATI+"));
} }
std::vector<std::vector<double> > summedTracersAtAllTimesteps;
//TODO: Option for Oil and Gas instead of water //TODO: Option for Oil and Gas instead of water
size_t scalarResultIndexFlowrateI = gridCellResults->findOrLoadScalarResult(RiaDefines::STATIC_NATIVE, "FLRWATI+"); 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, const std::vector<double>* flowrateI = &(eclipseCaseData->results(RiaDefines::MATRIX_MODEL)->cellScalarResults(scalarResultIndexFlowrateI,
timeStep)); timeStep));
flowrateIatAllTimeSteps.push_back(flowrateI); flowrateIatAllTimeSteps.push_back(flowrateI);
const std::vector<double>* flowrateJ = &(eclipseCaseData->results(RiaDefines::MATRIX_MODEL)->cellScalarResults(scalarResultIndexFlowrateJ, const std::vector<double>* flowrateJ = &(eclipseCaseData->results(RiaDefines::MATRIX_MODEL)->cellScalarResults(scalarResultIndexFlowrateJ,
timeStep)); timeStep));
flowrateJatAllTimeSteps.push_back(flowrateJ); flowrateJatAllTimeSteps.push_back(flowrateJ);
const std::vector<double>* flowrateK = &(eclipseCaseData->results(RiaDefines::MATRIX_MODEL)->cellScalarResults(scalarResultIndexFlowrateK, const std::vector<double>* flowrateK = &(eclipseCaseData->results(RiaDefines::MATRIX_MODEL)->cellScalarResults(scalarResultIndexFlowrateK,
timeStep)); timeStep));
flowrateKatAllTimeSteps.push_back(flowrateK); flowrateKatAllTimeSteps.push_back(flowrateK);
@ -87,10 +91,47 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
const std::vector<double>* connectionFlowrate = nncData->dynamicConnectionScalarResultByName(nncConnectionProperty, const std::vector<double>* connectionFlowrate = nncData->dynamicConnectionScalarResultByName(nncConnectionProperty,
timeStep); timeStep);
flowrateNNCatAllTimeSteps.push_back(connectionFlowrate); 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(); size_t totalNumberOfCells = porvResults->size();
std::vector<std::vector<double>> cellQwInAtAllTimeSteps; std::vector<std::vector<double>> cellQwInAtAllTimeSteps;
@ -100,7 +141,7 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
for (size_t timeStep = 1; timeStep < daysSinceSimulationStart.size(); timeStep++) for (size_t timeStep = 1; timeStep < daysSinceSimulationStart.size(); timeStep++)
{ {
double daysSinceSimStartNow = daysSinceSimulationStart[timeStep]; double daysSinceSimStartNow = daysSinceSimulationStart[timeStep];
double daysSinceSimStartLastTimeStep = daysSinceSimulationStart[timeStep -1]; double daysSinceSimStartLastTimeStep = daysSinceSimulationStart[timeStep - 1];
double deltaT = daysSinceSimStartNow - daysSinceSimStartLastTimeStep; double deltaT = daysSinceSimStartNow - daysSinceSimStartLastTimeStep;
const std::vector<double>* flowrateI = flowrateIatAllTimeSteps[timeStep]; const std::vector<double>* flowrateI = flowrateIatAllTimeSteps[timeStep];
@ -111,36 +152,26 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
std::vector<double> totoalFlowrateIntoCell(totalNumberOfCells); 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, distributeNeighbourCellFlow(mainGrid,
totalNumberOfCells, totalNumberOfCells,
summedTracerValues, summedTracersAtAllTimesteps[timeStep],
flowrateI, flowrateI,
flowrateJ, flowrateJ,
flowrateK, flowrateK,
totoalFlowrateIntoCell); totoalFlowrateIntoCell);
distributeNNCflow(connections, distributeNNCflow(connections,
summedTracerValues, summedTracersAtAllTimesteps[timeStep],
flowrateNNC, flowrateNNC,
totoalFlowrateIntoCell); totoalFlowrateIntoCell);
std::vector<double> CellQwIn(totalNumberOfCells); std::vector<double> CellQwIn(totalNumberOfCells);
for (size_t globalCellIndex = 0; globalCellIndex < totalNumberOfCells; globalCellIndex++) for (size_t globalCellIndex = 0; globalCellIndex < totalNumberOfCells; globalCellIndex++)
{ {
CellQwIn[globalCellIndex] = cellQwInAtAllTimeSteps[timeStep-1][globalCellIndex] CellQwIn[globalCellIndex] = cellQwInAtAllTimeSteps[timeStep - 1][globalCellIndex]
+ (totoalFlowrateIntoCell[globalCellIndex]) * deltaT; + (totoalFlowrateIntoCell[globalCellIndex]) * deltaT;
} }
cellQwInAtAllTimeSteps.push_back(CellQwIn); cellQwInAtAllTimeSteps.push_back(CellQwIn);
@ -156,15 +187,13 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
{ {
for (size_t globalCellIndex = 0; globalCellIndex < totalNumberOfCells; globalCellIndex++) for (size_t globalCellIndex = 0; globalCellIndex < totalNumberOfCells; globalCellIndex++)
{ {
m_cumWinflowPVAllTimeSteps[timeStep][globalCellIndex] = cellQwInAtAllTimeSteps[timeStep][globalCellIndex] m_cumWinflowPVAllTimeSteps[timeStep][globalCellIndex] = cellQwInAtAllTimeSteps[timeStep][globalCellIndex]
/ porvResults->at(globalCellIndex); / porvResults->at(globalCellIndex);
} }
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

16
ApplicationCode/ReservoirDataModel/RigNumberOfFloodedPoreVolumesCalculator.h
View File

@ -40,7 +40,20 @@ public:
); );
void distributeNNCflow(std::vector<RigConnection> connections,
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, std::vector<double> summedTracerValues,
const std::vector<double>* flowrateNNC, const std::vector<double>* flowrateNNC,
std::vector<double> &flowrateIntoCell); std::vector<double> &flowrateIntoCell);
@ -52,6 +65,7 @@ public:
const std::vector<double>* flrWatResultJ, const std::vector<double>* flrWatResultJ,
const std::vector<double>* flrWatResultK, const std::vector<double>* flrWatResultK,
std::vector<double> &totalFlowrateIntoCell); std::vector<double> &totalFlowrateIntoCell);
private: private:
std::vector<std::vector<double>> m_cumWinflowPVAllTimeSteps; std::vector<std::vector<double>> m_cumWinflowPVAllTimeSteps;