From 63f6dd3e40b9439fe3eadd11b969417bdcfaac92 Mon Sep 17 00:00:00 2001
From: Matti Pellika <matti.pellikka@tut.fi>
Date: Fri, 8 Jun 2012 10:11:06 +0000
Subject: [PATCH] Strict switch for getMeshElementsByCoord -function. Added an
indication of the origin in the figure of MLine.
---
Geo/GModel.cpp | 4 ++--
Geo/GModel.h | 2 +-
Geo/GModelIO_Mesh.cpp | 4 ++--
Geo/MElementOctree.cpp | 52 +++++++++++++++++++++++++++++++++++++++++-
Geo/MElementOctree.h | 2 +-
Geo/MLine.h | 2 +-
6 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 31033616d6..2f8e145200 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -743,13 +743,13 @@ MElement *GModel::getMeshElementByCoord(SPoint3 &p, int dim, bool strict)
return _octree->find(p.x(), p.y(), p.z(), dim, strict);
}
-std::vector<MElement*> GModel::getMeshElementsByCoord(SPoint3 &p, int dim)
+std::vector<MElement*> GModel::getMeshElementsByCoord(SPoint3 &p, int dim, bool strict)
{
if(!_octree){
Msg::Debug("Rebuilding mesh element octree");
_octree = new MElementOctree(this);
}
- return _octree->findAll(p.x(), p.y(), p.z(), dim);
+ return _octree->findAll(p.x(), p.y(), p.z(), dim, strict);
}
MVertex *GModel::getMeshVertexByTag(int n)
diff --git a/Geo/GModel.h b/Geo/GModel.h
index cc7b3c3374..8aa87fd874 100644
--- a/Geo/GModel.h
+++ b/Geo/GModel.h
@@ -313,7 +313,7 @@ class GModel
// access a mesh element by coordinates (using an octree search)
MElement *getMeshElementByCoord(SPoint3 &p, int dim=-1, bool strict=true);
- std::vector<MElement*> getMeshElementsByCoord(SPoint3 &p, int dim=-1);
+ std::vector<MElement*> getMeshElementsByCoord(SPoint3 &p, int dim=-1, bool strict=true);
// access a mesh element by tag, using the element cache
MElement *getMeshElementByTag(int n);
diff --git a/Geo/GModelIO_Mesh.cpp b/Geo/GModelIO_Mesh.cpp
index 96085d86d9..0127d3ea35 100644
--- a/Geo/GModelIO_Mesh.cpp
+++ b/Geo/GModelIO_Mesh.cpp
@@ -615,7 +615,7 @@ int GModel::readMSH(const std::string &name)
MElement *e = createElementMSH(this, num, type, physical, elementary,
partition, vertices, elements, physicals,
own, p);
-
+
#if (FAST_ELEMENTS==1)
elems[num] = e;
elemreg[num] = elementary;
@@ -631,7 +631,7 @@ int GModel::readMSH(const std::string &name)
delete [] data;
numElementsPartial += numElms;
}
- }
+ }
#if (FAST_ELEMENTS==1)
for(int i = 0; i < 10; i++)
elements[i].clear();
diff --git a/Geo/MElementOctree.cpp b/Geo/MElementOctree.cpp
index 7a614916c9..ff352299a0 100644
--- a/Geo/MElementOctree.cpp
+++ b/Geo/MElementOctree.cpp
@@ -123,8 +123,11 @@ MElementOctree::~MElementOctree()
}
-std::vector<MElement *> MElementOctree::findAll(double x, double y, double z, int dim)
+std::vector<MElement *> MElementOctree::findAll(double x, double y, double z, int dim, bool strict)
{
+ double maxTol = 1.;
+ double tolIncr = 10.;
+
double P[3] = {x, y, z};
std::vector<void*> v;
std::vector<MElement*> e;
@@ -134,6 +137,53 @@ std::vector<MElement *> MElementOctree::findAll(double x, double y, double z, in
MElement *el = (MElement*) *it;
if (dim == -1 || el->getDim() == dim)e.push_back(el);
}
+ if (e.empty() && !strict && _gm) {
+ double initialTol = MElement::getTolerance();
+ double tol = initialTol;
+ while (tol < maxTol){
+ tol *= tolIncr;
+ MElement::setTolerance(tol);
+ std::vector<GEntity*> entities;
+ _gm->getEntities(entities);
+ for(unsigned int i = 0; i < entities.size(); i++){
+ for(unsigned int j = 0; j < entities[i]->getNumMeshElements(); j++){
+ MElement* el = entities[i]->getMeshElement(j);
+ if (dim == -1 || el->getDim() == dim){
+ if (MElementInEle(el, P)){
+ e.push_back(el);
+ }
+ }
+ }
+ }
+ if(!e.empty()) {
+ MElement::setTolerance(initialTol);
+ return e;
+ }
+ }
+ MElement::setTolerance(initialTol);
+ }
+ else if (e.empty() && !strict && !_gm){
+ double initialTol = MElement::getTolerance();
+ double tol = initialTol;
+ while (tol < maxTol){
+ tol *= tolIncr;
+ MElement::setTolerance(tol);
+ for(unsigned int i = 0; i < _elems.size(); i++){
+ MElement* el = _elems[i];
+ if (dim == -1 || el->getDim() == dim){
+ if (MElementInEle(el, P)){
+ e.push_back(el);
+ }
+ }
+ }
+ if(!e.empty()) {
+ MElement::setTolerance(initialTol);
+ return e;
+ }
+ }
+ MElement::setTolerance(initialTol);
+ //Msg::Warning("Point %g %g %g not found",x,y,z);
+ }
return e;
}
diff --git a/Geo/MElementOctree.h b/Geo/MElementOctree.h
index 86d226fa98..f93ce0299a 100644
--- a/Geo/MElementOctree.h
+++ b/Geo/MElementOctree.h
@@ -23,7 +23,7 @@ class MElementOctree{
~MElementOctree();
MElement *find(double x, double y, double z, int dim = -1, bool strict = false);
Octree *getInternalOctree(){ return _octree; }
- std::vector<MElement *> findAll(double x, double y, double z, int dim);
+ std::vector<MElement *> findAll(double x, double y, double z, int dim, bool strict = false);
};
#endif
diff --git a/Geo/MLine.h b/Geo/MLine.h
index 8e60f50a6a..f5231ff9f9 100644
--- a/Geo/MLine.h
+++ b/Geo/MLine.h
@@ -11,7 +11,7 @@
/*
* MLine
*
- * 0----------1 --> u
+ * 0-----+-----1 --> u
*
*/
class MLine : public MElement {
--
GitLab