From 3dcb8f1e04a352d7001ef4eb447939d695fcab62 Mon Sep 17 00:00:00 2001 From: eap Date: Tue, 25 Apr 2017 13:41:21 +0300 Subject: [PATCH] IPAL054122: Bad quality prismatic mesh Fix applying the boundary error in StdMeshers_Sweeper by using StdMeshers_Delaunay --- doc/salome/gui/SMESH/images/prism_mesh.png | Bin 0 -> 16450 bytes doc/salome/gui/SMESH/input/prism_3d_algo.doc | 2 + src/SMESH/SMESH_Pattern.cxx | 28 +- src/SMESHUtils/SMESH_Delaunay.cxx | 80 ++++- src/SMESHUtils/SMESH_Delaunay.hxx | 3 + src/SMESH_SWIG/CMakeLists.txt | 2 - src/SMESH_SWIG/batchmode_mefisto.py | 127 -------- src/SMESH_SWIG/batchmode_smesh.py | 324 ------------------- src/StdMeshers/StdMeshers_FaceSide.cxx | 8 + src/StdMeshers/StdMeshers_Prism_3D.cxx | 207 ++++++------ src/StdMeshers/StdMeshers_Prism_3D.hxx | 59 ++-- 11 files changed, 253 insertions(+), 587 deletions(-) create mode 100644 doc/salome/gui/SMESH/images/prism_mesh.png delete mode 100644 src/SMESH_SWIG/batchmode_mefisto.py delete mode 100644 src/SMESH_SWIG/batchmode_smesh.py diff --git a/doc/salome/gui/SMESH/images/prism_mesh.png b/doc/salome/gui/SMESH/images/prism_mesh.png new file mode 100644 index 0000000000000000000000000000000000000000..95a31214cbdde6aed8dd6dd13527a38a6e1eac28 GIT binary patch literal 16450 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 SMDSAbs_Face ) == 0 ) + continue; + myPoints.resize( ++nbNodes ); + list< TPoint* > & fPoints = getShapePoints( face ); + nodePointIDMap.insert( make_pair( node, iPoint )); + TPoint* p = &myPoints[ iPoint++ ]; + fPoints.push_back( p ); + gp_XY uv = helper.GetNodeUV( face, node ); + p->myInitUV.SetCoord( uv.X(), uv.Y() ); + p->myInitXYZ.SetCoord( p->myInitUV.X(), p->myInitUV.Y(), 0 ); + } + // Load U of points on edges + Bnd_Box2d edgesUVBox; + list::iterator nbEinW = myNbKeyPntInBoundary.begin(); int iE = 0; vector< TopoDS_Edge > eVec; @@ -762,6 +781,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh* theMesh, else keyPoint->myInitUV = C2d->Value( isForward ? f : l ).XY(); keyPoint->myInitXYZ.SetCoord (keyPoint->myInitUV.X(), keyPoint->myInitUV.Y(), 0); + edgesUVBox.Add( gp_Pnt2d( keyPoint->myInitUV )); } } if ( !vPoint->empty() ) @@ -841,6 +861,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh* theMesh, p->myInitUV = C2d->Value( u ).XY(); } p->myInitXYZ.SetCoord( p->myInitUV.X(), p->myInitUV.Y(), 0 ); + edgesUVBox.Add( gp_Pnt2d( p->myInitUV )); unIt++; unRIt++; iPoint++; } @@ -866,6 +887,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh* theMesh, else keyPoint->myInitUV = C2d->Value( isForward ? l : f ).XY(); keyPoint->myInitXYZ.SetCoord( keyPoint->myInitUV.X(), keyPoint->myInitUV.Y(), 0 ); + edgesUVBox.Add( gp_Pnt2d( keyPoint->myInitUV )); } } if ( !vPoint->empty() ) @@ -906,7 +928,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh* theMesh, nodePointIDMap.insert( make_pair( node, iPoint )); TPoint* p = &myPoints[ iPoint++ ]; fPoints.push_back( p ); - if ( theProject ) + if ( theProject || edgesUVBox.IsOut( p->myInitUV ) ) p->myInitUV = project( node, projector ); else { const SMDS_FacePosition* pos = diff --git a/src/SMESHUtils/SMESH_Delaunay.cxx b/src/SMESHUtils/SMESH_Delaunay.cxx index d5bc2f663..85f03a65e 100644 --- a/src/SMESHUtils/SMESH_Delaunay.cxx +++ b/src/SMESHUtils/SMESH_Delaunay.cxx @@ -24,6 +24,9 @@ // Author : Edward AGAPOV (eap) #include "SMESH_Delaunay.hxx" + +#include "SMESH_Comment.hxx" +#include "SMESH_File.hxx" #include "SMESH_MeshAlgos.hxx" #include @@ -233,7 +236,8 @@ const BRepMesh_Triangle* SMESH_Delaunay::FindTriangle( const gp_XY& if ( 0. <= uSeg && uSeg <= 1. ) { tria = & _triaDS->GetElement( triIDs.Index( 1 + ( triIDs.Index(1) == triaID ))); - break; + if ( tria->Movability() != BRepMesh_Deleted ) + break; } } } @@ -250,10 +254,38 @@ const BRepMesh_Triangle* SMESH_Delaunay::FindTriangle( const gp_XY& const BRepMesh_Triangle* SMESH_Delaunay::GetTriangleNear( int iBndNode ) { + int nodeIDs[3]; + int nbNbNodes = _bndNodes.size(); const BRepMesh::ListOfInteger & linkIds = _triaDS->LinksConnectedTo( iBndNode + 1 ); - const BRepMesh_PairOfIndex & triaIds = _triaDS->ElementsConnectedTo( linkIds.First() ); - const BRepMesh_Triangle& tria = _triaDS->GetElement( triaIds.Index(1) ); - return &tria; + BRepMesh::ListOfInteger::const_iterator iLink = linkIds.cbegin(); + for ( ; iLink != linkIds.cend(); ++iLink ) + { + const BRepMesh_PairOfIndex & triaIds = _triaDS->ElementsConnectedTo( *iLink ); + { + const BRepMesh_Triangle& tria = _triaDS->GetElement( triaIds.Index(1) ); + if ( tria.Movability() != BRepMesh_Deleted ) + { + _triaDS->ElementNodes( tria, nodeIDs ); + if ( nodeIDs[0]-1 < nbNbNodes && + nodeIDs[1]-1 < nbNbNodes && + nodeIDs[2]-1 < nbNbNodes ) + return &tria; + } + } + if ( triaIds.Extent() > 1 ) + { + const BRepMesh_Triangle& tria = _triaDS->GetElement( triaIds.Index(2) ); + if ( tria.Movability() != BRepMesh_Deleted ) + { + _triaDS->ElementNodes( tria, nodeIDs ); + if ( nodeIDs[0]-1 < nbNbNodes && + nodeIDs[1]-1 < nbNbNodes && + nodeIDs[2]-1 < nbNbNodes ) + return &tria; + } + } + } + return 0; } //================================================================================ @@ -294,3 +326,43 @@ void SMESH_Delaunay::addCloseNodes( const SMDS_MeshNode* node, } } } + +//================================================================================ +/*! + * \brief Write a python script that creates an equal mesh in Mesh module + */ +//================================================================================ + +void SMESH_Delaunay::ToPython() const +{ + SMESH_Comment text; + text << "import salome, SMESH\n"; + text << "salome.salome_init()\n"; + text << "from salome.smesh import smeshBuilder\n"; + text << "smesh = smeshBuilder.New(salome.myStudy)\n"; + text << "mesh=smesh.Mesh()\n"; + const char* endl = "\n"; + + for ( int i = 0; i < _triaDS->NbNodes(); ++i ) + { + const BRepMesh_Vertex& v = _triaDS->GetNode( i+1 ); + text << "mesh.AddNode( " << v.Coord().X() << ", " << v.Coord().Y() << ", 0 )" << endl; + } + + int nodeIDs[3]; + for ( int i = 0; i < _triaDS->NbElements(); ++i ) + { + const BRepMesh_Triangle& t = _triaDS->GetElement( i+1 ); + if ( t.Movability() == BRepMesh_Deleted ) + continue; + _triaDS->ElementNodes( t, nodeIDs ); + text << "mesh.AddFace([ " << nodeIDs[0] << ", " << nodeIDs[1] << ", " << nodeIDs[2] << " ])" << endl; + } + + const char* fileName = "/tmp/Delaunay.py"; + SMESH_File file( fileName, false ); + file.remove(); + file.openForWriting(); + file.write( text.c_str(), text.size() ); + cout << "execfile( '" << fileName << "')" << endl; +} diff --git a/src/SMESHUtils/SMESH_Delaunay.hxx b/src/SMESHUtils/SMESH_Delaunay.hxx index 8d04f506a..71707118b 100644 --- a/src/SMESHUtils/SMESH_Delaunay.hxx +++ b/src/SMESHUtils/SMESH_Delaunay.hxx @@ -83,6 +83,9 @@ class SMESHUtils_EXPORT SMESH_Delaunay // delauney_UV = real_UV * scale const gp_XY& GetScale() const { return _scale; } + void ToPython() const; + + Handle(BRepMesh_DataStructureOfDelaun) GetDS() { return _triaDS; } protected: diff --git a/src/SMESH_SWIG/CMakeLists.txt b/src/SMESH_SWIG/CMakeLists.txt index 057506db6..b57d2b4df 100644 --- a/src/SMESH_SWIG/CMakeLists.txt +++ b/src/SMESH_SWIG/CMakeLists.txt @@ -22,8 +22,6 @@ # scripts / static SET(_bin_SCRIPTS smesh.py - batchmode_smesh.py - batchmode_mefisto.py ex00_all.py ex01_cube2build.py ex02_cube2primitive.py diff --git a/src/SMESH_SWIG/batchmode_mefisto.py b/src/SMESH_SWIG/batchmode_mefisto.py deleted file mode 100644 index baf57efa9..000000000 --- a/src/SMESH_SWIG/batchmode_mefisto.py +++ /dev/null @@ -1,127 +0,0 @@ -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -import os -import re - -import batchmode_salome -import batchmode_geompy -import batchmode_smesh -from salome.StdMeshers import StdMeshersBuilder - -smesh = batchmode_smesh.smesh -smesh.SetCurrentStudy(batchmode_salome.myStudy) - -def CreateMesh (theFileName, area, len = None, nbseg = None): - - if not(os.path.isfile(theFileName)) or re.search("\.brep$", theFileName) is None : - print "Incorrect file name !" - return - - if (len is None) and (nbseg is None): - print "Define length or number of segments !" - return - - if (len is not None) and (nbseg is not None): - print "Only one Hypothesis (from length and number of segments) can be defined !" - return - - - # ---- Import shape from BREP file and add it to the study - shape_mesh = batchmode_geompy.Import(theFileName, "BREP") - Id_shape = batchmode_geompy.addToStudy(shape_mesh, "shape_mesh") - - - # ---- SMESH - print "-------------------------- create mesh" - mesh = smesh.Mesh(shape_mesh) - - print "-------------------------- create Hypothesis" - if (len is not None): - print "-------------------------- LocalLength" - algoReg = mesh.Segment() - hypLength1 = algoReg.LocalLength(len) - print "Hypothesis type : ", hypLength1.GetName() - print "Hypothesis ID : ", hypLength1.GetId() - print "Hypothesis Value: ", hypLength1.GetLength() - - if (nbseg is not None): - print "-------------------------- NumberOfSegments" - algoReg = mesh.Segment() - hypNbSeg1 = algoReg.NumberOfSegments(nbseg) - print "Hypothesis type : ", hypNbSeg1.GetName() - print "Hypothesis ID : ", hypNbSeg1.GetId() - print "Hypothesis Value: ", hypNbSeg1.GetNumberOfSegments() - - if (area == "LengthFromEdges"): - print "-------------------------- LengthFromEdges" - algoMef = mesh.Triangle() - hypLengthFromEdges = algoMef.LengthFromEdges(1) - print "Hypothesis type : ", hypLengthFromEdges.GetName() - print "Hypothesis ID : ", hypLengthFromEdges.GetId() - print "LengthFromEdges Mode: ", hypLengthFromEdges.GetMode() - - else: - print "-------------------------- MaxElementArea" - algoMef = mesh.Triangle() - hypArea1 = algoMef.MaxElementArea(area) - print "Hypothesis type : ", hypArea1.GetName() - print "Hypothesis ID : ", hypArea1.GetId() - print "Hypothesis Value: ", hypArea1.GetMaxElementArea() - - - print "-------------------------- Regular_1D" - listHyp = algoReg.GetCompatibleHypothesis() - for hyp in listHyp: - print hyp - - print "Algo name: ", algoReg.GetName() - print "Algo ID : ", algoReg.GetId() - - print "-------------------------- MEFISTO_2D" - listHyp = algoMef.GetCompatibleHypothesis() - for hyp in listHyp: - print hyp - - print "Algo name: ", algoMef.GetName() - print "Algo ID : ", algoMef.GetId() - - - # ---- add hypothesis to shape - - print "-------------------------- compute mesh" - ret = mesh.Compute() - print "Compute Mesh .... ", - print ret - log = mesh.GetLog(0); # no erase trace - #for linelog in log: - # print linelog - - print "------------ INFORMATION ABOUT MESH ------------" - - print "Number of nodes : ", mesh.NbNodes() - print "Number of edges : ", mesh.NbEdges() - print "Number of faces : ", mesh.NbFaces() - print "Number of triangles: ", mesh.NbTriangles() - - return mesh diff --git a/src/SMESH_SWIG/batchmode_smesh.py b/src/SMESH_SWIG/batchmode_smesh.py deleted file mode 100644 index c31f82a04..000000000 --- a/src/SMESH_SWIG/batchmode_smesh.py +++ /dev/null @@ -1,324 +0,0 @@ -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : batchmode_smesh.py -# Author : Oksana TCHEBANOVA -# Module : SMESH -# $Header$ -# -from batchmode_salome import * -from batchmode_geompy import ShapeType -import SMESH - -#-------------------------------------------------------------------------- -modulecatalog = naming_service.Resolve("/Kernel/ModulCatalog") - -smesh = lcc.FindOrLoadComponent("FactoryServer", "SMESH") -smesh.SetCurrentStudy(myStudy) -myStudyBuilder = myStudy.NewBuilder() - -if myStudyBuilder is None: - raise RuntimeError, " Null myStudyBuilder" - -father = myStudy.FindComponent("SMESH") -if father is None: - father = myStudyBuilder.NewComponent("SMESH") - FName = myStudyBuilder.FindOrCreateAttribute(father, "AttributeName") - Comp = modulecatalog.GetComponent("SMESH") - FName.SetValue(Comp._get_componentusername()) - aPixmap = myStudyBuilder.FindOrCreateAttribute(father, "AttributePixMap") - aPixmap.SetPixMap("ICON_OBJBROWSER_Mesh") - -myStudyBuilder.DefineComponentInstance(father,smesh) - -mySComponentMesh = father._narrow(SALOMEDS.SComponent) - -Tag_HypothesisRoot = 1 -Tag_AlgorithmsRoot = 2 - -Tag_RefOnShape = 1 -Tag_RefOnAppliedHypothesis = 2 -Tag_RefOnAppliedAlgorithms = 3 - -Tag_SubMeshOnVertex = 4 -Tag_SubMeshOnEdge = 5 -Tag_SubMeshOnFace = 6 -Tag_SubMeshOnSolid = 7 -Tag_SubMeshOnCompound = 8 - -Tag = {"HypothesisRoot":1,"AlgorithmsRoot":2,"RefOnShape":1,"RefOnAppliedHypothesis":2,"RefOnAppliedAlgorithms":3,"SubMeshOnVertex":4,"SubMeshOnEdge":5,"SubMeshOnFace":6,"SubMeshOnSolid":7,"SubMeshOnCompound":8} - -#------------------------------------------------------------ -def Init(): - pass -#------------------------------------------------------------ -def AddNewMesh(IOR): - # VSR: added temporarily - objects are published automatically by the engine - aSO = myStudy.FindObjectIOR( IOR ) - if aSO is not None: - return aSO.GetID() - # VSR ###################################################################### - - res,HypothesisRoot = mySComponentMesh.FindSubObject ( Tag_HypothesisRoot ) - if HypothesisRoot is None or res == 0: - HypothesisRoot = myStudyBuilder.NewObjectToTag(mySComponentMesh, Tag_HypothesisRoot) - aName = myStudyBuilder.FindOrCreateAttribute(HypothesisRoot, "AttributeName") - aName.SetValue("Hypotheses") - aPixmap = myStudyBuilder.FindOrCreateAttribute(HypothesisRoot, "AttributePixMap") - aPixmap.SetPixMap( "mesh_tree_hypo.png" ) - aSelAttr = myStudyBuilder.FindOrCreateAttribute(HypothesisRoot, "AttributeSelectable") - aSelAttr.SetSelectable(0) - - res, AlgorithmsRoot = mySComponentMesh.FindSubObject (Tag_AlgorithmsRoot) - if AlgorithmsRoot is None or res == 0: - AlgorithmsRoot = myStudyBuilder.NewObjectToTag (mySComponentMesh, Tag_AlgorithmsRoot) - aName = myStudyBuilder.FindOrCreateAttribute(AlgorithmsRoot, "AttributeName") - aName.SetValue("Algorithms") - aPixmap = myStudyBuilder.FindOrCreateAttribute(AlgorithmsRoot, "AttributePixMap") - aPixmap.SetPixMap( "mesh_tree_algo.png" ) - aSelAttr = myStudyBuilder.FindOrCreateAttribute(AlgorithmsRoot, "AttributeSelectable") - aSelAttr.SetSelectable(0) - - HypothesisRoot = HypothesisRoot._narrow(SALOMEDS.SObject) - newMesh = myStudyBuilder.NewObject(mySComponentMesh) - aPixmap = myStudyBuilder.FindOrCreateAttribute(newMesh, "AttributePixMap") - aPixmap.SetPixMap( "mesh_tree_mesh.png" ) - anIOR = myStudyBuilder.FindOrCreateAttribute(newMesh, "AttributeIOR") - anIOR.SetValue(IOR) - return newMesh.GetID() - -#------------------------------------------------------------ -def AddNewHypothesis(IOR): - # VSR: added temporarily - objects are published automatically by the engine - aSO = myStudy.FindObjectIOR( IOR ) - if aSO is not None: - return aSO.GetID() - # VSR ###################################################################### - - res, HypothesisRoot = mySComponentMesh.FindSubObject (Tag_HypothesisRoot) - if HypothesisRoot is None or res == 0: - HypothesisRoot = myStudyBuilder.NewObjectToTag (mySComponentMesh, Tag_HypothesisRoot) - aName = myStudyBuilder.FindOrCreateAttribute(HypothesisRoot, "AttributeName") - aName.SetValue("Hypotheses") - aSelAttr = myStudyBuilder.FindOrCreateAttribute(HypothesisRoot, "AttributeSelectable") - aSelAttr.SetSelectable(0) - aPixmap = myStudyBuilder.FindOrCreateAttribute(HypothesisRoot, "AttributePixMap") - aPixmap.SetPixMap( "mesh_tree_hypo.png" ) - - # Add New Hypothesis - newHypo = myStudyBuilder.NewObject(HypothesisRoot) - aPixmap = myStudyBuilder.FindOrCreateAttribute(newHypo, "AttributePixMap") - H = orb.string_to_object(IOR) - aType = H.GetName() - aPixmap.SetPixMap( "mesh_tree_hypo.png_" + aType ) - anIOR = myStudyBuilder.FindOrCreateAttribute(newHypo, "AttributeIOR") - anIOR.SetValue(IOR) - return newHypo.GetID() - -#------------------------------------------------------------ -def AddNewAlgorithms(IOR): - # VSR: added temporarily - objects are published automatically by the engine - aSO = myStudy.FindObjectIOR( IOR ) - if aSO is not None: - return aSO.GetID() - # VSR ###################################################################### - - res, AlgorithmsRoot = mySComponentMesh.FindSubObject (Tag_AlgorithmsRoot) - if AlgorithmsRoot is None or res == 0: - AlgorithmsRoot = myStudyBuilde.NewObjectToTag (mySComponentMesh, Tag_AlgorithmsRoot) - aName = myStudyBuilder.FindOrCreateAttribute(AlgorithmsRoot, "AttributeName") - aName.SetValue("Algorithms") - aSelAttr = myStudyBuilder.FindOrCreateAttribute(AlgorithmsRoot, "AttributeSelectable") - aSelAttr.SetSelectable(0) - aPixmap = myStudyBuilder.FindOrCreateAttribute(AlgorithmsRoot, "AttributePixMap") - aPixmap.SetPixMap( "mesh_tree_algo.png" ) - - # Add New Algorithms - newHypo = myStudyBuilder.NewObject(AlgorithmsRoot) - aPixmap = myStudyBuilder.FindOrCreateAttribute(newHypo, "AttributePixMap") - aPixmap = anAttr._narrow(SALOMEDS.AttributePixMap) - H = orb.string_to_object(IOR) - aType = H.GetName(); #QString in fact - aPixmap.SetPixMap( "mesh_tree_algo.png_" + aType ) - anIOR = myStudyBuilder.FindOrCreateAttribute(newHypo, "AttributeIOR") - anIOR.SetValue(IOR) - return newHypo.GetID() - - -#------------------------------------------------------------ -def SetShape(ShapeEntry, MeshEntry): - SO_MorSM = myStudy.FindObjectID( MeshEntry ) - SO_GeomShape = myStudy.FindObjectID( ShapeEntry ) - - if SO_MorSM is not None and SO_GeomShape is not None : - # VSR: added temporarily - shape reference is published automatically by the engine - res, Ref = SO_MorSM.FindSubObject( Tag_RefOnShape ) - if res == 1 : - return - # VSR ###################################################################### - - SO = myStudyBuilder.NewObjectToTag (SO_MorSM, Tag_RefOnShape) - myStudyBuilder.Addreference (SO,SO_GeomShape) - - -#------------------------------------------------------------ -def SetHypothesis(Mesh_Or_SubMesh_Entry, Hypothesis_Entry): - SO_MorSM = myStudy.FindObjectID( Mesh_Or_SubMesh_Entry ) - SO_Hypothesis = myStudy.FindObjectID( Hypothesis_Entry ) - - if SO_MorSM is not None and SO_Hypothesis is not None : - - #Find or Create Applied Hypothesis root - res, AHR = SO_MorSM.FindSubObject (Tag_RefOnAppliedHypothesis) - if AHR is None or res == 0: - AHR = myStudyBuilder.NewObjectToTag (SO_MorSM, Tag_RefOnAppliedHypothesis) - aName = myStudyBuilder.FindOrCreateAttribute(AHR, "AttributeName") - - # The same name as in SMESH_Mesh_i::AddHypothesis() ################## - aName.SetValue("Applied hypotheses") - - aSelAttr = myStudyBuilder.FindOrCreateAttribute(AHR, "AttributeSelectable") - aSelAttr.SetSelectable(0) - aPixmap = myStudyBuilder.FindOrCreateAttribute(AHR, "AttributePixMap") - aPixmap.SetPixMap( "mesh_tree_hypo.png" ) - - # VSR: added temporarily - reference to applied hypothesis is published automatically by the engine - else : - it = myStudy.NewChildIterator(AHR) - while it.More() : - res, Ref = it.Value().ReferencedObject() - if res and Ref is not None and Ref.GetID() == Hypothesis_Entry : - return - it.Next() - # VSR ###################################################################### - - SO = myStudyBuilder.NewObject(AHR) - myStudyBuilder.Addreference (SO,SO_Hypothesis) - -#------------------------------------------------------------ -def SetAlgorithms(Mesh_Or_SubMesh_Entry, Algorithms_Entry): - SO_MorSM = myStudy.FindObjectID( Mesh_Or_SubMesh_Entry ) - SO_Algorithms = myStudy.FindObjectID( Algorithms_Entry ) - if SO_MorSM != None and SO_Algorithms != None : - #Find or Create Applied Algorithms root - res, AHR = SO_MorSM.FindSubObject (Tag_RefOnAppliedAlgorithms) - if AHR is None or res == 0: - AHR = myStudyBuilder.NewObjectToTag (SO_MorSM, Tag_RefOnAppliedAlgorithms) - aName = myStudyBuilder.FindOrCreateAttribute(AHR, "AttributeName") - - # The same name as in SMESH_Mesh_i::AddHypothesis() ################## - aName.SetValue("Applied algorithms") - - aSelAttr = myStudyBuilder.FindOrCreateAttribute(AHR, "AttributeSelectable") - aSelAttr.SetSelectable(0) - aPixmap = myStudyBuilder.FindOrCreateAttribute(AHR, "AttributePixMap") - aPixmap.SetPixMap( "mesh_tree_algo.png" ) - - # VSR: added temporarily - reference to applied hypothesis is published automatically by the engine - else : - it = myStudy.NewChildIterator(AHR) - while it.More() : - res, Ref = it.Value().ReferencedObject() - if res and Ref is not None and Ref.GetID() == Algorithms_Entry : - return - it.Next() - # VSR ###################################################################### - - SO = myStudyBuilder.NewObject(AHR) - myStudyBuilder.Addreference (SO,SO_Algorithms) - - -#------------------------------------------------------------ -def UnSetHypothesis( Applied_Hypothesis_Entry ): - SO_Applied_Hypothesis = myStudy.FindObjectID( Applied_Hypothesis_Entry ) - if SO_Applied_Hypothesis : - myStudyBuilder.RemoveObject(SO_Applied_Hypothesis) - - -#------------------------------------------------------------ -def AddSubMesh ( SO_Mesh_Entry, SM_IOR, ST): - # VSR: added temporarily - objects are published automatically by the engine - aSO = myStudy.FindObjectIOR( SM_IOR ) - if aSO is not None: - return aSO.GetID() - # VSR ###################################################################### - - SO_Mesh = myStudy.FindObjectID( SO_Mesh_Entry ) - if ( SO_Mesh ) : - - if ST == ShapeType["COMPSOLID"] : - Tag_Shape = Tag_SubMeshOnSolid - Name = "SubMeshes on Solid" - elif ST == ShapeType["FACE"] : - Tag_Shape = Tag_SubMeshOnFace - Name = "SubMeshes on Face" - elif ST == ShapeType["EDGE"] : - Tag_Shape = Tag_SubMeshOnEdge - Name = "SubMeshes on Edge" - elif ST == ShapeType["VERTEX"] : - Tag_Shape = Tag_SubMeshOnVertex - Name = "SubMeshes on Vertex" - else : - Tag_Shape = Tag_SubMeshOnCompound - Name = "SubMeshes on Compound" - - res, SubmeshesRoot = SO_Mesh.FindSubObject (Tag_Shape) - if SubmeshesRoot is None or res == 0: - SubmeshesRoot = myStudyBuilder.NewObjectToTag (SO_Mesh, Tag_Shape) - aName = myStudyBuilder.FindOrCreateAttribute(SubmeshesRoot, "AttributeName") - aName.SetValue(Name) - aSelAttr = myStudyBuilder.FindOrCreateAttribute(SubmeshesRoot, "AttributeSelectable") - aSelAttr.SetSelectable(0) - - SO = myStudyBuilder.NewObject (SubmeshesRoot) - anIOR = myStudyBuilder.FindOrCreateAttribute(SO, "AttributeIOR") - anIOR.SetValue(SM_IOR) - return SO.GetID() - - return None - -#------------------------------------------------------------ -def AddSubMeshOnShape (Mesh_Entry, GeomShape_Entry, SM_IOR, ST) : - # VSR: added temporarily - objects are published automatically by the engine - aSO = myStudy.FindObjectIOR( SM_IOR ) - if aSO is not None: - return aSO.GetID() - # VSR ###################################################################### - SO_GeomShape = myStudy.FindObjectID( GeomShape_Entry ) - if SO_GeomShape != None : - SM_Entry = AddSubMesh (Mesh_Entry,SM_IOR,ST) - SO_SM = myStudy.FindObjectID( SM_Entry ) - - if SO_SM != None : - SetShape (GeomShape_Entry, SM_Entry) - return SM_Entry - - return None - - -#------------------------------------------------------------ -def SetName(Entry, Name): - SO = myStudy.FindObjectID( Entry ) - if SO != None : - aName = myStudyBuilder.FindOrCreateAttribute(SO, "AttributeName") - aName.SetValue(Name) diff --git a/src/StdMeshers/StdMeshers_FaceSide.cxx b/src/StdMeshers/StdMeshers_FaceSide.cxx index 1424e4226..71677dc1b 100644 --- a/src/StdMeshers/StdMeshers_FaceSide.cxx +++ b/src/StdMeshers/StdMeshers_FaceSide.cxx @@ -166,6 +166,14 @@ StdMeshers_FaceSide::StdMeshers_FaceSide(const TopoDS_Face& theFace, myC3dAdaptor[i].Load( C3d, 0, 0.5 * BRep_Tool::Tolerance( V )); } } + else if ( myEdgeLength[i] > DBL_MIN ) + { + Handle(Geom_Curve) C3d = BRep_Tool::Curve(myEdge[i],myFirst[i], myLast[i] ); + myC3dAdaptor[i].Load( C3d, myFirst[i], myLast[i] ); + if ( myEdge[i].Orientation() == TopAbs_REVERSED ) + std::swap( myFirst[i], myLast[i] ); + } + // reverse a proxy sub-mesh if ( !theIsForward ) reverseProxySubmesh( myEdge[i] ); diff --git a/src/StdMeshers/StdMeshers_Prism_3D.cxx b/src/StdMeshers/StdMeshers_Prism_3D.cxx index 0ee4041ce..939679f95 100644 --- a/src/StdMeshers/StdMeshers_Prism_3D.cxx +++ b/src/StdMeshers/StdMeshers_Prism_3D.cxx @@ -1182,7 +1182,7 @@ bool StdMeshers_Prism_3D::compute(const Prism_3D::TPrismTopo& thePrism) // load boundary nodes into sweeper bool dummy; - const SMDS_MeshNode* prevN0 = 0, *prevN1 = 0; + std::set< const SMDS_MeshNode* > usedEndNodes; list< TopoDS_Edge >::const_iterator edge = thePrism.myBottomEdges.begin(); for ( ; edge != thePrism.myBottomEdges.end(); ++edge ) { @@ -1193,9 +1193,8 @@ bool StdMeshers_Prism_3D::compute(const Prism_3D::TPrismTopo& thePrism) TParam2ColumnMap::iterator u2colIt = u2col->begin(), u2colEnd = u2col->end(); const SMDS_MeshNode* n0 = u2colIt->second[0]; const SMDS_MeshNode* n1 = u2col->rbegin()->second[0]; - if ( n0 == prevN0 || n0 == prevN1 ) ++u2colIt; - if ( n1 == prevN0 || n1 == prevN1 ) --u2colEnd; - prevN0 = n0; prevN1 = n1; + if ( !usedEndNodes.insert ( n0 ).second ) ++u2colIt; + if ( !usedEndNodes.insert ( n1 ).second ) --u2colEnd; for ( ; u2colIt != u2colEnd; ++u2colIt ) sweeper.myBndColumns.push_back( & u2colIt->second ); @@ -1627,7 +1626,7 @@ bool StdMeshers_Prism_3D::computeWalls(const Prism_3D::TPrismTopo& thePrism) TopoDS_Vertex v = myHelper->IthVertex( is2ndV, E ); mesh->GetSubMesh( v )->ComputeStateEngine( SMESH_subMesh::COMPUTE ); const SMDS_MeshNode* n = SMESH_Algo::VertexNode( v, meshDS ); - newNodes[ is2ndV ? 0 : newNodes.size()-1 ] = (SMDS_MeshNode*) n; + newNodes[ is2ndV ? newNodes.size()-1 : 0 ] = (SMDS_MeshNode*) n; } // compute nodes on target EDGEs @@ -3590,10 +3589,10 @@ bool StdMeshers_PrismAsBlock::Init(SMESH_MesherHelper* helper, if ( !myHelper->LoadNodeColumns( faceColumns, (*quad)->face, quadBot, meshDS )) return error(COMPERR_BAD_INPUT_MESH, TCom("Can't find regular quadrangle mesh ") << "on a side face #" << MeshDS()->ShapeToIndex( (*quad)->face )); - - if ( !faceColumns.empty() && (int)faceColumns.begin()->second.size() != VerticalSize() ) - return error(COMPERR_BAD_INPUT_MESH, "Different 'vertical' discretization"); } + if ( !faceColumns.empty() && (int)faceColumns.begin()->second.size() != VerticalSize() ) + return error(COMPERR_BAD_INPUT_MESH, "Different 'vertical' discretization"); + // edge columns int id = MeshDS()->ShapeToIndex( *edgeIt ); bool isForward = true; // meaningless for intenal wires @@ -4893,6 +4892,7 @@ bool StdMeshers_Sweeper::projectIntPoints(const vector< gp_XYZ >& fromBndPoin const vector< gp_XYZ >& toBndPoints, const vector< gp_XYZ >& fromIntPoints, vector< gp_XYZ >& toIntPoints, + const double r, NSProjUtils::TrsfFinder3D& trsf, vector< gp_XYZ > * bndError) { @@ -4917,43 +4917,23 @@ bool StdMeshers_Sweeper::projectIntPoints(const vector< gp_XYZ >& fromBndPoin (*bndError)[ iP ] = toBndPoints[ iP ] - fromTrsf; } } - return true; -} - -//================================================================================ -/*! - * \brief Add boundary error to ineternal points - */ -//================================================================================ -void StdMeshers_Sweeper::applyBoundaryError(const vector< gp_XYZ >& bndPoints, - const vector< gp_XYZ >& bndError1, - const vector< gp_XYZ >& bndError2, - const double r, - vector< gp_XYZ >& intPoints, - vector< double >& int2BndDist) -{ - // fix each internal point - const double eps = 1e-100; - for ( size_t iP = 0; iP < intPoints.size(); ++iP ) + // apply boundary error + if ( bndError && toIntPoints.size() == myTopBotTriangles.size() ) { - gp_XYZ & intPnt = intPoints[ iP ]; - - // compute distance from intPnt to each boundary node - double int2BndDistSum = 0; - for ( size_t iBnd = 0; iBnd < bndPoints.size(); ++iBnd ) + for ( size_t iP = 0; iP < toIntPoints.size(); ++iP ) { - int2BndDist[ iBnd ] = 1 / (( intPnt - bndPoints[ iBnd ]).SquareModulus() + eps ); - int2BndDistSum += int2BndDist[ iBnd ]; - } - - // apply bndError - for ( size_t iBnd = 0; iBnd < bndPoints.size(); ++iBnd ) - { - intPnt += bndError1[ iBnd ] * ( 1 - r ) * int2BndDist[ iBnd ] / int2BndDistSum; - intPnt += bndError2[ iBnd ] * r * int2BndDist[ iBnd ] / int2BndDistSum; + const TopBotTriangles& tbTrias = myTopBotTriangles[ iP ]; + for ( int i = 0; i < 3; ++i ) // boundary errors at 3 triangle nodes + { + toIntPoints[ iP ] += + ( (*bndError)[ tbTrias.myBotTriaNodes[i] ] * tbTrias.myBotBC[i] * ( 1 - r ) + + (*bndError)[ tbTrias.myTopTriaNodes[i] ] * tbTrias.myTopBC[i] * ( r )); + } } } + + return true; } //================================================================================ @@ -4980,6 +4960,10 @@ bool StdMeshers_Sweeper::ComputeNodesByTrsf( const double tol, intPntsOfLayer[ zTgt ][ iP ] = intPoint( iP, zTgt ); } + // for each internal column find boundary nodes whose error to use for correction + prepareTopBotDelaunay(); + findDelaunayTriangles(); + // compute coordinates of internal nodes by projecting (transfroming) src and tgt // nodes towards the central layer @@ -5006,10 +4990,12 @@ bool StdMeshers_Sweeper::ComputeNodesByTrsf( const double tol, } if (! projectIntPoints( fromSrcBndPnts, toSrcBndPnts, intPntsOfLayer[ zS-1 ], intPntsOfLayer[ zS ], + zS / ( zSize - 1.), trsfOfLayer [ zS-1 ], & bndError[ zS-1 ])) return false; if (! projectIntPoints( fromTgtBndPnts, toTgtBndPnts, intPntsOfLayer[ zT+1 ], intPntsOfLayer[ zT ], + zT / ( zSize - 1.), trsfOfLayer [ zT+1 ], & bndError[ zT+1 ])) return false; @@ -5048,10 +5034,12 @@ bool StdMeshers_Sweeper::ComputeNodesByTrsf( const double tol, } if (! projectIntPoints( fromSrcBndPnts, toSrcBndPnts, intPntsOfLayer[ zS-1 ], centerSrcIntPnts, + zS / ( zSize - 1.), trsfOfLayer [ zS-1 ], & bndError[ zS-1 ])) return false; if (! projectIntPoints( fromTgtBndPnts, toTgtBndPnts, intPntsOfLayer[ zT+1 ], centerTgtIntPnts, + zT / ( zSize - 1.), trsfOfLayer [ zT+1 ], & bndError[ zT+1 ])) return false; @@ -5070,24 +5058,7 @@ bool StdMeshers_Sweeper::ComputeNodesByTrsf( const double tol, (intPntsOfLayer[ zS-1 ][ iP ] - centerTgtIntPnts[ iP ]).SquareModulus() < tol*tol; } - // Evaluate an error of boundary points - - bool bndErrorIsSmall = true; - for ( size_t iP = 0; ( iP < myBndColumns.size() && bndErrorIsSmall ); ++iP ) - { - double sumError = 0; - for ( size_t z = 1; z < zS; ++z ) // loop on layers - sumError += ( bndError[ z-1 ][ iP ].Modulus() + - bndError[ zSize-z ][ iP ].Modulus() ); - - bndErrorIsSmall = ( sumError < tol ); - } - - if ( !bndErrorIsSmall && !allowHighBndError ) - return false; - // compute final points on the central layer - std::vector< double > int2BndDist( myBndColumns.size() ); // work array of applyBoundaryError() double r = zS / ( zSize - 1.); if ( zS == zT ) { @@ -5096,11 +5067,6 @@ bool StdMeshers_Sweeper::ComputeNodesByTrsf( const double tol, intPntsOfLayer[ zS ][ iP ] = ( 1 - r ) * centerSrcIntPnts[ iP ] + r * centerTgtIntPnts[ iP ]; } - if ( !bndErrorIsSmall ) - { - applyBoundaryError( toSrcBndPnts, bndError[ zS-1 ], bndError[ zS+1 ], r, - intPntsOfLayer[ zS ], int2BndDist ); - } } else { @@ -5111,17 +5077,9 @@ bool StdMeshers_Sweeper::ComputeNodesByTrsf( const double tol, intPntsOfLayer[ zT ][ iP ] = r * intPntsOfLayer[ zT ][ iP ] + ( 1 - r ) * centerTgtIntPnts[ iP ]; } - if ( !bndErrorIsSmall ) - { - applyBoundaryError( toSrcBndPnts, bndError[ zS-1 ], bndError[ zS+1 ], r, - intPntsOfLayer[ zS ], int2BndDist ); - applyBoundaryError( toTgtBndPnts, bndError[ zT+1 ], bndError[ zT-1 ], r, - intPntsOfLayer[ zT ], int2BndDist ); - } } - centerIntErrorIsSmall = true; // 3D_mesh_Extrusion_00/A3 - bndErrorIsSmall = true; + //centerIntErrorIsSmall = true; // 3D_mesh_Extrusion_00/A3 if ( !centerIntErrorIsSmall ) { // Compensate the central error; continue adding projection @@ -5153,9 +5111,11 @@ bool StdMeshers_Sweeper::ComputeNodesByTrsf( const double tol, } projectIntPoints( fromSrcBndPnts, toSrcBndPnts, fromSrcIntPnts, toSrcIntPnts, + zS / ( zSize - 1.), trsfOfLayer[ zS+1 ], & srcBndError ); projectIntPoints( fromTgtBndPnts, toTgtBndPnts, fromTgtIntPnts, toTgtIntPnts, + zT / ( zSize - 1.), trsfOfLayer[ zT-1 ], & tgtBndError ); // if ( zS == zTgt - 1 ) @@ -5186,15 +5146,6 @@ bool StdMeshers_Sweeper::ComputeNodesByTrsf( const double tol, zTIntPnts[ iP ] = r * zTIntPnts[ iP ] + ( 1 - r ) * toTgtIntPnts[ iP ]; } - // compensate bnd error - if ( !bndErrorIsSmall ) - { - applyBoundaryError( toSrcBndPnts, srcBndError, bndError[ zS+1 ], r, - intPntsOfLayer[ zS ], int2BndDist ); - applyBoundaryError( toTgtBndPnts, tgtBndError, bndError[ zT-1 ], r, - intPntsOfLayer[ zT ], int2BndDist ); - } - fromSrcBndPnts.swap( toSrcBndPnts ); fromSrcIntPnts.swap( toSrcIntPnts ); fromTgtBndPnts.swap( toTgtBndPnts ); @@ -5202,27 +5153,8 @@ bool StdMeshers_Sweeper::ComputeNodesByTrsf( const double tol, } } // if ( !centerIntErrorIsSmall ) - else if ( !bndErrorIsSmall ) - { - zS = zSrc + 1; - zT = zTgt - 1; - for ( ; zS < zT; ++zS, --zT ) // vertical loop on layers - { - for ( size_t iP = 0; iP < myBndColumns.size(); ++iP ) - { - toSrcBndPnts[ iP ] = bndPoint( iP, zS ); - toTgtBndPnts[ iP ] = bndPoint( iP, zT ); - } - // compensate bnd error - applyBoundaryError( toSrcBndPnts, bndError[ zS-1 ], bndError[ zS-1 ], 0.5, - intPntsOfLayer[ zS ], int2BndDist ); - applyBoundaryError( toTgtBndPnts, bndError[ zT+1 ], bndError[ zT+1 ], 0.5, - intPntsOfLayer[ zT ], int2BndDist ); - } - } - // cout << "centerIntErrorIsSmall = " << centerIntErrorIsSmall<< endl; - // cout << "bndErrorIsSmall = " << bndErrorIsSmall<< endl; + //cout << "centerIntErrorIsSmall = " << centerIntErrorIsSmall<< endl; // Create nodes for ( size_t iP = 0; iP < myIntColumns.size(); ++iP ) @@ -5454,3 +5386,78 @@ void StdMeshers_Sweeper::prepareTopBotDelaunay() myNodeID2ColID.Bind( botNode->GetID(), i ); } } + +//================================================================================ +/*! + * \brief For each internal node column, find Delaunay triangles including it + * and Barycentric Coordinates withing the triangles. Fill in myTopBotTriangles + */ +//================================================================================ + +void StdMeshers_Sweeper::findDelaunayTriangles() +{ + const SMDS_MeshNode *botNode, *topNode; + const BRepMesh_Triangle *topTria; + TopBotTriangles tbTrias; + bool checkUV = true; + + int nbInternalNodes = myIntColumns.size(); + myTopBotTriangles.resize( nbInternalNodes ); + + myBotDelaunay->InitTraversal( nbInternalNodes ); + + while (( botNode = myBotDelaunay->NextNode( tbTrias.myBotBC, tbTrias.myBotTriaNodes ))) + { + int colID = myNodeID2ColID( botNode->GetID() ); + TNodeColumn* column = myIntColumns[ colID ]; + + // find a Delaunay triangle containing the topNode + topNode = column->back(); + gp_XY topUV = myHelper->GetNodeUV( myTopFace, topNode, NULL, &checkUV ); + // get a starting triangle basing on that top and bot boundary nodes have same index + topTria = myTopDelaunay->GetTriangleNear( tbTrias.myBotTriaNodes[0] ); + topTria = myTopDelaunay->FindTriangle( topUV, topTria, + tbTrias.myTopBC, tbTrias.myTopTriaNodes ); + if ( !topTria ) + tbTrias.SetTopByBottom(); + + myTopBotTriangles[ colID ] = tbTrias; + } + +#ifdef _DEBUG_ + if ( myBotDelaunay->NbVisitedNodes() < nbInternalNodes ) + throw SALOME_Exception(LOCALIZED("Not all internal nodes found by Delaunay")); +#endif + + myBotDelaunay.reset(); + myTopDelaunay.reset(); + myNodeID2ColID.Clear(); +} + +//================================================================================ +/*! + * \brief Initialize fields + */ +//================================================================================ + +StdMeshers_Sweeper::TopBotTriangles::TopBotTriangles() +{ + myBotBC[0] = myBotBC[1] = myBotBC[2] = myTopBC[0] = myTopBC[1] = myTopBC[2] = 0.; + myBotTriaNodes[0] = myBotTriaNodes[1] = myBotTriaNodes[2] = 0; + myTopTriaNodes[0] = myTopTriaNodes[1] = myTopTriaNodes[2] = 0; +} + +//================================================================================ +/*! + * \brief Set top data equal to bottom data + */ +//================================================================================ + +void StdMeshers_Sweeper::TopBotTriangles::SetTopByBottom() +{ + for ( int i = 0; i < 3; ++i ) + { + myTopBC[i] = myBotBC[i]; + myTopTriaNodes[i] = myBotTriaNodes[0]; + } +} diff --git a/src/StdMeshers/StdMeshers_Prism_3D.hxx b/src/StdMeshers/StdMeshers_Prism_3D.hxx index 51a9c4e71..da4b055e0 100644 --- a/src/StdMeshers/StdMeshers_Prism_3D.hxx +++ b/src/StdMeshers/StdMeshers_Prism_3D.hxx @@ -415,20 +415,13 @@ private: */ struct StdMeshers_Sweeper { - SMESH_MesherHelper* myHelper; - TopoDS_Face myBotFace; - TopoDS_Face myTopFace; - - std::vector< TNodeColumn* > myBndColumns; // boundary nodes - std::vector< TNodeColumn* > myIntColumns; // internal nodes - - typedef std::vector< double > TZColumn; - std::vector< TZColumn > myZColumns; // Z distribution of boundary nodes - - StdMeshers_ProjectionUtils::DelaunayPtr myTopDelaunay; - StdMeshers_ProjectionUtils::DelaunayPtr myBotDelaunay; - TColStd_DataMapOfIntegerInteger myNodeID2ColID; - + // input data + SMESH_MesherHelper* myHelper; + TopoDS_Face myBotFace; + TopoDS_Face myTopFace; + std::vector< TNodeColumn* > myBndColumns; // boundary nodes + // output data + std::vector< TNodeColumn* > myIntColumns; // internal nodes bool ComputeNodesByTrsf( const double tol, const bool allowHighBndError ); @@ -447,24 +440,36 @@ private: gp_XYZ intPoint( int iP, int z ) const { return SMESH_TNodeXYZ( (*myIntColumns[ iP ])[ z ]); } - static bool projectIntPoints(const std::vector< gp_XYZ >& fromBndPoints, - const std::vector< gp_XYZ >& toBndPoints, - const std::vector< gp_XYZ >& fromIntPoints, - std::vector< gp_XYZ >& toIntPoints, - StdMeshers_ProjectionUtils::TrsfFinder3D& trsf, - std::vector< gp_XYZ > * bndError); - - static void applyBoundaryError(const std::vector< gp_XYZ >& bndPoints, - const std::vector< gp_XYZ >& bndError1, - const std::vector< gp_XYZ >& bndError2, - const double r, - std::vector< gp_XYZ >& toIntPoints, - std::vector< double >& int2BndDist); + bool projectIntPoints(const std::vector< gp_XYZ >& fromBndPoints, + const std::vector< gp_XYZ >& toBndPoints, + const std::vector< gp_XYZ >& fromIntPoints, + std::vector< gp_XYZ >& toIntPoints, + const double r, + StdMeshers_ProjectionUtils::TrsfFinder3D& trsf, + std::vector< gp_XYZ > * bndError); + typedef std::vector< double > TZColumn; static void fillZColumn( TZColumn& zColumn, TNodeColumn& nodes ); void prepareTopBotDelaunay(); + void findDelaunayTriangles(); + + std::vector< TZColumn > myZColumns; // Z distribution of boundary nodes + + StdMeshers_ProjectionUtils::DelaunayPtr myTopDelaunay; + StdMeshers_ProjectionUtils::DelaunayPtr myBotDelaunay; + TColStd_DataMapOfIntegerInteger myNodeID2ColID; + + // top and bottom Delaulay triangles including an internal column + struct TopBotTriangles + { + double myBotBC[3], myTopBC[3]; // barycentric coordinates of a node within a triangle + int myBotTriaNodes[3], myTopTriaNodes[3]; // indices of boundary columns + TopBotTriangles(); + void SetTopByBottom(); + }; + std::vector< TopBotTriangles> myTopBotTriangles; }; // =============================================== -- 2.39.2