Merge commit '9a170f0e1e02756cc5ea83e717a69ce72732f0b9'

diff --git a/doc/gui/input/parallel_compute.rst b/doc/gui/input/parallel_compute.rst
index 97d91db9e9bf3d028f7356d68c0c44f542d73c07..dab61fc4d6010dad038982714c83f35043710682 100644 (file)
--- a/doc/gui/input/parallel_compute.rst
+++ b/doc/gui/input/parallel_compute.rst
@@ -16,9 +16,8 @@ Parallel Computing
 The goal here is to speed up computation by running sub-meshes in parallel
 (multi-threading).
 
-*******
 Concept
-*******
+#######
 
 .. image:: ../images/diagram_parallel_mesh.png
 
@@ -36,9 +35,8 @@ Then we will compute all the solids in parallel. Having done the 1D+2D first
 ensure that all the solids can be computed without any concurrency.
 
 
-******
 How to
-******
+######
 
 You follow the same principle as the creation of a sequential Mesh.
 

diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx
index fd9da1f0f758657065c8e0820063be8a111b5300..18b6c3cdfe9687603d1dea4f8dacc19b5806ea71 100644 (file)
--- a/src/SMESH/SMESH_subMesh.cxx
+++ b/src/SMESH/SMESH_subMesh.cxx
@@ -891,7 +891,10 @@ SMESH_Hypothesis::Hypothesis_Status
           ret = SMESH_Hypothesis::HYP_INCOMPATIBLE;
       }
       else if (!_father->IsUsedHypothesis( anHyp, this ))
-        ret = SMESH_Hypothesis::HYP_INCOMPATIBLE;
+      {
+        if ( anHyp->GetDim() == this->GetAlgo()->GetDim() )
+          ret = SMESH_Hypothesis::HYP_INCOMPATIBLE;
+      }
 
       if (SMESH_Hypothesis::IsStatusFatal( ret ))
       {