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

(#1139) - pre-proto - Reading in stimplan XMLfile. Not tested for multiple properties / timesteps. (Also some code clean-up)

Browse Source
This commit is contained in:
astridkbjorke
2017-02-09 10:52:05 +01:00
parent 22ee6250bd
commit 517c53a069
11 changed files with 234 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp
View File

@@ -33,59 +33,3 @@ RigStimPlanFractureDefinition::~RigStimPlanFractureDefinition()
{
}
// --------------------------------------------------------------------------------------------------
// /
// --------------------------------------------------------------------------------------------------
// QString RigStimPlanFractureDefinition::formationNameFromKLayerIdx(size_t Kidx)
// {
// int idx = formationIndexFromKLayerIdx(Kidx);
// if(idx >= static_cast<int>(m_formationNames.size())) return "";
// if(idx == -1) return "";
//
// return m_formationNames[idx];
// }
//
// --------------------------------------------------------------------------------------------------
// /
// --------------------------------------------------------------------------------------------------
// void RigStimPlanFractureDefinition::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 )
// {
// m_nameIndexPrKLayer[kIdx] = nameIdx;
// }
// }
//
//
// --------------------------------------------------------------------------------------------------
// /
// --------------------------------------------------------------------------------------------------
// void RigStimPlanFractureDefinition::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;
// }
// }

32
ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.h
View File

@@ -30,23 +30,21 @@ public:
RigStimPlanFractureDefinition();
~RigStimPlanFractureDefinition();
// int formationIndexFromKLayerIdx(size_t Kidx)
// {
// if(Kidx >= m_nameIndexPrKLayer.size()) return -1;
// return m_nameIndexPrKLayer[Kidx];
// }
//
// QString formationNameFromKLayerIdx(size_t Kidx);
//
// const std::vector<QString>& formationNames() const { return m_formationNames;}
//
// void appendFormationRange(const QString& name, int kStartIdx, int kEndIdx);
// void appendFormationRangeHeight(const QString& name, int kLayerCount);
//
// private:
//
// std::vector<int> m_nameIndexPrKLayer;
// std::vector<QString> m_formationNames;
std::vector<double> gridXs;
std::vector<double> gridYs;
//TODO: Consider removing gridYs or depths,
//In example file these are the same, but can there be examples where not all gridY values are included in depths?
std::vector<double> timeSteps;
std::vector<double> depths;
std::vector<std::vector<std::vector<double>>> conductivities;
std::vector<std::vector<std::vector<double>>> widths;
std::vector<std::vector<std::vector<double>>> permeabilities;
//Vector for each time step, for each depth and for each x-value
private:
};