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

Add debug output of AABB tree

Browse Source
This commit is contained in:
Magne Sjaastad
2022-12-16 14:51:56 +01:00
parent 529c9af9a4
commit befab37588
5 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -651,7 +651,11 @@ void RimEclipseCase::computeCachedData()
{
auto task = pInf.task( "Calculating Cell Search Tree", 10 );
rigEclipseCase->mainGrid()->computeCachedData();
std::string aabbTreeInfo;
rigEclipseCase->mainGrid()->computeCachedData( &aabbTreeInfo );
RiaLogging::info( QString::fromStdString( aabbTreeInfo ) );
}
{

3
ApplicationLibCode/ReservoirDataModel/RigMainGrid.cpp
View File

@@ -264,13 +264,14 @@ void RigMainGrid::setDisplayModelOffset( cvf::Vec3d offset )
/// Compute cell ranges for active and valid cells
/// Compute bounding box in world coordinates based on node coordinates
//--------------------------------------------------------------------------------------------------
void RigMainGrid::computeCachedData()
void RigMainGrid::computeCachedData( std::string* aabbTreeInfo )
{
initAllSubGridsParentGridPointer();
initAllSubCellsMainGridCellIndex();
m_cellSearchTree = nullptr;
buildCellSearchTree();
if ( aabbTreeInfo ) *aabbTreeInfo = m_cellSearchTree->info();
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ReservoirDataModel/RigMainGrid.h
View File

@@ -88,7 +88,7 @@ public:
cvf::StructGridInterface::FaceType face ) const;
bool isFaceNormalsOutwards() const;
void computeCachedData();
void computeCachedData( std::string* aabbTreeInfo = nullptr );
void initAllSubGridsParentGridPointer();
cvf::Vec3d displayModelOffset() const override;

38
Fwk/VizFwk/LibGeometry/cvfBoundingBoxTree.cpp
View File

@@ -168,7 +168,7 @@ namespace cvf {
size_t leavesCount() const;
bool boundingBox(cvf::BoundingBox* pBox) const;
cvf::String treeInfo() const;
std::string treeInfo() const;
protected:
virtual cvf::BoundingBox createLeaves() = 0;
@@ -711,32 +711,34 @@ size_t AABBTree::treeHeight(const AABBTreeNode* pNode, size_t iLevel, size_t* pi
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::String AABBTree::treeInfo() const
std::string AABBTree::treeInfo() const
{
cvf::String sInfo;
/*
sInfo = cvf::String("Tree size: %1 \n").arg(static_cast<int>(treeSize()));
sInfo += cvf::String("Num leaves: %1 \n").arg(static_cast<int>(leavesCount()));
size_t treeSizeInMB = treeSize() / (1024u *1024u);
auto text = "Tree size : " + std::to_string(treeSizeInMB) + "[MB] \n";
text += "Num leaves: " + std::to_string(leavesCount()) + "\n";
size_t iMin = cvf::UNDEFINED_UINT;
size_t iMax = 0;
size_t iSumHeight = treeHeight(m_pRoot, 1, &iMin, &iMax);
size_t iAvgHeigth = 0;
size_t iIdealHeigth = 0;
if (leavesCount() > 0 ) iAvgHeigth = iSumHeight/leavesCount();
auto iIdealHeigth = (cvf::uint)ceil((log((float)leavesCount())/log(2.0f)));
sInfo += VTString::MakeForm("Tree height: Min: %d - Max: %d - Avg: %d - Ideal: %d\n", iMin, iMax, iAvgHeigth, (VTint)ceil((log((VTfloat)GetNumLeaves())/log(2.0f))));
iIdealHeigth = (cvf::uint)ceil((log((float)leavesCount())/log(2.0f)));
sInfo = cvf::String("Tree height: Min: %1 - Max: %2 - Avg: %3 - Ideal: %4\n").arg(iMin).arg(iMax).arg(iAvgHeigth).arg(iIdealHeigth);
text += "Tree height: \n";
text += " Min : " + std::to_string(iMin) + "\n";
text += " Max : " + std::to_string(iMax) + "\n";
text += " Avg : " + std::to_string(iAvgHeigth) + "\n";
text += " Ideal : " + std::to_string(iIdealHeigth) + "\n";
cvf::BoundingBox bb;
boundingBox(&bb);
sInfo += bb.debugString();
*/
text += bb.debugString().toStdString();
return sInfo;
return text;
}
//--------------------------------------------------------------------------------------------------
@@ -935,5 +937,13 @@ void BoundingBoxTree::findIntersections(const cvf::BoundingBox& bb, std::vector<
m_implTree->findIntersections(bb, *bbIdsOrIndices);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string BoundingBoxTree::info() const
{
return m_implTree->treeInfo();
}
} // namespace cvf

2
Fwk/VizFwk/LibGeometry/cvfBoundingBoxTree.h
View File

@@ -60,6 +60,8 @@ public:
void findIntersections(const cvf::BoundingBox& inputBB, std::vector<size_t>* bbIdsOrIndexesIntersected) const;
std::string info() const;
private:
BoundingBoxTreeImpl* m_implTree;