22483: EDF 2772 SMESH: Define several 3D viscous layer hypotheses on the same Geometry

diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
index ff2cc3f96cf5fb4cd81ad1f55500ab64b6e05f70..039c8f65d720d543f82ddcc41374540d84fab4c4 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
@@ -932,8 +932,8 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry&           occgeom,
       while ( fID < faceNgID ) // geomFace is already in occgeom.fmap, add a copy
         fID = occgeom.fmap.Add( BRepBuilderAPI_Copy( geomFace, /*copyGeom=*/false ));
       // Problem with the second order in a quadrangular mesh remains.
-      // 1) All quadrangles geberated by NETGEN are moved to an inexistent face
-      //    by FillSMesh() (find AddFaceDescriptor)
+      // 1) All quadrangles generated by NETGEN are moved to an inexistent face
+      //    by FillSMesh() (find "AddFaceDescriptor")
       // 2) Temporary triangles generated by StdMeshers_QuadToTriaAdaptor
       //    are on faces where quadrangles were.
       // Due to these 2 points, wrong geom faces are used while conversion to qudratic

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
index 4cbe7bec2b570c556ef7d12c99eaf17376d8c111..1515b309ff7bb45cc80403b6c6c7e4cd1b6cd6aa 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
@@ -173,6 +173,14 @@ bool NETGENPlugin_NETGEN_2D_ONLY::CheckHypothesis (SMESH_Mesh&         aMesh,
   else
     aStatus = HYP_OK;
 
+  if ( aStatus == HYP_OK && _hypParameters && _hypQuadranglePreference )
+  {
+    aStatus = HYP_INCOMPAT_HYPS;
+    return error(SMESH_Comment("\"") << _hypQuadranglePreference->GetName()
+                 << "\" and \"" << _hypParameters->GetName()
+                 << "\" are incompatible hypotheses");
+  }
+
   return ( aStatus == HYP_OK );
 }