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

#1645 Load dynamic NNC results from restart file

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-06-26 10:25:08 +02:00
parent 7b7af2b197
commit de414c4277
21 changed files with 423 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/ReservoirDataModel/RigNNCData.h
View File

@@ -57,8 +57,17 @@ public:
class RigNNCData : public cvf::Object
{
public:
enum NNCDataType {
FLUX_WAT,
FLUX_OIL,
FLUX_GAS,
COMB_TRANS,
RI_COMB_TRANS,
RI_COMB_MULT,
RI_COMB_TRANS_BY_AREA,
};
RigNNCData();
void processConnections(const RigMainGrid& mainGrid);
@@ -66,10 +75,13 @@ public:
std::vector<RigConnection>& connections() { return m_connections; }
const std::vector<RigConnection>& connections() const { return m_connections; };
std::vector<double>& makeConnectionScalarResult(size_t scalarResultIndex);
const std::vector<double>* connectionScalarResult(size_t scalarResultIndex) const;
std::vector<double>& makeStaticConnectionScalarResult(NNCDataType nncDataType);
const std::vector<double>* staticConnectionScalarResult(size_t scalarResultIndex) const;
std::vector< std::vector<double> >& makeDynamicConnectionScalarResult(NNCDataType nncDataType, size_t timeStepCount);
const std::vector< std::vector<double> >* dynamicConnectionScalarResult(size_t scalarResultIndex) const;
const std::vector<double>* dynamicConnectionScalarResult(size_t scalarResultIndex, size_t timeStep) const;
void setCombTransmisibilityScalarResultIndex(size_t scalarResultIndex);
void setScalarResultIndex(NNCDataType nncDataType, size_t scalarResultIndex);
bool hasScalarValues(size_t scalarResultIndex);
@@ -78,7 +90,10 @@ private: // This section is possibly not needed
//typedef std::map<size_t, caf::FixedArray<std::vector<size_t>, 7 > > ConnectionSearchMap;
//ConnectionSearchMap m_cellIdxToFaceToConnectionIdxMap;
const NNCDataType* getNNCDataTypeFromScalarResultIndex(size_t scalarResultIndex) const;
private:
std::vector<RigConnection> m_connections;
std::map<size_t, std::vector<double> > m_connectionResults; ///< scalarResultIndex to value array map
std::vector<RigConnection> m_connections;
std::map<NNCDataType, std::vector< std::vector<double> > > m_connectionResults;
std::map<size_t, NNCDataType> m_resultIndexToNNCDataType;
};