OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-10 08:03:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1139 - pre-proto - Starting reading in units from XML file

Browse Source
This commit is contained in:
astridkbjorke 2017-02-17 10:10:06 +01:00
parent ab7b86111e
commit 1fbc11acc9
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.cpp
View File

@ -194,6 +194,7 @@ void RimStimPlanFractureTemplate::readStimPlanXMLFile(QString * errorMessage)
QXmlStreamReader xmlStream2;
xmlStream2.setDevice(&dataFile);
QString parameter;
QString unit;
while (!xmlStream2.atEnd())
{
@ -203,7 +204,10 @@ void RimStimPlanFractureTemplate::readStimPlanXMLFile(QString * errorMessage)
{
if (xmlStream2.name() == "property")
{
unit = getAttributeValueString(xmlStream2, "uom");
parameter = getAttributeValueString(xmlStream2, "name");
//Width - convert to cm from mm?
}
else if (xmlStream2.name() == "time")
{
@ -218,20 +222,28 @@ void RimStimPlanFractureTemplate::readStimPlanXMLFile(QString * errorMessage)
}
//TODO: Check that number of values in these vectors match number of cells in grid!
size_t timeStepIndex = m_stimPlanFractureDefinitionData->getTimeStepIndex(timeStepValue);
if (parameter == "CONDUCTIVITY")
{
m_stimPlanFractureDefinitionData->conductivities[timeStepIndex]=propertyValuesAtTimestep;
if (unit == "md-m" || unit == "md-ft")
{
m_stimPlanFractureDefinitionData->conductivityUnit = unit;
}
else
{
qDebug() << "Unsupported units in StimPlan file. Reading of file not completed";
}
}
else if (parameter == "PERMEABILITY")
{
m_stimPlanFractureDefinitionData->permeabilities[timeStepIndex] = propertyValuesAtTimestep;
m_stimPlanFractureDefinitionData->permeabilityUnit = unit;
}
else if (parameter == "WIDTH")
{
m_stimPlanFractureDefinitionData->widths[timeStepIndex] = propertyValuesAtTimestep;
m_stimPlanFractureDefinitionData->widthUnit = unit;
}
}
@ -250,6 +262,14 @@ void RimStimPlanFractureTemplate::readStimPlanXMLFile(QString * errorMessage)
qDebug() << "Error: Cannot read file " << dataFile.fileName();
qDebug() << dataFile.errorString();
}
//Setting unit for fracture template
if (m_stimPlanFractureDefinitionData->conductivityUnit.isEmpty())
{
if (m_stimPlanFractureDefinitionData->conductivityUnit == "md-m") fractureTemplateUnit = RimDefines::UNITS_METRIC;
if (m_stimPlanFractureDefinitionData->conductivityUnit == "md-ft") fractureTemplateUnit = RimDefines::UNITS_FIELD;
}
}

9
ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.h
View File

@ -38,10 +38,13 @@ public:
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
std::vector<std::vector<std::vector<double>>> conductivities;
QString conductivityUnit;
std::vector<std::vector<std::vector<double>>> widths;
QString widthUnit;
std::vector<std::vector<std::vector<double>>> permeabilities;
QString permeabilityUnit;
bool timeStepExisist(double timeStepValue);
void reorderYgridToDepths();