From 9900ce4eab3461ad8d24e2b337dddd1cce43e64c Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 8 Nov 2021 19:41:51 +0300 Subject: [PATCH 1/9] bos #26609 Patching tests (Windows) --- doc/salome/examples/test_smeshplugins.py | 37 ++++++++++++++---------- doc/salome/examples/tests.set | 7 ++++- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/doc/salome/examples/test_smeshplugins.py b/doc/salome/examples/test_smeshplugins.py index 48f12085c..a6efe765c 100644 --- a/doc/salome/examples/test_smeshplugins.py +++ b/doc/salome/examples/test_smeshplugins.py @@ -17,6 +17,7 @@ __revision__ = "V1.0" ComputeMeshes = True import salome +import platform salome.salome_init_without_session() theStudy = salome.myStudy @@ -74,23 +75,27 @@ while not ERROR : print(TEXTE+": OK") # B.2. Gmsh - TEXTE = "Gmsh" - MESH_2 = smesh.Mesh(BOX) - smesh.SetName(MESH_2.GetMesh(), "M_"+TEXTE) - try : - GMSH = MESH_2.Tetrahedron(algo=smeshBuilder.GMSH) - except : - MESSAGE += "\nImpossible d'utiliser "+TEXTE - ERROR += 1 + # GMSH for windows not yet implemented BOS #18709 + if platform.system() != "Windows" : + TEXTE = "Gmsh" + MESH_2 = smesh.Mesh(BOX) + smesh.SetName(MESH_2.GetMesh(), "M_"+TEXTE) + try : + GMSH = MESH_2.Tetrahedron(algo=smeshBuilder.GMSH) + except : + MESSAGE += "\nImpossible d'utiliser "+TEXTE + ERROR += 1 + else : + if ComputeMeshes : + smesh.SetName(GMSH.GetAlgorithm(), TEXTE) + OK_COMPUTE = MESH_2.Compute() + if not OK_COMPUTE : + MESSAGE += "\nErreur avec "+TEXTE + ERROR += 1 + else : + print(TEXTE+": OK") else : - if ComputeMeshes : - smesh.SetName(GMSH.GetAlgorithm(), TEXTE) - OK_COMPUTE = MESH_2.Compute() - if not OK_COMPUTE : - MESSAGE += "\nErreur avec "+TEXTE - ERROR += 1 - else : - print(TEXTE+": OK") + print("Skipping B.2 on windows") # B.3. MG_CADSurf TEXTE = "MG_CADSurf" diff --git a/doc/salome/examples/tests.set b/doc/salome/examples/tests.set index 4e392b19d..f3b8249ac 100644 --- a/doc/salome/examples/tests.set +++ b/doc/salome/examples/tests.set @@ -43,7 +43,6 @@ SET(BAD_TESTS quality_controls_ex22.py viewing_meshes_ex01.py radial_prism_3d_algo.py - test_smeshplugin_mg_tetra_parallele.py test_smeshplugins.py MGAdaptTests_without_session.py blocFissure_01_without_session.py @@ -55,6 +54,12 @@ SET(BAD_TESTS blocFissure_07_without_session.py ) +IF (NOT WIN32) + LIST(APPEND BAD_TESTS + test_smeshplugin_mg_tetra_parallele.py + ) +ENDIF(NOT WIN32) + SET(GOOD_TESTS cartesian_algo.py create_penta_biquad.py From 73d7ef94ef349c2138f5c08e83210c30141b58a5 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 9 Nov 2021 12:51:11 +0300 Subject: [PATCH 2/9] bos #26615 Disable MGAdaptTests_without_session.py on Windows (Adaptation is not supported yet) --- doc/salome/examples/tests.set | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/salome/examples/tests.set b/doc/salome/examples/tests.set index f3b8249ac..5382b5e9f 100644 --- a/doc/salome/examples/tests.set +++ b/doc/salome/examples/tests.set @@ -44,7 +44,6 @@ SET(BAD_TESTS viewing_meshes_ex01.py radial_prism_3d_algo.py test_smeshplugins.py - MGAdaptTests_without_session.py blocFissure_01_without_session.py blocFissure_02_without_session.py blocFissure_03_without_session.py @@ -54,8 +53,9 @@ SET(BAD_TESTS blocFissure_07_without_session.py ) -IF (NOT WIN32) +IF(NOT WIN32) LIST(APPEND BAD_TESTS + MGAdaptTests_without_session.py test_smeshplugin_mg_tetra_parallele.py ) ENDIF(NOT WIN32) From 5d57f4e2579153dda00e691664c27292bc0e3832 Mon Sep 17 00:00:00 2001 From: eap Date: Tue, 9 Nov 2021 15:22:19 +0300 Subject: [PATCH 3/9] bos #26515 [CEA 24622] Failing SMESH tests for failure at EDF --- .../blocFissure/CasTests/fissureCoude_6.py | 33 +++++++++++++------ .../blocFissure/CasTests/fissureCoude_7.py | 33 +++++++++++++------ .../blocFissure/CasTests/fissureCoude_8.py | 33 +++++++++++++------ 3 files changed, 69 insertions(+), 30 deletions(-) diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_6.py b/src/Tools/blocFissure/CasTests/fissureCoude_6.py index 394e29aee..646e647c0 100644 --- a/src/Tools/blocFissure/CasTests/fissureCoude_6.py +++ b/src/Tools/blocFissure/CasTests/fissureCoude_6.py @@ -106,13 +106,26 @@ class fissureCoude_6(fissureCoude): # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): - self.referencesMaillageFissure = dict( \ - Entity_Quad_Quadrangle = 7392, \ - Entity_Quad_Hexa = 9888, \ - Entity_Node = 62571, \ - Entity_Quad_Edge = 833, \ - Entity_Quad_Triangle = 1048, \ - Entity_Quad_Tetra = 7723, \ - Entity_Quad_Pyramid = 452, \ - Entity_Quad_Penta = 408 \ - ) + from salome.smesh import smeshBuilder + if smeshBuilder.NETGEN_VERSION_MAJOR < 6: + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 7392, \ + Entity_Quad_Hexa = 9888, \ + Entity_Node = 62571, \ + Entity_Quad_Edge = 833, \ + Entity_Quad_Triangle = 1048, \ + Entity_Quad_Tetra = 7723, \ + Entity_Quad_Pyramid = 452, \ + Entity_Quad_Penta = 408 \ + ) + else: + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 7392, \ + Entity_Quad_Hexa = 9888, \ + Entity_Node = 62361, \ + Entity_Quad_Edge = 833, \ + Entity_Quad_Triangle = 983, \ + Entity_Quad_Tetra = 7642, \ + Entity_Quad_Pyramid = 452, \ + Entity_Quad_Penta = 408 \ + ) diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_7.py b/src/Tools/blocFissure/CasTests/fissureCoude_7.py index f9e261752..5601392a0 100644 --- a/src/Tools/blocFissure/CasTests/fissureCoude_7.py +++ b/src/Tools/blocFissure/CasTests/fissureCoude_7.py @@ -107,13 +107,26 @@ class fissureCoude_7(fissureCoude): # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): - self.referencesMaillageFissure = dict( \ - Entity_Quad_Quadrangle = 7758, \ - Entity_Quad_Hexa = 10696, \ - Entity_Node = 71535, \ - Entity_Quad_Edge = 882, \ - Entity_Quad_Triangle = 1378, \ - Entity_Quad_Tetra = 10847, \ - Entity_Quad_Pyramid = 668, \ - Entity_Quad_Penta = 612 \ - ) + from salome.smesh import smeshBuilder + if smeshBuilder.NETGEN_VERSION_MAJOR < 6: + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 7758, \ + Entity_Quad_Hexa = 10696, \ + Entity_Node = 71535, \ + Entity_Quad_Edge = 882, \ + Entity_Quad_Triangle = 1378, \ + Entity_Quad_Tetra = 10847, \ + Entity_Quad_Pyramid = 668, \ + Entity_Quad_Penta = 612 \ + ) + else: + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 7758, \ + Entity_Quad_Hexa = 10696, \ + Entity_Node = 70936, \ + Entity_Quad_Edge = 881, \ + Entity_Quad_Triangle = 1300, \ + Entity_Quad_Tetra = 10449, \ + Entity_Quad_Pyramid = 668, \ + Entity_Quad_Penta = 612 \ + ) diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_8.py b/src/Tools/blocFissure/CasTests/fissureCoude_8.py index 490762022..502b3b0b7 100644 --- a/src/Tools/blocFissure/CasTests/fissureCoude_8.py +++ b/src/Tools/blocFissure/CasTests/fissureCoude_8.py @@ -107,13 +107,26 @@ class fissureCoude_8(fissureCoude): # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): - self.referencesMaillageFissure = dict( \ - Entity_Quad_Quadrangle = 4572, \ - Entity_Quad_Hexa = 5128, \ - Entity_Node = 45641, \ - Entity_Quad_Edge = 648, \ - Entity_Quad_Triangle = 1282, \ - Entity_Quad_Tetra = 11122, \ - Entity_Quad_Pyramid = 768, \ - Entity_Quad_Penta = 752 \ - ) + from salome.smesh import smeshBuilder + if smeshBuilder.NETGEN_VERSION_MAJOR < 6: + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 4572, \ + Entity_Quad_Hexa = 5128, \ + Entity_Node = 45641, \ + Entity_Quad_Edge = 648, \ + Entity_Quad_Triangle = 1282, \ + Entity_Quad_Tetra = 11122, \ + Entity_Quad_Pyramid = 768, \ + Entity_Quad_Penta = 752 \ + ) + else: + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 4572, \ + Entity_Quad_Hexa = 5128, \ + Entity_Node = 46393, \ + Entity_Quad_Edge = 648, \ + Entity_Quad_Triangle = 1286, \ + Entity_Quad_Tetra = 11686, \ + Entity_Quad_Pyramid = 768, \ + Entity_Quad_Penta = 752 \ + ) From e6fe1c835418f5dd05128f949fce2ad058a8f415 Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 11 Nov 2021 16:47:22 +0300 Subject: [PATCH 4/9] Tests under Windows in Debug mode. --- src/StdMeshers/StdMeshers_Cartesian_3D.cxx | 2 +- src/StdMeshers/StdMeshers_MEFISTO_2D.cxx | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/StdMeshers/StdMeshers_Cartesian_3D.cxx b/src/StdMeshers/StdMeshers_Cartesian_3D.cxx index dc82aa09a..62c3abba0 100644 --- a/src/StdMeshers/StdMeshers_Cartesian_3D.cxx +++ b/src/StdMeshers/StdMeshers_Cartesian_3D.cxx @@ -4458,7 +4458,7 @@ namespace // connect pn2 (probably new, at _eIntNodes) with a split - int i, iConn; + int i, iConn = 0; size_t nbCommon; TGeomID commonFaces[20]; _Node* nPrev = nullptr; diff --git a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx index 48b07193e..0222fa7e2 100644 --- a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx +++ b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx @@ -637,7 +637,11 @@ bool StdMeshers_MEFISTO_2D::LoadPoints(TWireVector & wires, m++; } - int mFirst = mOnVertex.front(), mLast = m - 1; + int mFirst = 0, mLast = 0; + if (!mOnVertex.empty()) { + mFirst = mOnVertex.front(); + mLast = m - 1; + } list< int >::iterator mIt = mOnVertex.begin(); for ( ; mIt != mOnVertex.end(); ++mIt) { From 51843b372c4c0f2cde4c0a02ce05827949f71753 Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 18 Nov 2021 14:34:56 +0300 Subject: [PATCH 5/9] #26655 EDF 24384 - Problem of Display --- src/SMESHGUI/SMESHGUI.cxx | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index 531901fd1..d7b4ed744 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -2082,7 +2082,20 @@ void SMESHGUI::OnEditDelete() SMESH::RemoveHypothesisOrAlgorithmOnMesh(IObject); aStudyBuilder->RemoveObjectWithChildren( SO ); } - else {// default action: remove SObject from the study + else {// default action: remove SObject from the study + // Find Sub-Meshes and Group and delete corresopning visual objects and actors + _PTR(ChildIterator) it1 = aStudy->NewChildIterator(SO); + for (it1->InitEx(false); it1->More(); it1->Next()) { + _PTR(SObject) SObj = it1->Value(); + if (!SObj) continue; + if (SObj->FindAttribute(anAttr, "AttributeIOR")) { + SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow(SMESH::SObjectToObject(SObj)); + SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow(SMESH::SObjectToObject(SObj)); + if (!aGroup->_is_nil() || !aSubMesh->_is_nil()) { + SMESH::RemoveVisualObjectWithActors(SObj->GetID().c_str(), true); + } + } + } // san - it's no use opening a transaction here until UNDO/REDO is provided in SMESH //SUIT_Operation *op = new SALOMEGUI_ImportOperation(myActiveStudy); //op->start(); From 9fafe89051529cc7c757b7da496727334a2d7f70 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 26 Nov 2021 13:38:12 +0300 Subject: [PATCH 6/9] Increment version: 9.8.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f4705da4..0e5371444 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ ENDIF() # Versioning # =========== -SALOME_SETUP_VERSION(9.7.0 DEVELOPMENT) +SALOME_SETUP_VERSION(9.8.0) MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"") # Find KERNEL From 254c02d6e18d97df01ad6840336af9420522480b Mon Sep 17 00:00:00 2001 From: eap Date: Sat, 27 Nov 2021 14:31:40 +0300 Subject: [PATCH 7/9] bos #26523 EDF 24234 - Viscous Layer bos #26544 EDF 11636 - crash with NETGEN 6 + viscous layer 1) fix 'Conditional jump or move depends on uninitialised value' 2) fix recomputing a FACE where shrink fails 3) fix angular smooth --- src/StdMeshers/StdMeshers_ViscousLayers.cxx | 38 +++++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/src/StdMeshers/StdMeshers_ViscousLayers.cxx b/src/StdMeshers/StdMeshers_ViscousLayers.cxx index fa4853668..552995128 100644 --- a/src/StdMeshers/StdMeshers_ViscousLayers.cxx +++ b/src/StdMeshers/StdMeshers_ViscousLayers.cxx @@ -3038,6 +3038,7 @@ void _ViscousBuilder::limitStepSizeByCurvature( _SolidData& data ) cnvFace._face = F; cnvFace._normalsFixed = false; cnvFace._isTooCurved = false; + cnvFace._normalsFixedOnBorders = false; double maxCurvature = cnvFace.GetMaxCurvature( data, eof, surfProp, helper ); if ( maxCurvature > 0 ) @@ -6565,6 +6566,7 @@ void _Smoother1D::prepare(_SolidData& data) _edgeDir[1] = getEdgeDir( E, leOnV[1]->_nodes[0], data.GetHelper() ); _leOnV[0]._cosin = Abs( leOnV[0]->_cosin ); _leOnV[1]._cosin = Abs( leOnV[1]->_cosin ); + _leOnV[0]._flags = _leOnV[1]._flags = 0; if ( _eos._sWOL.IsNull() ) // 3D for ( int iEnd = 0; iEnd < 2; ++iEnd ) _leOnV[iEnd]._cosin = Abs( _edgeDir[iEnd].Normalized() * leOnV[iEnd]->_normal ); @@ -11795,6 +11797,17 @@ bool _ViscousBuilder::shrink(_SolidData& theData) uvPtVec[ i ].param = helper.GetNodeU( E, edges[i]->_nodes[0] ); uvPtVec[ i ].SetUV( helper.GetNodeUV( F, edges[i]->_nodes.back() )); } + if ( uvPtVec[ 0 ].node == uvPtVec.back().node && // closed + helper.IsSeamShape( uvPtVec[ 0 ].node->GetShapeID() )) + { + uvPtVec[ 0 ].SetUV( helper.GetNodeUV( F, + edges[0]->_nodes.back(), + edges[1]->_nodes.back() )); + size_t i = edges.size() - 1; + uvPtVec[ i ].SetUV( helper.GetNodeUV( F, + edges[i ]->_nodes.back(), + edges[i-1]->_nodes.back() )); + } // if ( edges.empty() ) // continue; BRep_Tool::Range( E, uvPtVec[0].param, uvPtVec.back().param ); @@ -11811,8 +11824,12 @@ bool _ViscousBuilder::shrink(_SolidData& theData) smDS->Clear(); // compute the mesh on the FACE + TopTools_IndexedMapOfShape allowed(1); + allowed.Add( sm->GetSubShape() ); + sm->SetAllowedSubShapes( &allowed ); sm->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE ); sm->ComputeStateEngine( SMESH_subMesh::COMPUTE_SUBMESH ); + sm->SetAllowedSubShapes( nullptr ); // re-fill proxy sub-meshes of the FACE for ( size_t i = 0 ; i < _sdVec.size(); ++i ) @@ -12413,17 +12430,16 @@ gp_XY _SmoothNode::computeAngularPos(vector& uv, edgeSize.back() = edgeSize.front(); gp_XY newPos(0,0); - //int nbEdges = 0; - double sumSize = 0; + double sumWgt = 0; for ( size_t i = 1; i < edgeDir.size(); ++i ) { - if ( edgeDir[i-1].X() > 1. ) continue; - int i1 = i-1; + const int i1 = i-1; + if ( edgeDir[i1].X() > 1. ) continue; while ( edgeDir[i].X() > 1. && ++i < edgeDir.size() ); if ( i == edgeDir.size() ) break; gp_XY p = uv[i]; gp_XY norm1( -edgeDir[i1].Y(), edgeDir[i1].X() ); - gp_XY norm2( -edgeDir[i].Y(), edgeDir[i].X() ); + gp_XY norm2( -edgeDir[i ].Y(), edgeDir[i ].X() ); gp_XY bisec = norm1 + norm2; double bisecSize = bisec.Modulus(); if ( bisecSize < numeric_limits::min() ) @@ -12433,16 +12449,16 @@ gp_XY _SmoothNode::computeAngularPos(vector& uv, } bisec /= bisecSize; - gp_XY dirToN = uvToFix - p; - double distToN = dirToN.Modulus(); + gp_XY dirToN = uvToFix - p; + double distToN = bisec * dirToN; if ( bisec * dirToN < 0 ) distToN = -distToN; - newPos += ( p + bisec * distToN ) * ( edgeSize[i1] + edgeSize[i] ); - //++nbEdges; - sumSize += edgeSize[i1] + edgeSize[i]; + double wgt = edgeSize[i1] + edgeSize[i]; + newPos += ( p + bisec * distToN ) * wgt; + sumWgt += wgt; } - newPos /= /*nbEdges * */sumSize; + newPos /= sumWgt; return newPos; } From 4207944cd6c5427008b02d5c4af6e6e3ed0b3e81 Mon Sep 17 00:00:00 2001 From: eap Date: Sat, 27 Nov 2021 14:33:18 +0300 Subject: [PATCH 8/9] bos #26523 EDF 24234 - Viscous Layer fix computing a sole sub-mesh --- src/SMESH/SMESH_Gen.cxx | 2 +- src/SMESH/SMESH_subMesh.cxx | 2 +- src/SMESH_I/SMESH_Gen_i.cxx | 8 ++++---- src/Tools/blocFissure/doc/testcases.rst | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx index 65e59d98d..7b02701b3 100644 --- a/src/SMESH/SMESH_Gen.cxx +++ b/src/SMESH/SMESH_Gen.cxx @@ -376,7 +376,7 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, const TopoDS_Shape& aSubShape = smToCompute->GetSubShape(); const int aShapeDim = GetShapeDim( aSubShape ); - if ( aShapeDim < 1 || aSubShape.ShapeType() == shapeType ) + if ( aShapeDim < 1 || aSubShape.ShapeType() <= shapeType ) continue; // check for preview dimension limitations diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx index 23d72c5a0..6975f958b 100644 --- a/src/SMESH/SMESH_subMesh.cxx +++ b/src/SMESH/SMESH_subMesh.cxx @@ -2209,7 +2209,7 @@ TopoDS_Shape SMESH_subMesh::getCollection(SMESH_Gen * /*theGen*/, } } - return aCompound; + return theSubs.size() == 1 ? theSubs[0]->GetSubShape() : aCompound; } //======================================================================= diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx index 2632073a7..9fce23337 100644 --- a/src/SMESH_I/SMESH_Gen_i.cxx +++ b/src/SMESH_I/SMESH_Gen_i.cxx @@ -189,22 +189,22 @@ PortableServer::ServantBase_var SMESH_Gen_i::GetServant( CORBA::Object_ptr theOb } catch (PortableServer::POA::ObjectNotActive &ex) { - INFOS("GetServant: ObjectNotActive"); + MESSAGE("GetServant: ObjectNotActive"); return NULL; } catch (PortableServer::POA::WrongAdapter &ex) { - INFOS("GetServant: WrongAdapter: OK when several servants used to build several mesh in parallel..."); + MESSAGE("GetServant: WrongAdapter: OK when several servants used to build several mesh in parallel..."); return NULL; } catch (PortableServer::POA::WrongPolicy &ex) { - INFOS("GetServant: WrongPolicy"); + MESSAGE("GetServant: WrongPolicy"); return NULL; } catch (...) { - INFOS( "GetServant - Unknown exception was caught!!!" ); + MESSAGE( "GetServant - Unknown exception was caught!!!" ); return NULL; } } diff --git a/src/Tools/blocFissure/doc/testcases.rst b/src/Tools/blocFissure/doc/testcases.rst index 57dc09481..45eb7809d 100644 --- a/src/Tools/blocFissure/doc/testcases.rst +++ b/src/Tools/blocFissure/doc/testcases.rst @@ -95,7 +95,7 @@ All 16 cases are shown Table 2. Two views show the whole cracked structure and a | vis (Crack is in the radius filet between the screw head and the screw shank) | +--------------------------------------------+-----------------------------------------------+ |.. image:: images/13_vis_1.png | .. image:: images/13_vis_1_2.png | -| :width: 400 | :width: 400 | +| :width: 400 | :width: 400 | | :align: center | :align: center | +--------------------------------------------+-----------------------------------------------+ | tube | From 98cff9f2f4c81c27ac6f33a61fccae8b46821364 Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 29 Nov 2021 20:56:55 +0300 Subject: [PATCH 9/9] bos #26630 EDF 6032 - Problem of projection --- src/StdMeshers/StdMeshers_Projection_2D.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/StdMeshers/StdMeshers_Projection_2D.cxx b/src/StdMeshers/StdMeshers_Projection_2D.cxx index bbc874cf9..3e889f080 100644 --- a/src/StdMeshers/StdMeshers_Projection_2D.cxx +++ b/src/StdMeshers/StdMeshers_Projection_2D.cxx @@ -775,7 +775,7 @@ namespace { // check node positions - if ( !tgtFace.IsPartner( srcFace ) ) + // if ( !tgtFace.IsPartner( srcFace ) ) for NETGEN 6 which sets wrong UV { helper->ToFixNodeParameters( true );