fix conflict

[modules/med.git] / medtool / src / MEDLoader / MEDFileMeshLL.cxx

diff --git a/medtool/src/MEDLoader/MEDFileMeshLL.cxx b/medtool/src/MEDLoader/MEDFileMeshLL.cxx
index cf6177bebd19549aab5fe0654c51dfa18426def3..8fad6bf6ff89e36f3cc7fe4002686296848277d8 100644 (file)
--- a/medtool/src/MEDLoader/MEDFileMeshLL.cxx
+++ b/medtool/src/MEDLoader/MEDFileMeshLL.cxx
@@ -826,7 +826,7 @@ void MEDFileUMeshSplitL1::assignMesh(MEDCouplingUMesh *m, bool newOrOld)
   else
     {
       if(!m->checkConsecutiveCellTypesAndOrder(typmai2,typmai2+MED_N_CELL_FIXED_GEO))
-        throw INTERP_KERNEL::Exception("MEDFileUMeshSplitL1::assignMesh : the mode of mesh setting expects to follow the MED file numbering convention ! it is not the case !");
+        throw INTERP_KERNEL::Exception("MEDFileUMeshSplitL1::assignMesh(): the mesh does not follow the MED file numbering convention! Invoke sortCellsInMEDFileFrmt() first!");
       m->incrRef();
       _m_by_types.assignUMesh(m);
     }