X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_ViscousLayers.cxx;h=36c2806c0eb49d4f6471e18390df5a59e4982c80;hb=67e484afbe26cc5aceaed0da3747d8239a3b57b3;hp=94996de524aecf3821d307809919d1ad3ede18f8;hpb=24412178e1a7c741a73d5b23822c43e08c353b97;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_ViscousLayers.cxx b/src/StdMeshers/StdMeshers_ViscousLayers.cxx index 94996de52..36c2806c0 100644 --- a/src/StdMeshers/StdMeshers_ViscousLayers.cxx +++ b/src/StdMeshers/StdMeshers_ViscousLayers.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2019 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -43,6 +43,7 @@ #include "SMESH_MesherHelper.hxx" #include "SMESH_ProxyMesh.hxx" #include "SMESH_subMesh.hxx" +#include "SMESH_MeshEditor.hxx" #include "SMESH_subMeshEventListener.hxx" #include "StdMeshers_FaceSide.hxx" #include "StdMeshers_ViscousLayers2D.hxx" @@ -97,7 +98,7 @@ #include #ifdef _DEBUG_ -#define __myDEBUG +//#define __myDEBUG //#define __NOT_INVALIDATE_BAD_SMOOTH //#define __NODES_AT_POS #endif @@ -1099,7 +1100,7 @@ namespace VISCOUS_3D /*! * \brief Class of temporary mesh face. * We can't use SMDS_FaceOfNodes since it's impossible to set it's ID which is - * needed because SMESH_ElementSearcher internaly uses set of elements sorted by ID + * needed because SMESH_ElementSearcher internally uses set of elements sorted by ID */ struct _TmpMeshFace : public SMDS_PolygonalFaceOfNodes { @@ -1590,7 +1591,7 @@ namespace VISCOUS_3D //================================================================================ /*! - * \brief Computes mimimal distance of face in-FACE nodes from an EDGE + * \brief Computes minimal distance of face in-FACE nodes from an EDGE * \param [in] face - the mesh face to treat * \param [in] nodeOnEdge - a node on the EDGE * \param [out] faceSize - the computed distance @@ -4090,7 +4091,7 @@ gp_XYZ _OffsetPlane::GetCommonPoint(bool& isFound, //================================================================================ /*! - * \brief Find 2 neigbor nodes of a node on EDGE + * \brief Find 2 neighbor nodes of a node on EDGE */ //================================================================================ @@ -4135,7 +4136,7 @@ bool _ViscousBuilder::findNeiborsOnEdge(const _LayerEdge* edge, //================================================================================ /*! - * \brief Set _curvature and _2neibors->_plnNorm by 2 neigbor nodes residing the same EDGE + * \brief Set _curvature and _2neibors->_plnNorm by 2 neighbor nodes residing the same EDGE */ //================================================================================ @@ -6680,6 +6681,7 @@ void _ViscousBuilder::findCollisionEdges( _SolidData& data, SMESH_MesherHelper& _EdgesOnShape& eos = data._edgesOnShape[iS]; if ( eos._edges.empty() ) continue; if ( eos.ShapeType() != TopAbs_EDGE && eos.ShapeType() != TopAbs_VERTEX ) continue; + if ( !eos._sWOL.IsNull() ) continue; // PAL23566 for ( size_t i = 0; i < eos._edges.size(); ++i ) {