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

ResInsight: Move cafUiTreeItem.h

Browse Source 
p4#: 22497
This commit is contained in:
Jacob Støren
2013-09-20 09:28:36 +02:00
parent a6ddfa6aaa
commit 0c19d50582
5 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/ReservoirDataModel/RigSingleWellResultsData.cpp
View File

@@ -125,16 +125,17 @@ void RigSingleWellResultsData::computeStaticWellCellPath()
{
if (m_wellCellsTimeSteps.size() == 0) return;
// Mapping of Branch ERT ID to ResultPoint list
std::map < int, std::list< RigWellResultPoint > > staticWellBranches;
// Add ResultCell data from the first timestep to the final result.
for (size_t bIdx = 0; bIdx < m_wellCellsTimeSteps[0].m_wellResultBranches.size(); ++bIdx)
{
int branchNumber = m_wellCellsTimeSteps[0].m_wellResultBranches[bIdx].m_ertBranchId;
int branchErtId = m_wellCellsTimeSteps[0].m_wellResultBranches[bIdx].m_ertBranchId;
std::vector<RigWellResultPoint>& frameCells = m_wellCellsTimeSteps[0].m_wellResultBranches[bIdx].m_branchResultPoints;
std::list< RigWellResultPoint >& branch = staticWellBranches[branchNumber];
std::list< RigWellResultPoint >& branch = staticWellBranches[branchErtId];
for(size_t cIdx = 0; cIdx < frameCells.size(); ++cIdx)
{
@@ -247,24 +248,14 @@ void RigSingleWellResultsData::computeStaticWellCellPath()
for (bIt = staticWellBranches.begin(); bIt != staticWellBranches.end(); ++bIt)
{
if (bIt->first >= static_cast<int>(m_wellCellsTimeSteps[0].m_wellResultBranches.size()))
{
continue;
}
// Copy from first time step
RigWellResultBranch rigBranch = m_wellCellsTimeSteps[0].m_wellResultBranches[bIt->first];
RigWellResultBranch rigBranch;
rigBranch.m_ertBranchId = bIt->first;
// Clear well cells, and insert the collection of well cells for the static situation
rigBranch.m_branchResultPoints.clear();
std::list< RigWellResultPoint >& branch = bIt->second;
std::list< RigWellResultPoint >::iterator cIt;
for (cIt = branch.begin(); cIt != branch.end(); ++cIt)
{
RigWellResultPoint rwc = *cIt;
rwc.m_isOpen = false; // Reset the dynamic property
rigBranch.m_branchResultPoints.push_back(*cIt);
}

1
cafProjectDataModel/CMakeLists.txt
View File

@@ -7,6 +7,7 @@ add_library( ${PROJECT_NAME}
cafFactory.h
cafFixedArray.h
cafOmpMutex.h
cafUiTreeItem.h
cafPdmDocument.cpp
cafPdmDocument.h
cafPdmField.cpp

2
cafProjectDataModel/cafPdmUiTreeOrdering.h
View File

@@ -22,7 +22,7 @@
#include <QString>
#include "cafPdmUiItem.h"
#include "../cafUserInterface/cafUiTreeItem.h"
#include "cafUiTreeItem.h"
#include "cafPdmPointer.h"
namespace caf

0
cafUserInterface/cafUiTreeItem.h → cafProjectDataModel/cafUiTreeItem.h
View File

1
cafUserInterface/CMakeLists.txt
View File

@@ -72,7 +72,6 @@ add_library( ${PROJECT_NAME}
cafProgressInfo.h
cafUiProcess.cpp
cafUiProcess.h
cafUiTreeItem.h
cafUiTreeModelPdm.cpp
cafUiTreeModelPdm.h