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

#2122 Formation/Well Path: Set formations path and key on RimWellPath

Browse Source
This commit is contained in:
Rebecca Cox
2017-11-27 10:33:41 +01:00
parent 5ed072007d
commit 8c57fdf22a
10 changed files with 103 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@@ -330,29 +330,27 @@ RimWellLogFile* RimWellPathCollection::addWellLogs(const QStringList& filePaths)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellPathFormations* RimWellPathCollection::addWellFormations(const QStringList& filePaths)
void RimWellPathCollection::addWellPathFormations(const QStringList& filePaths)
{
RimWellPathFormations* wellFormationFile = nullptr;
/*
foreach(QString filePath, filePaths)
for (QString filePath : filePaths)
{
wellFormationFile = RimWellPathFormations::readWellLogFile(filePath);
if (wellFormationFile)
std::map<QString, cvf::ref<RigWellPathFormations>> newFormations =
m_wellPathFormationsImporter->readWellPathFormationsFromPath(filePath);
for (auto it = newFormations.begin(); it != newFormations.end(); it++)
{
RimWellPath* wellPath = tryFindMatchingWellPath(wellFormationFile->wellName());
RimWellPath* wellPath = tryFindMatchingWellPath(it->first);
if (!wellPath)
{
wellPath = new RimWellPath();
wellPath->setName(it->first);
wellPaths.push_back(wellPath);
}
wellPath->setWellFormationFile(wellFormationFile);
wellPath->setFormationsGeometry(it->second);
}
}
this->sortWellsByName();*/
return wellFormationFile;
this->sortWellsByName();
}
//--------------------------------------------------------------------------------------------------
@@ -503,15 +501,12 @@ void RimWellPathCollection::readWellPathFormationFiles()
for (size_t wpIdx = 0; wpIdx < wellPaths.size(); wpIdx++)
{
if (!wellPaths[wpIdx]->filepath().isEmpty())
QString errorMessage;
if (!wellPaths[wpIdx]->readWellPathFormationsFile(&errorMessage, m_wellPathFormationsImporter))
{
QString errorMessage;
if (!wellPaths[wpIdx]->readWellPathFormationsFile(&errorMessage, m_wellPathFormationsImporter))
{
QMessageBox::warning(RiuMainWindow::instance(),
"File open error",
errorMessage);
}
QMessageBox::warning(RiuMainWindow::instance(),
"File open error",
errorMessage);
}
progress.setProgressDescription(QString("Reading formation file %1").arg(wpIdx));