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

#1787 Removing hardcoding of tracername to dummy value. Changing to have vector of QString for tracernames for calculator.

Browse Source
This commit is contained in:
astridkbjorke 2017-08-30 10:50:55 +02:00
parent 97796329e9
commit d9589c836a
3 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/Commands/FlowCommands/RicCalculateNumberOfFloodedPoreVolumes.cpp
View File

@ -18,25 +18,18 @@
#include "RicCalculateNumberOfFloodedPoreVolumes.h"
#include "RiaApplication.h"
#include "RigEclipseCaseData.h"
#include "RigMainGrid.h"
#include "RigNumberOfFloodedPoreVolumesCalculator.h"
#include "RimEclipseCase.h"
#include "RimEclipseResultCase.h"
#include "RimEclipseWell.h"
#include "RimFlowPlotCollection.h"
#include "RimMainPlotCollection.h"
#include "RimProject.h"
#include "RimView.h"
#include "RimWellAllocationPlot.h"
#include "RiuMainPlotWindow.h"
#include "cafSelectionManager.h"
#include <QAction>
#include "RigMainGrid.h"
#include "RigEclipseCaseData.h"
#include "RigNumberOfFloodedPoreVolumesCalculator.h"
#include <QString>
CAF_CMD_SOURCE_INIT(RicCalculateNumberOfFloodedPoreVolumes, "RicCalculateNumberOfFloodedPoreVolumes");
@ -58,7 +51,7 @@ void RicCalculateNumberOfFloodedPoreVolumes::onActionTriggered(bool isChecked)
view->firstAncestorOrThisOfType(caseToApply);
RigMainGrid* mainGrid = caseToApply->eclipseCaseData()->mainGrid();
std::vector<std::string> tracerNames;
std::vector<QString> tracerNames;
tracerNames.push_back("SOIL");
RigNumberOfFloodedPoreVolumesCalculator calc(mainGrid, caseToApply, tracerNames);

20
ApplicationCode/ReservoirDataModel/RigNumberOfFloodedPoreVolumesCalculator.cpp
View File

@ -20,6 +20,7 @@
#include "RiaPorosityModel.h"
#include "RigActiveCellInfo.h"
#include "RigCaseCellResultsData.h"
#include "RigEclipseCaseData.h"
#include "RigMainGrid.h"
@ -28,9 +29,8 @@
#include "RimEclipseCase.h"
#include "RimReservoirCellResultsStorage.h"
#include <string>
#include <vector>
#include "RigActiveCellInfo.h"
#include <QString>
//--------------------------------------------------------------------------------------------------
@ -38,30 +38,28 @@
//--------------------------------------------------------------------------------------------------
RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator(RigMainGrid* mainGrid,
RimEclipseCase* caseToApply,
std::vector<std::string> tracerNames)
const std::vector<QString> tracerNames)
{
RigEclipseCaseData* eclipseCaseData = caseToApply->eclipseCaseData();
RiaDefines::PorosityModelType porosityModel = RiaDefines::MATRIX_MODEL;
RimReservoirCellResultsStorage* gridCellResults = caseToApply->results(porosityModel);
RimReservoirCellResultsStorage* gridCellResults = caseToApply->results(RiaDefines::MATRIX_MODEL);
size_t scalarResultIndexPorv = gridCellResults->findOrLoadScalarResult(RiaDefines::STATIC_NATIVE, "PORV");
const std::vector<double>* porvResults = &(eclipseCaseData->results(RiaDefines::MATRIX_MODEL)->cellScalarResults(scalarResultIndexPorv, 0));
std::vector<size_t> scalarResultIndexTracers;
for (std::string tracerName : tracerNames)
for (QString tracerName : tracerNames)
{
scalarResultIndexTracers.push_back(gridCellResults->findOrLoadScalarResult(RiaDefines::STATIC_NATIVE, "FLRWATI+"));
scalarResultIndexTracers.push_back(gridCellResults->findOrLoadScalarResult(RiaDefines::DYNAMIC_NATIVE, tracerName));
}
std::vector<std::vector<double> > summedTracersAtAllTimesteps;
//TODO: Option for Oil and Gas instead of water
size_t scalarResultIndexFlowrateI = gridCellResults->findOrLoadScalarResult(RiaDefines::STATIC_NATIVE, "FLRWATI+");
size_t scalarResultIndexFlowrateJ = gridCellResults->findOrLoadScalarResult(RiaDefines::STATIC_NATIVE, "FLRWATJ+");
size_t scalarResultIndexFlowrateK = gridCellResults->findOrLoadScalarResult(RiaDefines::STATIC_NATIVE, "FLRWATK+");
size_t scalarResultIndexFlowrateI = gridCellResults->findOrLoadScalarResult(RiaDefines::DYNAMIC_NATIVE, "FLRWATI+");
size_t scalarResultIndexFlowrateJ = gridCellResults->findOrLoadScalarResult(RiaDefines::DYNAMIC_NATIVE, "FLRWATJ+");
size_t scalarResultIndexFlowrateK = gridCellResults->findOrLoadScalarResult(RiaDefines::DYNAMIC_NATIVE, "FLRWATK+");
std::vector<const std::vector<double>* > flowrateIatAllTimeSteps;
std::vector<const std::vector<double>* > flowrateJatAllTimeSteps;

4
ApplicationCode/ReservoirDataModel/RigNumberOfFloodedPoreVolumesCalculator.h
View File

@ -20,7 +20,7 @@
#include <cstddef>
#include <vector>
#include <string>
#include <QString>
class RimEclipseCase;
class RigMainGrid;
@ -36,7 +36,7 @@ class RigNumberOfFloodedPoreVolumesCalculator
public:
explicit RigNumberOfFloodedPoreVolumesCalculator(RigMainGrid* mainGrid,
RimEclipseCase* caseToApply,
std::vector<std::string> tracerNames
const std::vector<QString> tracerNames
);
std::vector<std::vector<double>> numberOfFloodedPorevolumes();