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

Moved code from header to source

Browse Source
This commit is contained in:
Magne Sjaastad 2014-09-04 09:28:39 +02:00
parent 323f8d77eb
commit 4fdb06e0e0
2 changed files with 50 additions and 24 deletions
ApplicationCode/ReservoirDataModel
RigNNCData.cppRigNNCData.h

46
ApplicationCode/ReservoirDataModel/RigNNCData.cpp
View File

@ -160,6 +160,52 @@ void RigNNCData::processConnections(const RigMainGrid& mainGrid)
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<double>& RigNNCData::makeConnectionScalarResult(size_t scalarResultIndex)
{
std::vector<double>& results = m_connectionResults[scalarResultIndex];
results.resize(m_connections.size(), HUGE_VAL);
return results;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double>* RigNNCData::connectionScalarResult(size_t scalarResultIndex) const
{
std::map<size_t, std::vector<double> >::const_iterator it = m_connectionResults.find(scalarResultIndex);
if (it != m_connectionResults.end())
return &(it->second);
else
return NULL;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigNNCData::setCombTransmisibilityScalarResultIndex(size_t scalarResultIndex)
{
std::map<size_t, std::vector<double> >::iterator it = m_connectionResults.find(cvf::UNDEFINED_SIZE_T);
CVF_ASSERT(it != m_connectionResults.end());
std::vector<double>& emptyData = m_connectionResults[scalarResultIndex];
std::vector<double>& realData = m_connectionResults[cvf::UNDEFINED_SIZE_T];
emptyData.swap(realData);
m_connectionResults.erase(cvf::UNDEFINED_SIZE_T);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RigNNCData::hasScalarValues(size_t scalarResultIndex)
{
std::map<size_t, std::vector<double> >::iterator it = m_connectionResults.find(scalarResultIndex);
return (it != m_connectionResults.end());
}
/*
//--------------------------------------------------------------------------------------------------
/// TODO: Possibly not needed !

28
ApplicationCode/ReservoirDataModel/RigNNCData.h
View File

@ -65,32 +65,12 @@ public:
std::vector<RigConnection>& connections() { return m_connections; }
const std::vector<RigConnection>& connections() const { return m_connections; };
std::vector<double>& makeConnectionScalarResult(size_t scalarResultIndex)
{
std::vector<double>& results = m_connectionResults[scalarResultIndex];
results.resize(m_connections.size(), HUGE_VAL);
return results;
}
std::vector<double>& makeConnectionScalarResult(size_t scalarResultIndex);
const std::vector<double>* connectionScalarResult(size_t scalarResultIndex) const;
const std::vector<double>* connectionScalarResult(size_t scalarResultIndex) const
{
std::map<size_t, std::vector<double> >::const_iterator it = m_connectionResults.find(scalarResultIndex);
if (it != m_connectionResults.end())
return &(it->second);
else
return NULL;
}
void setCombTransmisibilityScalarResultIndex(size_t scalarResultIndex);
void setCombTransmisibilityScalarResultIndex(size_t scalarResultIndex)
{
std::map<size_t, std::vector<double> >::iterator it = m_connectionResults.find(cvf::UNDEFINED_SIZE_T);
CVF_ASSERT(it != m_connectionResults.end());
std::vector<double>& emptyData = m_connectionResults[scalarResultIndex];
std::vector<double>& realData = m_connectionResults[cvf::UNDEFINED_SIZE_T];
emptyData.swap(realData);
m_connectionResults.erase(cvf::UNDEFINED_SIZE_T);
}
bool hasScalarValues(size_t scalarResultIndex);
private: // This section is possibly not needed
//const std::vector<size_t>& findConnectionIndices(size_t reservoirCellIndex, cvf::StructGridInterface::FaceType face) const;