diff --git a/Mesh/BackgroundMesh.cpp b/Mesh/BackgroundMesh.cpp index f9df1bbcd31e6f62f5c304fc2e3d5eb7e7ba3792..fe44f3d1d6114e95e5a824498d5b58f192ede539 100644 --- a/Mesh/BackgroundMesh.cpp +++ b/Mesh/BackgroundMesh.cpp @@ -247,12 +247,14 @@ bool Extend2dMeshIn3dVolumes() // ---------- backgroundMesh class ----------- -void backgroundMesh::set (GFace *gf){ +void backgroundMesh::set(GFace *gf) +{ if (_current) delete _current; _current = new backgroundMesh(gf); } -void backgroundMesh::unset (){ +void backgroundMesh::unset() +{ if (_current) delete _current; _current = 0; } @@ -395,10 +397,8 @@ void backgroundMesh::updateSizes(GFace *_gf) itv->second = std::max(itv->second, CTX::instance()->mesh.lcMin); itv->second = std::min(itv->second, CTX::instance()->mesh.lcMax); } - // return; - // --------------------- + // return; // now do some diffusion - // --------------------- std::list<GEdge*> e = _gf->edges(); std::list<GEdge*>::const_iterator it = e.begin(); diff --git a/Mesh/BackgroundMesh.h b/Mesh/BackgroundMesh.h index 1cb0b2aaedb021da26df51d36c44bdb97f06cb9f..1cac248c5a4cf236139c9b1f042494cfe9a96caf 100644 --- a/Mesh/BackgroundMesh.h +++ b/Mesh/BackgroundMesh.h @@ -16,9 +16,7 @@ class MElement; class MVertex; class GEntity; -// this background mesh makes use - -class backgroundMesh : public simpleFunction<double> +class backgroundMesh : public simpleFunction<double> { Octree *_octree; std::vector<MVertex*> _vertices; @@ -29,22 +27,19 @@ class backgroundMesh : public simpleFunction<double> static backgroundMesh * _current; backgroundMesh(GFace *); ~backgroundMesh(); -public: - static void set (GFace *); - static void unset (); - static backgroundMesh * current () {return _current;} + public: + static void set(GFace *); + static void unset(); + static backgroundMesh *current () { return _current; } void propagate1dMesh(GFace *); void updateSizes(GFace *); double operator () (double u, double v, double w) const; void print (const std::string &filename, GFace *gf) const; }; - double BGM_MeshSize(GEntity *ge, double U, double V, double X, double Y, double Z); SMetric3 BGM_MeshMetric(GEntity *ge, double U, double V, double X, double Y, double Z); bool Extend1dMeshIn2dSurfaces(); bool Extend2dMeshIn3dVolumes(); - - #endif