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

#930, #925, #914

Browse Source 
* Formation names format changed to allow no space around k-layer numbers. Also added possibility to use one number as k-layer count for the name. Based on  previous names last layer
* Deleted geomech cache of formation name result when updating the formation names
* Added TNH TNQV THQV to plane transformed stresses.
This commit is contained in:
Jacob Støren
2016-10-21 14:30:45 +02:00
parent bc82a0e45c
commit 593fe93244
10 changed files with 140 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ApplicationCode/ReservoirDataModel/RigFormationNames.cpp
View File

@@ -52,13 +52,40 @@ QString RigFormationNames::formationNameFromKLayerIdx(size_t Kidx)
void RigFormationNames::appendFormationRange(const QString& name, int kStartIdx, int kEndIdx)
{
CVF_ASSERT(kStartIdx <= kEndIdx);
int nameIdx = static_cast<int>(m_formationNames.size());
m_formationNames.push_back(name);
if(kEndIdx >= static_cast<int>(m_nameIndexPrKLayer.size())) m_nameIndexPrKLayer.resize(kEndIdx + 1, -1);
for(int kIdx = kStartIdx; kIdx <= kEndIdx; ++kIdx)
if ( kEndIdx >= static_cast<int>(m_nameIndexPrKLayer.size()) )
{
m_nameIndexPrKLayer.resize(kEndIdx + 1, -1);
}
for ( int kIdx = kStartIdx; kIdx <= kEndIdx; ++kIdx )
{
m_nameIndexPrKLayer[kIdx] = nameIdx;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigFormationNames::appendFormationRangeHeight(const QString& name, int kLayerCount)
{
if (kLayerCount < 1) return;
int nameIdx = static_cast<int>(m_formationNames.size());
m_formationNames.push_back(name);
int kStartIdx = static_cast<int>(m_nameIndexPrKLayer.size());
m_nameIndexPrKLayer.resize(kStartIdx + kLayerCount, -1);
for ( int kIdx = kStartIdx; kIdx < kStartIdx + kLayerCount; ++kIdx )
{
m_nameIndexPrKLayer[kIdx] = nameIdx;
}
}