Salome HOME
22261: EDF 2698 SMESH: Memory leak when displaying 2D quadratic elements as arcs
[modules/smesh.git] / src / SMESH_I / SMESH_Gen_i.cxx
index d9c404cd93a4b90b4425cbecf6cb4fc7b82a0e42..411b111ee4c6616d82b11f8c1ee11b6e71e36445 100644 (file)
@@ -1,32 +1,28 @@
-//  SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  File   : SMESH_Gen_i.cxx
 //  Author : Paul RASCLE, EDF
 //  Module : SMESH
-//  $Header$
 
-using namespace std;
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
@@ -41,1480 +37,604 @@ using namespace std;
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopTools_MapOfShape.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <gp_Pnt.hxx>
 #include <BRep_Tool.hxx>
 #include <TCollection_AsciiString.hxx>
-
-#include <fstream>
-#include <stdio.h>
+#include <OSD.hxx>
+
+#ifdef WNT
+ #include <windows.h>
+ #include <process.h>
+#else
+ #include <dlfcn.h>
+#endif
+
+#ifdef WNT
+ #define LibHandle HMODULE
+ #define LoadLib( name ) LoadLibrary( name )
+ #define GetProc GetProcAddress
+ #define UnLoadLib( handle ) FreeLibrary( handle );
+#else
+ #define LibHandle void*
+ #define LoadLib( name ) dlopen( name, RTLD_LAZY )
+ #define GetProc dlsym
+ #define UnLoadLib( handle ) dlclose( handle );
+#endif
 
 #include "SMESH_Gen_i.hxx"
-#include "SMESH_Mesh_i.hxx"
-#include "SMESH_LocalLength_i.hxx"
-#include "SMESH_NumberOfSegments_i.hxx"
-#include "SMESH_MaxElementArea_i.hxx"
-#include "SMESH_MaxElementVolume_i.hxx"
-
-#include "SMESHDS_Document.hxx"
+#include "SMESH_version.h"
 
-#include "Document_Reader.h"
 #include "DriverMED_W_SMESHDS_Mesh.h"
 #include "DriverMED_R_SMESHDS_Mesh.h"
-#include "DriverMED_R_SMESHDS_Document.h"
-#include "DriverUNV_R_SMESHDS_Document.h"
-#include "DriverDAT_R_SMESHDS_Document.h"
+#ifdef WITH_CGNS
+#include "DriverCGNS_Read.hxx"
+#endif
+#include "MED_Factory.hxx"
+#include "SMDS_EdgePosition.hxx"
+#include "SMDS_FacePosition.hxx"
+#include "SMDS_PolyhedralVolumeOfNodes.hxx"
+#include "SMDS_SetIterator.hxx"
+#include "SMDS_SpacePosition.hxx"
+#include "SMDS_VertexPosition.hxx"
+#include "SMESHDS_Document.hxx"
+#include "SMESHDS_Group.hxx"
+#include "SMESHDS_GroupOnGeom.hxx"
+#include "SMESH_Algo_i.hxx"
+#include "SMESH_File.hxx"
+#include "SMESH_Group.hxx"
+#include "SMESH_Group_i.hxx"
+#include "SMESH_Hypothesis.hxx"
+#include "SMESH_Hypothesis_i.hxx"
+#include "SMESH_Mesh.hxx"
+#include "SMESH_MeshEditor.hxx"
+#include "SMESH_Mesh_i.hxx"
+#include "SMESH_PreMeshInfo.hxx"
+#include "SMESH_PythonDump.hxx"
+#include "memoire.h"
+
+#include CORBA_SERVER_HEADER(SMESH_Group)
+#include CORBA_SERVER_HEADER(SMESH_Filter)
+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
+
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <GEOM_Client.hxx>
 
-#include "SALOMEDS_Tool.hxx"
-#include "SALOME_NamingService.hxx"
-#include "SALOME_LifeCycleCORBA.hxx"
-#include "Utils_SINGLETON.hxx"
-#include "OpUtil.hxx"
+#include <Basics_Utils.hxx>
+#include <HDFOI.hxx>
+#include <OpUtil.hxx>
+#include <SALOMEDS_Tool.hxx>
+#include <SALOME_Container_i.hxx>
+#include <SALOME_LifeCycleCORBA.hxx>
+#include <SALOME_NamingService.hxx>
+#include <Utils_CorbaException.hxx>
+#include <Utils_ExceptHandlers.hxx>
+#include <Utils_SINGLETON.hxx>
+#include <utilities.h>
 
-//#include <TopAbs_ShapeEnum.hxx>
+#include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
+#include CORBA_CLIENT_HEADER(SALOME_Session)
 
-#include "GEOM_Client.hxx"
+// helpers about SALOME::GenericObj
+#include <SALOMEDS_wrap.hxx>
+#include <SALOMEDS_Attributes_wrap.hxx>
+#include <GEOM_wrap.hxx>
 
 #include <map>
+#include <fstream>
+#include <cstdio>
+#include <cstdlib>
+
+using namespace std;
+using SMESH::TPythonDump;
+using SMESH::TVar;
 
-#define NUM_TMP_FILES 4
+#define NUM_TMP_FILES 2
 
-// Tags definition 
-long Tag_HypothesisRoot  = 1;
-long Tag_AlgorithmsRoot  = 2;
+#ifdef _DEBUG_
+static int MYDEBUG = 0;
+#else
+static int MYDEBUG = 0;
+#endif
 
-long Tag_RefOnShape      = 1;
-long Tag_RefOnAppliedHypothesis = 2;
-long Tag_RefOnAppliedAlgorithms = 3;
+// Static variables definition
+GEOM::GEOM_Gen_var      SMESH_Gen_i::myGeomGen = GEOM::GEOM_Gen::_nil();
+CORBA::ORB_var          SMESH_Gen_i::myOrb;
+PortableServer::POA_var SMESH_Gen_i::myPoa;
+SALOME_NamingService*   SMESH_Gen_i::myNS  = NULL;
+SALOME_LifeCycleCORBA*  SMESH_Gen_i::myLCC = NULL;
+SMESH_Gen_i*            SMESH_Gen_i::mySMESHGen = NULL;
 
-long Tag_SubMeshOnVertex = 4;
-long Tag_SubMeshOnEdge = 5;
-long Tag_SubMeshOnFace = 6;
-long Tag_SubMeshOnSolid = 7;
-long Tag_SubMeshOnCompound = 8;
 
+const int nbElemPerDiagonal = 10;
 
 //=============================================================================
 /*!
- *  default constructor: not for use
+ *  GetServant [ static ]
+ *
+ *  Get servant of the CORBA object
  */
 //=============================================================================
 
-SMESH_Gen_i::SMESH_Gen_i()
+PortableServer::ServantBase_var SMESH_Gen_i::GetServant( CORBA::Object_ptr theObject )
 {
-  MESSAGE("SMESH_Gen_i default constructor");
-  // ****
+  if( CORBA::is_nil( theObject ) || CORBA::is_nil( GetPOA() ) )
+    return NULL;
+  try {
+    PortableServer::Servant aServant = GetPOA()->reference_to_servant( theObject );
+    return aServant;
+  }
+  catch (...) {
+    INFOS( "GetServant - Unknown exception was caught!!!" );
+    return NULL;
+  }
 }
 
 //=============================================================================
 /*!
- *  Standard constructor, used with Container.
+ *  SObjectToObject [ static ]
+ *
+ *  Get CORBA object corresponding to the SALOMEDS::SObject
  */
 //=============================================================================
 
-SMESH_Gen_i::SMESH_Gen_i(CORBA::ORB_ptr orb,
-              PortableServer::POA_ptr poa,
-              PortableServer::ObjectId * contId, 
-              const char *instanceName, 
-                         const char *interfaceName) :
-  Engines_Component_i(orb, poa, contId, instanceName, interfaceName)
+CORBA::Object_var SMESH_Gen_i::SObjectToObject( SALOMEDS::SObject_ptr theSObject )
 {
-  MESSAGE("activate object");
-  _thisObj = this ;
-  _id = _poa->activate_object(_thisObj);
-
-  _ShapeReader = NULL;
-  _localId = 0;  // number of created objects & local id 
-
+  SALOMEDS::GenericAttribute_wrap anAttr;
+  CORBA::Object_var anObj;
+  if ( !theSObject->_is_nil() ) {
+    try {
+      if( theSObject->FindAttribute( anAttr.inout(), "AttributeIOR" ) ) {
+        SALOMEDS::AttributeIOR_wrap anIOR  = anAttr;
+        CORBA::String_var aValue = anIOR->Value();
+        if( strcmp( aValue, "" ) != 0 )
+          anObj = GetORB()->string_to_object( aValue );
+      }
+    }
+    catch( ... ) {
+      INFOS( "SObjectToObject - Unknown exception was caught!!!" );
+    }
+  }
+  return anObj;
 }
 
 //=============================================================================
 /*!
- *  Standard destructor
+ *  GetNS [ static ]
+ *
+ *  Get SALOME_NamingService object
  */
 //=============================================================================
 
-SMESH_Gen_i::~SMESH_Gen_i()
+SALOME_NamingService* SMESH_Gen_i::GetNS()
 {
-  MESSAGE("~SMESH_Gen_i");
-  // ****
+  if ( myNS == NULL ) {
+    myNS = SINGLETON_<SALOME_NamingService>::Instance();
+    ASSERT(SINGLETON_<SALOME_NamingService>::IsAlreadyExisting());
+    myNS->init_orb( GetORB() );
+  }
+  return myNS;
 }
-  
+
 //=============================================================================
 /*!
- *  
+ *  GetLCC [ static ]
+ *
+ *  Get SALOME_LifeCycleCORBA object
  */
 //=============================================================================
+SALOME_LifeCycleCORBA*  SMESH_Gen_i::GetLCC() {
+  if ( myLCC == NULL ) {
+    myLCC = new SALOME_LifeCycleCORBA( GetNS() );
+  }
+  return myLCC;
+}
 
-SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::CreateHypothesis(const char* anHyp,
-                                                          CORBA::Long studyId)
-  throw (SALOME::SALOME_Exception)
-{
-  MESSAGE("CreateHypothesis");
-
-  // create a new hypothesis object servant
-
-  SMESH_Hypothesis_i* myHypothesis_i = 0;
-  try
-    {
-      myHypothesis_i = _hypothesisFactory_i.Create(anHyp,
-                                                   studyId,
-                                                   &_impl);
-    }
-  catch (SALOME_Exception& S_ex)
-    {
-      THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM);
-    }
-
-  // activate the CORBA servant of hypothesis
 
-  SMESH::SMESH_Hypothesis_var hypothesis_i
-    = SMESH::SMESH_Hypothesis::_narrow(myHypothesis_i->_this());
-  return SMESH::SMESH_Hypothesis::_duplicate(hypothesis_i);
-}
-  
 //=============================================================================
 /*!
- *  
+ *  GetGeomEngine [ static ]
+ *
+ *  Get GEOM::GEOM_Gen reference
  */
 //=============================================================================
-
-SMESH::SMESH_Mesh_ptr SMESH_Gen_i::Init(GEOM::GEOM_Gen_ptr geomEngine,
-                                        CORBA::Long studyId,
-                                        GEOM::GEOM_Shape_ptr aShape)
-  throw (SALOME::SALOME_Exception)
-{
-  MESSAGE("Init");
-  // _narrow() duplicates the reference and checks the type
-  GEOM::GEOM_Gen_var geom = GEOM::GEOM_Gen::_narrow(geomEngine);
-  GEOM::GEOM_Shape_var myShape = GEOM::GEOM_Shape::_narrow(aShape);
-
-  if (CORBA::is_nil(geom))
-    THROW_SALOME_CORBA_EXCEPTION("bad geom reference", \
-                                 SALOME::BAD_PARAM);
-  if (CORBA::is_nil(myShape))
-    THROW_SALOME_CORBA_EXCEPTION("bad shape reference", \
-                                 SALOME::BAD_PARAM);
-
-  // Get or create the GEOM_Client instance
-
-  SMESH_Mesh_i* meshServant = 0;
-  try
-    {
-      if (! _ShapeReader) _ShapeReader = new GEOM_Client();
-      ASSERT(_ShapeReader);
-      
-      // explore main Shape, get local TopoDS_Shapes of all subShapes
-      //  SMESH_topo* myTopo = ExploreMainShape(geom, studyId, myShape);
-      
-      // Get studyContext_i, create it if it does'nt exist
-      
-      if (_mapStudyContext_i.find(studyId) == _mapStudyContext_i.end())
-        {
-          _mapStudyContext_i[studyId] = new StudyContext_iStruct;      
-        }
-      StudyContext_iStruct* myStudyContext = _mapStudyContext_i[studyId];
-      
-      // create a new mesh object servant, store it in a map in study context
-      
-      meshServant = new SMESH_Mesh_i(this,
-                                     geom,
-                                     studyId,
-                                     _localId);
-      myStudyContext->mapMesh_i[_localId] = meshServant;
-      _localId++;
-
-      // create a new mesh object
-      
-      TopoDS_Shape myLocShape  = _ShapeReader->GetShape(geom,myShape);
-      meshServant->SetImpl(_impl.Init(studyId, myLocShape));
-    }
-  catch (SALOME_Exception& S_ex)
-    {
-      THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM);
-    }
-
-  // activate the CORBA servant of Mesh
-  
-  SMESH::SMESH_Mesh_var mesh
-    = SMESH::SMESH_Mesh::_narrow(meshServant->_this());
-  
-  meshServant->SetIor(mesh);
-
-  return SMESH::SMESH_Mesh::_duplicate(mesh);
+GEOM::GEOM_Gen_var SMESH_Gen_i::GetGeomEngine() {
+  //CCRT GEOM::GEOM_Gen_var aGeomEngine =
+  //CCRT   GEOM::GEOM_Gen::_narrow( GetLCC()->FindOrLoad_Component("FactoryServer","GEOM") );
+  //CCRT return aGeomEngine._retn();
+  if(CORBA::is_nil(myGeomGen))
+  {
+    Engines::EngineComponent_ptr temp=GetLCC()->FindOrLoad_Component("FactoryServer","GEOM");
+    myGeomGen=GEOM::GEOM_Gen::_narrow(temp);
+  }
+  return myGeomGen;
 }
-  
 
 //=============================================================================
 /*!
- *  
+ *  SMESH_Gen_i::SMESH_Gen_i
+ *
+ *  Default constructor: not for use
  */
 //=============================================================================
 
-CORBA::Boolean SMESH_Gen_i::IsReadyToCompute(SMESH::SMESH_Mesh_ptr aMesh,
-                                             GEOM::GEOM_Shape_ptr aShape)
-  throw (SALOME::SALOME_Exception)
+SMESH_Gen_i::SMESH_Gen_i()
 {
-  MESSAGE("SMESH_Gen_i::IsReadyToCompute");
-  return true;
+  INFOS( "SMESH_Gen_i::SMESH_Gen_i : default constructor" );
 }
 
 //=============================================================================
 /*!
- *  
+ *  SMESH_Gen_i::SMESH_Gen_i
+ *
+ *  Standard constructor, used with Container
  */
 //=============================================================================
 
-  SMESH::long_array* 
-  SMESH_Gen_i::GetSubShapesId(GEOM::GEOM_Gen_ptr geomEngine,
-                              CORBA::Long studyId,
-                              GEOM::GEOM_Shape_ptr mainShape,
-                              const SMESH::shape_array& listOfSubShape)
-    throw (SALOME::SALOME_Exception)
+SMESH_Gen_i::SMESH_Gen_i( CORBA::ORB_ptr            orb,
+                          PortableServer::POA_ptr   poa,
+                          PortableServer::ObjectId* contId,
+                          const char*               instanceName,
+                          const char*               interfaceName )
+     : Engines_Component_i( orb, poa, contId, instanceName, interfaceName )
 {
-  MESSAGE("SMESH_Gen_i::GetSubShapesId");
-  SMESH::long_array_var shapesId = new SMESH::long_array;
-  set<int> setId;
-
-  GEOM::GEOM_Gen_var geom = GEOM::GEOM_Gen::_narrow(geomEngine);
-  GEOM::GEOM_Shape_var myShape = GEOM::GEOM_Shape::_narrow(mainShape);
+  MESSAGE( "SMESH_Gen_i::SMESH_Gen_i : standard constructor" );
 
-  if (CORBA::is_nil(geom))
-    THROW_SALOME_CORBA_EXCEPTION("bad geom reference", \
-                                 SALOME::BAD_PARAM);
-  if (CORBA::is_nil(myShape))
-    THROW_SALOME_CORBA_EXCEPTION("bad shape reference", \
-                                 SALOME::BAD_PARAM);
-
-  try
-    {
-      if (! _ShapeReader) _ShapeReader = new GEOM_Client();
-      ASSERT(_ShapeReader);
-      TopoDS_Shape myMainShape  = _ShapeReader->GetShape(geom,myShape);
-      TopTools_IndexedMapOfShape myIndexToShape;      
-      TopExp::MapShapes(myMainShape,myIndexToShape);
+  myOrb = CORBA::ORB::_duplicate(orb);
+  myPoa = PortableServer::POA::_duplicate(poa);
 
-      for (int i=0; i<listOfSubShape.length(); i++)
-       {
-         GEOM::GEOM_Shape_var aShape
-           = GEOM::GEOM_Shape::_narrow(listOfSubShape[i]);
-         if (CORBA::is_nil(aShape))
-           THROW_SALOME_CORBA_EXCEPTION("bad shape reference", \
-                                        SALOME::BAD_PARAM);
-         TopoDS_Shape locShape  = _ShapeReader->GetShape(geom,aShape);
-         for (TopExp_Explorer exp(locShape,TopAbs_FACE); exp.More(); exp.Next())
-           {
-             const TopoDS_Face& F = TopoDS::Face(exp.Current());
-             setId.insert(myIndexToShape.FindIndex(F));
-             SCRUTE(myIndexToShape.FindIndex(F));
-           }
-         for (TopExp_Explorer exp(locShape,TopAbs_EDGE); exp.More(); exp.Next())
-           {
-             const TopoDS_Edge& E = TopoDS::Edge(exp.Current());
-             setId.insert(myIndexToShape.FindIndex(E));
-             SCRUTE(myIndexToShape.FindIndex(E));
-           }
-         for (TopExp_Explorer exp(locShape,TopAbs_VERTEX); exp.More(); exp.Next())
-           {
-             const TopoDS_Vertex& V = TopoDS::Vertex(exp.Current());
-             setId.insert(myIndexToShape.FindIndex(V));
-             SCRUTE(myIndexToShape.FindIndex(V));
-           }
-       }
-      shapesId->length(setId.size());
-      set<int>::iterator iind;
-      int i=0;
-      for (iind = setId.begin(); iind != setId.end(); iind++)
-       {
-         SCRUTE((*iind));
-         shapesId[i] = (*iind);
-         SCRUTE(shapesId[i]);
-         i++;
-       }
-    }
-  catch (SALOME_Exception& S_ex)
+  _thisObj = this ;
+  _id = myPoa->activate_object( _thisObj );
+
+  myIsEmbeddedMode = false;
+  myShapeReader = NULL;  // shape reader
+  mySMESHGen = this;
+  myIsHistoricalPythonDump = true;
+  myToForgetMeshDataOnHypModif = false;
+
+  // set it in standalone mode only
+  //OSD::SetSignal( true );
+
+  // 0020605: EDF 1190 SMESH: Display performance. 80 seconds for 52000 cells.
+  // find out mode (embedded or standalone) here else
+  // meshes created before calling SMESH_Client::GetSMESHGen(), which calls
+  // SMESH_Gen_i::SetEmbeddedMode(), have wrong IsEmbeddedMode flag
+  if ( SALOME_NamingService* ns = GetNS() )
+  {
+    CORBA::Object_var obj = ns->Resolve( "/Kernel/Session" );
+    SALOME::Session_var session = SALOME::Session::_narrow( obj ) ;
+    if ( !session->_is_nil() )
     {
-      THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM);
+      CORBA::String_var str_host = session->getHostname();
+      CORBA::Long        s_pid = session->getPID();
+      string my_host = Kernel_Utils::GetHostname();
+#ifdef WNT
+      long    my_pid = (long)_getpid();
+#else
+      long    my_pid = (long) getpid();
+#endif
+      SetEmbeddedMode( s_pid == my_pid && my_host == str_host.in() );
     }
-
-  return shapesId._retn();
+  }
 }
 
 //=============================================================================
 /*!
- *  
+ *  SMESH_Gen_i::~SMESH_Gen_i
+ *
+ *  Destructor
  */
 //=============================================================================
 
-CORBA::Boolean SMESH_Gen_i::Compute(SMESH::SMESH_Mesh_ptr aMesh,
-                                    GEOM::GEOM_Shape_ptr aShape)
-  throw (SALOME::SALOME_Exception)
+SMESH_Gen_i::~SMESH_Gen_i()
 {
-  MESSAGE("SMESH_Gen_i::Compute");
-  GEOM::GEOM_Shape_var myShape = GEOM::GEOM_Shape::_narrow(aShape);
-  if (CORBA::is_nil(myShape))
-    THROW_SALOME_CORBA_EXCEPTION("bad shape reference", \
-                                 SALOME::BAD_PARAM);
-
-  SMESH::SMESH_Mesh_var myMesh = SMESH::SMESH_Mesh::_narrow(aMesh);
-  if (CORBA::is_nil(myMesh))
-    THROW_SALOME_CORBA_EXCEPTION("bad Mesh reference", \
-                                 SALOME::BAD_PARAM);
-
-  bool ret = false;
-  try
-    {
-      
-      // get study context from studyId given by CORBA mesh object
-      
-      int studyId = myMesh->GetStudyId();
-      ASSERT(_mapStudyContext_i.find(studyId) != _mapStudyContext_i.end());
-      StudyContext_iStruct* myStudyContext = _mapStudyContext_i[studyId];
-      
-      // get local Mesh_i object with Id and study context 
-      
-      int meshId = myMesh->GetId();
-      ASSERT(myStudyContext->mapMesh_i.find(meshId) != myStudyContext->mapMesh_i.end());
-      SMESH_Mesh_i* meshServant = myStudyContext->mapMesh_i[meshId];
-      ASSERT(meshServant);
-      
-      // get local TopoDS_Shape
-      
-      GEOM::GEOM_Gen_var geom = meshServant->GetGeomEngine();
-      TopoDS_Shape myLocShape  = _ShapeReader->GetShape(geom,myShape);
+  MESSAGE( "SMESH_Gen_i::~SMESH_Gen_i" );
 
-      // implementation compute
-      
-      ::SMESH_Mesh& myLocMesh = meshServant->GetImpl();
-      ret = _impl.Compute(myLocMesh, myLocShape);
-    }
-  catch (SALOME_Exception& S_ex)
-    {
-      MESSAGE("catch exception "<< S_ex.what());
-      return false;
-//       THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM);
-    }
+  // delete hypothesis creators
+  map<string, GenericHypothesisCreator_i*>::iterator itHyp;
+  for (itHyp = myHypCreatorMap.begin(); itHyp != myHypCreatorMap.end(); itHyp++)
+  {
+    delete (*itHyp).second;
+  }
+  myHypCreatorMap.clear();
 
-  return ret;
+  // Clear study contexts data
+  map<int, StudyContext*>::iterator it;
+  for ( it = myStudyContextMap.begin(); it != myStudyContextMap.end(); ++it ) {
+    delete it->second;
+  }
+  myStudyContextMap.clear();
+  // delete shape reader
+  if ( myShapeReader )
+    delete myShapeReader;
 }
 
-
 //=============================================================================
 /*!
- *  
+ *  SMESH_Gen_i::createHypothesis
+ *
+ *  Create hypothesis of given type
  */
 //=============================================================================
-
-SALOMEDS::TMPFile* SMESH_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
-                                    const char* theURL,
-                                    bool isMultiFile)
+SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName,
+                                                          const char* theLibName)
+     throw (SALOME::SALOME_Exception)
 {
-  MESSAGE("SMESH_Gen_i::SAVE");
-  SALOMEDS::Study_var Study = theComponent->GetStudy(); 
-  int studyId;
-  
-  // Declare a byte stream
-  SALOMEDS::TMPFile_var aStreamFile;
-  
-  // Obtain a temporary dir
-  TCollection_AsciiString tmpDir = (isMultiFile)?TCollection_AsciiString((char*)theURL):SALOMEDS_Tool::GetTmpDir();
+  /* It's Need to tranlate lib name for WIN32 or X platform */
+  char* aPlatformLibName = 0;
+  if ( theLibName && theLibName[0] != '\0'  )
+  {
+    int libNameLen = strlen(theLibName);
+    //check for old format "libXXXXXXX.so"
+    if (libNameLen > 7 &&
+        !strncmp( theLibName, "lib", 3 ) &&
+        !strcmp( theLibName+libNameLen-3, ".so" ))
+    {
+      //the old format
+#ifdef WNT
+      aPlatformLibName = new char[libNameLen - 1];
+      aPlatformLibName[0] = '\0';
+      aPlatformLibName = strncat( aPlatformLibName, theLibName+3, libNameLen-6  );
+      aPlatformLibName = strcat( aPlatformLibName, ".dll" );
+      aPlatformLibName[libNameLen - 2] = '\0';
+#else
+      aPlatformLibName = new char[ libNameLen + 1];
+      aPlatformLibName[0] = '\0';
+      aPlatformLibName = strcat( aPlatformLibName, theLibName );
+      aPlatformLibName[libNameLen] = '\0';
+#endif
+    }
+    else
+    {
+      //try to use new format
+#ifdef WNT
+      aPlatformLibName = new char[ libNameLen + 5 ];
+      aPlatformLibName[0] = '\0';
+      aPlatformLibName = strcat( aPlatformLibName, theLibName );
+      aPlatformLibName = strcat( aPlatformLibName, ".dll" );
+#else
+      aPlatformLibName = new char[ libNameLen + 7 ];
+      aPlatformLibName[0] = '\0';
+      aPlatformLibName = strcat( aPlatformLibName, "lib" );
+      aPlatformLibName = strcat( aPlatformLibName, theLibName );
+      aPlatformLibName = strcat( aPlatformLibName, ".so" );
+#endif
+    }
+  }
 
-  // Create a sequence of files processed
-  SALOMEDS::ListOfFileNames_var aFileSeq = new SALOMEDS::ListOfFileNames;
-  aFileSeq->length(NUM_TMP_FILES);
 
-  TCollection_AsciiString aStudyName(SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL()));
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "Create Hypothesis <" << theHypName << "> from " << aPlatformLibName/*theLibName*/);
 
-  // Set names of temporary files
-  TCollection_AsciiString filename = aStudyName + TCollection_AsciiString("SMESH.hdf");
-  TCollection_AsciiString hypofile = aStudyName + TCollection_AsciiString("SMESH_Hypo.txt");
-  TCollection_AsciiString algofile = aStudyName + TCollection_AsciiString("SMESH_Algo.txt");
-  TCollection_AsciiString meshfile = aStudyName + TCollection_AsciiString("SMESH_Mesh.med");
-  aFileSeq[0] = CORBA::string_dup(filename.ToCString());
-  aFileSeq[1] = CORBA::string_dup(hypofile.ToCString());
-  aFileSeq[2] = CORBA::string_dup(algofile.ToCString());
-  aFileSeq[3] = CORBA::string_dup(meshfile.ToCString());
-  filename = tmpDir + filename;
-  hypofile = tmpDir + hypofile;
-  algofile = tmpDir + algofile;
-  meshfile = tmpDir + meshfile;
+  // create a new hypothesis object servant
+  SMESH_Hypothesis_i* myHypothesis_i = 0;
+  SMESH::SMESH_Hypothesis_var hypothesis_i;
 
-  HDFfile * hdf_file;
-  map <int,HDFgroup*> hdf_group, hdf_subgroup;
-  map <int,HDFdataset*> hdf_dataset;
-  FILE* destFile;
-
-  SALOMEDS::ChildIterator_var itBig,it,itSM;
-  SALOMEDS::SObject_var mySObject,myBranch,mySObjectChild;
-  hdf_size size[1];
-  int longueur,cmpt_ds = 0,cmpt_it;
-  char *name_group,name_dataset[30],name_meshgroup[30];
-  bool ok,_found;
-  int cmpt_sm = 0, myTag;
-
-//************* HDF file creation
-  hdf_file = new HDFfile(filename.ToCString());
-  hdf_file->CreateOnDisk();
-//****************************
-
-  itBig = Study->NewChildIterator(theComponent);
-  for (; itBig->More();itBig->Next()) {
-    SALOMEDS::SObject_var gotBranch = itBig->Value();
-
-//************branch 1 : hypothesis
-    if (gotBranch->Tag()==Tag_HypothesisRoot) { //hypothesis = tag 1
-
-      double length,maxElementsArea,maxElementsVolume;
-      int numberOfSegments;
-
-      destFile = fopen( hypofile.ToCString() ,"w");
-      it = Study->NewChildIterator(gotBranch);
-      for (; it->More();it->Next()) {
-        mySObject = it->Value();
-        SALOMEDS::GenericAttribute_var anAttr;
-        SALOMEDS::AttributeIOR_var anIOR;
-        if ( mySObject->FindAttribute(anAttr, "AttributeIOR")) {
-          anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-
-          SMESH::SMESH_Hypothesis_var myHyp = SMESH::SMESH_Hypothesis::_narrow(_orb->string_to_object(anIOR->Value()));
-          fprintf(destFile,"%s\n",myHyp->GetName());
-          
-          if (strcmp(myHyp->GetName(),"LocalLength")==0) {
-            SMESH::SMESH_LocalLength_var LL = SMESH::SMESH_LocalLength::_narrow( myHyp );
-            length = LL->GetLength();
-            fprintf(destFile,"%f\n",length);
-          }
-          else if (strcmp(myHyp->GetName(),"NumberOfSegments")==0) {
-            SMESH::SMESH_NumberOfSegments_var NOS = SMESH::SMESH_NumberOfSegments::_narrow( myHyp );
-            numberOfSegments = NOS->GetNumberOfSegments();
-            fprintf(destFile,"%d\n",numberOfSegments);
-          }
-          else if (strcmp(myHyp->GetName(),"MaxElementArea")==0) {
-            SMESH::SMESH_MaxElementArea_var MEA = SMESH::SMESH_MaxElementArea::_narrow( myHyp );
-            maxElementsArea = MEA->GetMaxElementArea();
-            fprintf(destFile,"%f\n",maxElementsArea);
-          }
-          else if (strcmp(myHyp->GetName(),"MaxElementVolume")==0) {
-            SMESH::SMESH_MaxElementVolume_var MEV = SMESH::SMESH_MaxElementVolume::_narrow( myHyp );
-            maxElementsVolume = MEV->GetMaxElementVolume();
-            fprintf(destFile,"%f\n",maxElementsVolume);
-          }
-        }
+  try
+  {
+    // check, if creator for this hypothesis type already exists
+    if (myHypCreatorMap.find(string(theHypName)) == myHypCreatorMap.end())
+    {
+      // load plugin library
+      if(MYDEBUG) MESSAGE("Loading server meshers plugin library ...");
+      LibHandle libHandle = LoadLib( aPlatformLibName/*theLibName*/ );
+      if (!libHandle)
+      {
+        // report any error, if occured
+#ifndef WNT
+        const char* anError = dlerror();
+        throw(SALOME_Exception(anError));
+#else
+        throw(SALOME_Exception(LOCALIZED( "Can't load server meshers plugin library" )));
+#endif
       }
-      fclose(destFile);
-
-//writes the file name in the hdf file
-      longueur = hypofile.Length() +1;
-      name_group="Hypothesis";
-      //SCRUTE(name_group);
-      
-      size[0]=longueur;
-      hdf_group[1] = new HDFgroup(name_group,hdf_file);
-      hdf_group[1]->CreateOnDisk();
-      
-      hdf_dataset[cmpt_ds]=new HDFdataset(name_group,hdf_group[1],HDF_STRING,size,1);
-      hdf_dataset[cmpt_ds]->CreateOnDisk();
-      hdf_dataset[cmpt_ds]->WriteOnDisk(hypofile.ToCString());
-      hdf_dataset[cmpt_ds]->CloseOnDisk();
-      cmpt_ds++;
-      
-      hdf_group[1]->CloseOnDisk();
-      MESSAGE("End of Hypothesis Save");
 
-    }
-//************branch 2 : algorithms
-    else if (gotBranch->Tag()==Tag_AlgorithmsRoot) {//algos = tag 2
-      
-      destFile = fopen( algofile.ToCString() ,"w");
-      it = Study->NewChildIterator(gotBranch);
-      for (; it->More();it->Next()) {
-        mySObject = it->Value();
-        SALOMEDS::GenericAttribute_var anAttr;
-        SALOMEDS::AttributeIOR_var anIOR;
-        if (mySObject->FindAttribute(anAttr, "AttributeIOR")) {
-          anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-          SMESH::SMESH_Algo_var myAlgo = SMESH::SMESH_Algo::_narrow(_orb->string_to_object(anIOR->Value()));
-          fprintf(destFile,"%s\n",myAlgo->GetName());
-        }
+      // get method, returning hypothesis creator
+      if(MYDEBUG) MESSAGE("Find GetHypothesisCreator() method ...");
+      typedef GenericHypothesisCreator_i* (*GetHypothesisCreator)(const char* theHypName);
+      GetHypothesisCreator procHandle =
+        (GetHypothesisCreator)GetProc( libHandle, "GetHypothesisCreator" );
+      if (!procHandle)
+      {
+        throw(SALOME_Exception(LOCALIZED("bad hypothesis plugin library")));
+        UnLoadLib(libHandle);
       }
-    
-      fclose(destFile);
-  
-//writes the file name in the hdf file
-      longueur = algofile.Length() +1;
-      name_group="Algorithms";
-      //SCRUTE(name_group);
-      
-      size[0]=longueur;
-      hdf_group[2] = new HDFgroup(name_group,hdf_file);
-      hdf_group[2]->CreateOnDisk();
-      
-      hdf_dataset[cmpt_ds]=new HDFdataset(name_group,hdf_group[2],HDF_STRING,size,1);
-      hdf_dataset[cmpt_ds]->CreateOnDisk();
-      hdf_dataset[cmpt_ds]->WriteOnDisk(algofile.ToCString());
-      hdf_dataset[cmpt_ds]->CloseOnDisk();
-      cmpt_ds++;
-      
-      hdf_group[2]->CloseOnDisk();
-      MESSAGE("End of Algos Save");
 
-    }
-//************branch 3 : meshes
-    else if (gotBranch->Tag()>=3) {//meshes = tag > 3
-
-      SALOMEDS::GenericAttribute_var anAttr;
-      SALOMEDS::AttributeIOR_var anIOR;
-      if (gotBranch->FindAttribute(anAttr, "AttributeIOR")) {
-        anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-       
-       SMESH::SMESH_Mesh_var myMesh =  SMESH::SMESH_Mesh::_narrow(_orb->string_to_object(anIOR->Value())) ;
-       studyId = myMesh->GetStudyId();
-       SCRUTE(studyId);
-       
-       StudyContext_iStruct* myStudyContext = _mapStudyContext_i[studyId];
-       int meshId = myMesh->GetId();
-       SMESH_Mesh_i* meshServant = myStudyContext->mapMesh_i[meshId];
-       ::SMESH_Mesh& myLocMesh = meshServant->GetImpl();
-       SMESHDS_Mesh* mySMESHDSMesh = myLocMesh.GetMeshDS();
-       
-       SCRUTE(mySMESHDSMesh->NbNodes());
-       if (mySMESHDSMesh->NbNodes()>0) {//checks if the mesh is not empty
-         
-         DriverMED_W_SMESHDS_Mesh* myWriter = new DriverMED_W_SMESHDS_Mesh;
-         myWriter->SetFile(meshfile.ToCString());
-         
-         myWriter->SetMesh(mySMESHDSMesh);
-         myWriter->SetMeshId(gotBranch->Tag());
-         myWriter->Add();
-       }
-       else meshfile = "No data";
-       
-       //********** opening of the HDF group
-       sprintf(name_meshgroup,"Mesh %d",gotBranch->Tag());
-       SCRUTE(name_meshgroup);
-       hdf_group[gotBranch->Tag()] = new HDFgroup(name_meshgroup,hdf_file);
-       hdf_group[gotBranch->Tag()]->CreateOnDisk();
-       //********** 
-       
-       //********** file where the data are stored
-       longueur = strlen(meshfile.ToCString()) +1;
-       size[0]=longueur;
-       strcpy(name_dataset,"Mesh data");
-       hdf_dataset[cmpt_ds]=new HDFdataset(name_dataset,hdf_group[gotBranch->Tag()],HDF_STRING,size,1);
-       hdf_dataset[cmpt_ds]->CreateOnDisk();
-       hdf_dataset[cmpt_ds]->WriteOnDisk(meshfile.ToCString());
-       hdf_dataset[cmpt_ds]->CloseOnDisk();
-       cmpt_ds++;
-       //********** 
-       
-       //********** ref on shape
-       Standard_CString  myRefOnObject="" ;
-       SALOMEDS::SObject_var myRef,myShape;
-       _found = gotBranch->FindSubObject(Tag_RefOnShape,myRef);
-       if (_found) {
-         ok = myRef->ReferencedObject(myShape);
-         myRefOnObject = myShape->GetID();
-         SCRUTE(myRefOnObject);
-         
-         longueur = strlen(myRefOnObject) +1;
-         if (longueur>1) {
-           size[0]=longueur;
-           strcpy(name_dataset,"Ref on shape");
-           hdf_dataset[cmpt_ds]=new HDFdataset(name_dataset,hdf_group[gotBranch->Tag()],HDF_STRING,size,1);
-           hdf_dataset[cmpt_ds]->CreateOnDisk();
-           hdf_dataset[cmpt_ds]->WriteOnDisk(myRefOnObject);
-           hdf_dataset[cmpt_ds]->CloseOnDisk();
-           cmpt_ds++;
-           
-         }
-       }
-       //********** 
-       
-       //********** ref on applied hypothesis
-       _found = gotBranch->FindSubObject(Tag_RefOnAppliedHypothesis,myBranch);
-       if (_found) {
-         
-         strcpy(name_meshgroup,"Applied Hypothesis");
-         hdf_subgroup[Tag_RefOnAppliedHypothesis] = new HDFgroup(name_meshgroup,hdf_group[gotBranch->Tag()]);
-         hdf_subgroup[Tag_RefOnAppliedHypothesis]->CreateOnDisk();
-         
-         it = Study->NewChildIterator(myBranch);
-         cmpt_it = 0;
-         for (; it->More();it->Next()) {
-           mySObject = it->Value();
-           ok = mySObject->ReferencedObject(myRef);
-           myRefOnObject = myRef->GetID();
-           
-           longueur = strlen(myRefOnObject) +1;
-           if (longueur>1) {
-             size[0]=longueur;
-             sprintf(name_dataset,"Hyp %d",cmpt_it);
-             hdf_dataset[cmpt_ds]=new HDFdataset(name_dataset,hdf_subgroup[Tag_RefOnAppliedHypothesis],HDF_STRING,size,1);
-             hdf_dataset[cmpt_ds]->CreateOnDisk();
-             hdf_dataset[cmpt_ds]->WriteOnDisk(myRefOnObject);
-             hdf_dataset[cmpt_ds]->CloseOnDisk();
-           }
-           cmpt_ds++;
-           cmpt_it++;
-         }
-         hdf_subgroup[Tag_RefOnAppliedHypothesis]->CloseOnDisk();
-       }
-       //********** 
-       
-       //********** ref on applied algorithms
-       _found = gotBranch->FindSubObject(Tag_RefOnAppliedAlgorithms,myBranch);
-       if (_found) {
-         
-         strcpy(name_meshgroup,"Applied Algorithms");
-         hdf_subgroup[Tag_RefOnAppliedAlgorithms] = new HDFgroup(name_meshgroup,hdf_group[gotBranch->Tag()]);
-         hdf_subgroup[Tag_RefOnAppliedAlgorithms]->CreateOnDisk();
-         
-         it = Study->NewChildIterator(myBranch);
-         cmpt_it = 0;
-         for (; it->More();it->Next()) {
-           mySObject = it->Value();
-           ok = mySObject->ReferencedObject(myRef);
-           myRefOnObject = myRef->GetID();
-           
-           longueur = strlen(myRefOnObject) +1;
-           if (longueur>1) {
-             size[0]=longueur;
-             sprintf(name_dataset,"Algo %d",cmpt_it);
-             hdf_dataset[cmpt_ds]=new HDFdataset(name_dataset,hdf_subgroup[Tag_RefOnAppliedAlgorithms],HDF_STRING,size,1);
-             hdf_dataset[cmpt_ds]->CreateOnDisk();
-             hdf_dataset[cmpt_ds]->WriteOnDisk(myRefOnObject);
-             hdf_dataset[cmpt_ds]->CloseOnDisk();
-           }
-           cmpt_ds++;
-           cmpt_it++;
-         }
-         hdf_subgroup[Tag_RefOnAppliedAlgorithms]->CloseOnDisk();
-       }
-       MESSAGE("end of algo applied");
-       //********** 
-       
-       //********** submeshes on subshapes
-       int myLevel1Tag;
-       for (int i=Tag_SubMeshOnVertex;i<=Tag_SubMeshOnCompound;i++) {
-         _found = gotBranch->FindSubObject(i,myBranch);
-         if (_found) {
-           if (i==Tag_SubMeshOnVertex)
-             strcpy(name_meshgroup,"SubMeshes On Vertex");
-           else if (i==Tag_SubMeshOnEdge)
-             strcpy(name_meshgroup,"SubMeshes On Edge");
-           else if (i==Tag_SubMeshOnFace)
-             strcpy(name_meshgroup,"SubMeshes On Face");
-           else if (i==Tag_SubMeshOnSolid)
-             strcpy(name_meshgroup,"SubMeshes On Solid");
-           else if (i==Tag_SubMeshOnCompound)
-             strcpy(name_meshgroup,"SubMeshes On Compound");
-
-           cmpt_sm++;
-           myLevel1Tag = 10+cmpt_sm;
-           hdf_subgroup[myLevel1Tag] = new HDFgroup(name_meshgroup,hdf_group[gotBranch->Tag()]);
-           hdf_subgroup[myLevel1Tag]->CreateOnDisk();
-           
-           itSM = Study->NewChildIterator(myBranch);
-           for (; itSM->More();itSM->Next()) {//Loop on all submeshes
-             mySObject = itSM->Value();
-             cmpt_sm++;
-             myTag = 10+cmpt_sm;
-             mySObject->FindAttribute(anAttr, "AttributeIOR");
-             anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-             SMESH::SMESH_subMesh_var mySubMesh =  SMESH::SMESH_subMesh::_narrow(_orb->string_to_object(anIOR->Value())) ;
-
-             //sprintf(name_meshgroup,"SubMesh %d",myTag);
-             sprintf(name_meshgroup,"SubMesh %d",mySubMesh->GetId());
-             SCRUTE(name_meshgroup);
-             
-             hdf_subgroup[myTag] = new HDFgroup(name_meshgroup,hdf_subgroup[myLevel1Tag]);
-             hdf_subgroup[myTag]->CreateOnDisk();
-             
-             //********** ref on shape
-             Standard_CString  myRefOnObject="" ;
-             SALOMEDS::SObject_var myRef,myShape;
-             bool _found2;
-             _found2 = mySObject->FindSubObject(Tag_RefOnShape,myRef);
-             if (_found2) {
-               ok = myRef->ReferencedObject(myShape);
-               myRefOnObject = myShape->GetID();
-               SCRUTE(myRefOnObject);
-               
-               longueur = strlen(myRefOnObject) +1;
-               if (longueur>1) {
-                 size[0]=longueur;
-                 strcpy(name_dataset,"Ref on shape");
-                 hdf_dataset[cmpt_ds]=new HDFdataset(name_dataset,hdf_subgroup[myTag],HDF_STRING,size,1);
-                 hdf_dataset[cmpt_ds]->CreateOnDisk();
-                 hdf_dataset[cmpt_ds]->WriteOnDisk(myRefOnObject);
-                 hdf_dataset[cmpt_ds]->CloseOnDisk();
-                 cmpt_ds++;
-               }
-             }
-             //********** 
-             
-             //********** ref on applied hypothesis
-             _found2 = mySObject->FindSubObject(Tag_RefOnAppliedHypothesis,myBranch);
-             if (_found2) {
-               
-               strcpy(name_meshgroup,"Applied Hypothesis");
-               cmpt_sm++;
-               hdf_subgroup[10+cmpt_sm] = new HDFgroup(name_meshgroup,hdf_subgroup[myTag]);
-               hdf_subgroup[10+cmpt_sm]->CreateOnDisk();
-               
-               it = Study->NewChildIterator(myBranch);
-               cmpt_it = 0;
-               for (; it->More();it->Next()) {
-                 mySObjectChild = it->Value();
-                 ok = mySObjectChild->ReferencedObject(myRef);
-                 myRefOnObject = myRef->GetID();
-                 
-                 longueur = strlen(myRefOnObject) +1;
-                 if (longueur>1) {
-                   size[0]=longueur;
-                   sprintf(name_dataset,"Hyp %d",cmpt_it);
-                   SCRUTE(cmpt_it);
-                   hdf_dataset[cmpt_ds]=new HDFdataset(name_dataset,hdf_subgroup[10+cmpt_sm],HDF_STRING,size,1);
-                   hdf_dataset[cmpt_ds]->CreateOnDisk();
-                   hdf_dataset[cmpt_ds]->WriteOnDisk(myRefOnObject);
-                   hdf_dataset[cmpt_ds]->CloseOnDisk();
-                 }
-                 cmpt_ds++;
-                 cmpt_it++;
-               }
-               hdf_subgroup[10+cmpt_sm]->CloseOnDisk();
-             }
-             //********** 
-             
-             //********** ref on applied algorithms
-             _found2 = mySObject->FindSubObject(Tag_RefOnAppliedAlgorithms,myBranch);
-             SCRUTE(_found2);
-             if (_found2) {
-               
-               strcpy(name_meshgroup,"Applied Algorithms");
-               cmpt_sm++;
-               hdf_subgroup[10+cmpt_sm] = new HDFgroup(name_meshgroup,hdf_subgroup[myTag]);
-               hdf_subgroup[10+cmpt_sm]->CreateOnDisk();
-               
-               it = Study->NewChildIterator(myBranch);
-               cmpt_it = 0;
-               for (; it->More();it->Next()) {
-                 mySObjectChild = it->Value();
-                 ok = mySObjectChild->ReferencedObject(myRef);
-                 myRefOnObject = myRef->GetID();
-                 
-                 longueur = strlen(myRefOnObject) +1;
-                 if (longueur>1) {
-                   size[0]=longueur;
-                   sprintf(name_dataset,"Algo %d",cmpt_it);
-                   hdf_dataset[cmpt_ds]=new HDFdataset(name_dataset,hdf_subgroup[10+cmpt_sm],HDF_STRING,size,1);
-                   hdf_dataset[cmpt_ds]->CreateOnDisk();
-                   hdf_dataset[cmpt_ds]->WriteOnDisk(myRefOnObject);
-                   hdf_dataset[cmpt_ds]->CloseOnDisk();
-                 }
-                 cmpt_ds++;
-                 cmpt_it++;
-               }
-               hdf_subgroup[10+cmpt_sm]->CloseOnDisk();
-             }
-             //MESSAGE("end of algo applied");
-             //********** 
-             
-             hdf_subgroup[myTag]->CloseOnDisk();
-           }
-           
-           hdf_subgroup[myLevel1Tag]->CloseOnDisk();
-         }
-         
-       }
-       //********** 
-       
-       //********** closing of the HDF group
-       hdf_group[gotBranch->Tag()]->CloseOnDisk();
-       MESSAGE("End of Mesh Save");
-       //********** 
-      }                  
-    }
-    MESSAGE("End of Meshes Save");
-  }
+      // get hypothesis creator
+      if(MYDEBUG) MESSAGE("Get Hypothesis Creator for " << theHypName);
+      GenericHypothesisCreator_i* aCreator = procHandle(theHypName);
+      if (!aCreator)
+      {
+        throw(SALOME_Exception(LOCALIZED("no such a hypothesis in this plugin")));
+      }
 
-  hdf_file->CloseOnDisk();
-  delete hdf_file;
-  hdf_file = 0;
+      // map hypothesis creator to a hypothesis name
+      myHypCreatorMap[string(theHypName)] = aCreator;
+    }
 
-  // Convert temporary files to stream
-  aStreamFile = SALOMEDS_Tool::PutFilesToStream(tmpDir.ToCString(), aFileSeq.in(), isMultiFile);
+    // create a new hypothesis object, store its ref. in studyContext
+    if(MYDEBUG) MESSAGE("Create Hypothesis " << theHypName);
+    myHypothesis_i =
+      myHypCreatorMap[string(theHypName)]->Create(myPoa, GetCurrentStudyID(), &myGen);
+    myHypothesis_i->SetLibName(aPlatformLibName/*theLibName*/); // for persistency assurance
+  }
+  catch (SALOME_Exception& S_ex)
+  {
+    THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM);
+  }
 
-  // Remove temporary files and directory
-  if (isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(tmpDir.ToCString(), aFileSeq.in(), true);
+  if ( aPlatformLibName )
+    delete[] aPlatformLibName;
 
-  MESSAGE("End SMESH_Gen_i::Save");
+  if (!myHypothesis_i)
+    return hypothesis_i._retn();
 
-  return aStreamFile._retn();
-}
+  // activate the CORBA servant of hypothesis
+  hypothesis_i = SMESH::SMESH_Hypothesis::_narrow( myHypothesis_i->_this() );
+  int nextId = RegisterObject( hypothesis_i );
+  if(MYDEBUG) { MESSAGE( "Add hypo to map with id = "<< nextId ); }
+  else        { nextId = 0; } // avoid "unused variable" warning in release mode
 
-SALOMEDS::TMPFile* SMESH_Gen_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent,
-                                         const char* theURL,
-                                         bool isMultiFile) {
-  SALOMEDS::TMPFile_var aStreamFile = Save(theComponent, theURL, isMultiFile);
-  return aStreamFile._retn();
+  return hypothesis_i._retn();
 }
 
 //=============================================================================
 /*!
- *  
+ *  SMESH_Gen_i::createMesh
+ *
+ *  Create empty mesh on shape
  */
 //=============================================================================
-
-bool SMESH_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
-                      const SALOMEDS::TMPFile& theStream,
-                      const char* theURL,
-                      bool isMultiFile)
+SMESH::SMESH_Mesh_ptr SMESH_Gen_i::createMesh()
+     throw ( SALOME::SALOME_Exception )
 {
-  MESSAGE("SMESH_Gen_i::Load\n");
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::createMesh" );
 
-  // Get temporary files location
-  TCollection_AsciiString tmpDir = isMultiFile?TCollection_AsciiString((char*)theURL):SALOMEDS_Tool::GetTmpDir();
-
-  // Convert the stream into sequence of files to process
-  SALOMEDS::ListOfFileNames_var aFileSeq = SALOMEDS_Tool::PutStreamToFiles(theStream,
-                                                                           tmpDir.ToCString(),
-                                                                          isMultiFile);
-
-  // Set names of temporary files
-  TCollection_AsciiString filename = tmpDir + aFileSeq[0];//"SMESH.hdf";
-  TCollection_AsciiString hypofile = tmpDir + aFileSeq[1];//"SMESH_Hypo.txt";
-  TCollection_AsciiString algofile = tmpDir + aFileSeq[2];//"SMESH_Algo.txt";
-  TCollection_AsciiString meshfile = tmpDir + aFileSeq[3];//"SMESH_Mesh.med";
-
-  SALOMEDS::Study_var Study = theComponent->GetStudy(); 
-  int studyId = Study->StudyId();
-  SCRUTE(studyId);
-
-  SALOMEDS::GenericAttribute_var anAttr;
-  SALOMEDS::AttributeName_var    aName;
-  SALOMEDS::AttributeIOR_var    anIOR;
-
-  SALOMEDS::SComponent_var fathergeom = Study->FindComponent("GEOM");
-  SALOMEDS::SComponent_var myGeomSComp = SALOMEDS::SComponent::_narrow( fathergeom );
-  SCRUTE(fathergeom);
-
-  //to get the geom engine !!!
-  //useful to define our new mesh
-  SALOME_NamingService* _NS = SINGLETON_<SALOME_NamingService>::Instance() ;
-  ASSERT(SINGLETON_<SALOME_NamingService>::IsAlreadyExisting()) ;
-  _NS->init_orb( _orb ) ;
-  SALOME_LifeCycleCORBA* myEnginesLifeCycle = new SALOME_LifeCycleCORBA(_NS);
-  Engines::Component_var geomEngine =
-    myEnginesLifeCycle->FindOrLoad_Component("FactoryServer","GEOM");
-  GEOM::GEOM_Gen_var myGeomEngine = GEOM::GEOM_Gen::_narrow(geomEngine);
-
-
-  char* aLine;
-  bool ok;
-  char objectId[10],name_dataset[10];
-  int nb_datasets,size,cmpt_ds=0;
-  int cmpt_sm = 0;
-
-  char name[HDF_NAME_MAX_LEN+1];
-  char sgname[HDF_NAME_MAX_LEN+1];
-  char msgname[HDF_NAME_MAX_LEN+1];
-  char name_of_group[HDF_NAME_MAX_LEN+1];
-  char *name_meshgroup;
-  map <int,HDFgroup*> hdf_group, hdf_subgroup;
-  map <int,HDFdataset*> hdf_dataset;
-  FILE *loadedFile;
-
-  //************* HDF file opening
-  HDFfile * hdf_file = new HDFfile(filename.ToCString());
+  // Get or create the GEOM_Client instance
   try {
-    hdf_file->OpenOnDisk(HDF_RDONLY);
+    // create a new mesh object servant, store it in a map in study context
+    SMESH_Mesh_i* meshServant = new SMESH_Mesh_i( GetPOA(), this, GetCurrentStudyID() );
+    // create a new mesh object
+    MESSAGE("myIsEmbeddedMode " << myIsEmbeddedMode);
+    meshServant->SetImpl( myGen.CreateMesh( GetCurrentStudyID(), myIsEmbeddedMode ));
+
+    // activate the CORBA servant of Mesh
+    SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( meshServant->_this() );
+    int nextId = RegisterObject( mesh );
+    if(MYDEBUG) { MESSAGE( "Add mesh to map with id = "<< nextId); }
+    else        { nextId = 0; } // avoid "unused variable" warning in release mode
+    return mesh._retn();
   }
-  catch (HDFexception) {
-    MESSAGE("Load(): " << filename << " not found!");
-    return false;
+  catch (SALOME_Exception& S_ex) {
+    THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM );
   }
+  return SMESH::SMESH_Mesh::_nil();
+}
 
-  //****************************
-
-  int nb_group = hdf_file->nInternalObjects(); 
-  SCRUTE(nb_group);
-  for (int i=0;i<nb_group;i++) 
-    {
-      hdf_file->InternalObjectIndentify(i,name);
-      //SCRUTE(name);
-      
-//***************
-// Loading of the Hypothesis Branch
-//***************
-      if (strcmp(name,"Hypothesis")==0) {
-        
-        double length,maxElementsArea,maxElementsVolume;
-        int numberOfSegments;
-
-        hdf_group[Tag_HypothesisRoot] = new HDFgroup(name,hdf_file); 
-        hdf_group[Tag_HypothesisRoot]->OpenOnDisk();
-        
-        hdf_group[Tag_HypothesisRoot]->InternalObjectIndentify(0,name_of_group);
-        hdf_dataset[cmpt_ds]=new HDFdataset(name_of_group,hdf_group[Tag_HypothesisRoot]);
-        hdf_dataset[cmpt_ds]->OpenOnDisk();
-        size=hdf_dataset[cmpt_ds]->GetSize();
-
-        char * name_of_file =new char[size];
-        hdf_dataset[cmpt_ds]->ReadFromDisk(name_of_file);
-        SCRUTE(name_of_file);
-        hdf_dataset[cmpt_ds]->CloseOnDisk();
-        hdf_group[Tag_HypothesisRoot]->CloseOnDisk();
-        cmpt_ds++;
-        delete[] name_of_file;
-        name_of_file = 0;
-
-        aLine = new char[100];
-        loadedFile = fopen( hypofile.ToCString() ,"r");
-        while (!feof(loadedFile)) {
-          fscanf(loadedFile,"%s",aLine);
-          //SCRUTE(aLine);
-          if (strcmp(aLine,"LocalLength")==0) {
-            SMESH::SMESH_Hypothesis_var myHyp  = this->CreateHypothesis(aLine,studyId);
-            SMESH::SMESH_LocalLength_var LL = SMESH::SMESH_LocalLength::_narrow( myHyp );
-            fscanf(loadedFile,"%s",aLine);
-            length = atof(aLine);
-            LL->SetLength(length);
-            string iorString = _orb->object_to_string(LL);
-            sprintf(objectId,"%d",LL->GetId());
-            _SMESHCorbaObj[string("Hypo_")+string(objectId)] = iorString;
-          }
-          else if (strcmp(aLine,"NumberOfSegments")==0) {
-            SMESH::SMESH_Hypothesis_var myHyp  = this->CreateHypothesis(aLine,studyId);
-            SMESH::SMESH_NumberOfSegments_var NOS = SMESH::SMESH_NumberOfSegments::_narrow( myHyp );
-            fscanf(loadedFile,"%s",aLine);
-            numberOfSegments = atoi(aLine);
-            NOS->SetNumberOfSegments(numberOfSegments);
-            string iorString = _orb->object_to_string(NOS);
-            sprintf(objectId,"%d",NOS->GetId());
-            _SMESHCorbaObj[string("Hypo_")+string(objectId)] = iorString;
-          }
-          else if (strcmp(aLine,"MaxElementArea")==0) {
-            SMESH::SMESH_Hypothesis_var myHyp  = this->CreateHypothesis(aLine,studyId);
-            SMESH::SMESH_MaxElementArea_var MEA = SMESH::SMESH_MaxElementArea::_narrow( myHyp );
-            fscanf(loadedFile,"%s",aLine);
-            maxElementsArea = atof(aLine);
-            MEA->SetMaxElementArea(maxElementsArea);
-            string iorString = _orb->object_to_string(MEA);
-            sprintf(objectId,"%d",MEA->GetId());
-            _SMESHCorbaObj[string("Hypo_")+string(objectId)] = iorString;
-          }
-          else if (strcmp(aLine,"MaxElementVolume")==0) {
-            SMESH::SMESH_Hypothesis_var myHyp  = this->CreateHypothesis(aLine,studyId);
-            SMESH::SMESH_MaxElementVolume_var MEV = SMESH::SMESH_MaxElementVolume::_narrow( myHyp );
-            fscanf(loadedFile,"%s",aLine);
-            maxElementsVolume = atof(aLine);
-            MEV->SetMaxElementVolume(maxElementsVolume);
-            string iorString = _orb->object_to_string(MEV);
-            sprintf(objectId,"%d",MEV->GetId());
-            _SMESHCorbaObj[string("Hypo_")+string(objectId)] = iorString;
-          }
-          
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::GetShapeReader
+ *
+ *  Get shape reader
+ */
+//=============================================================================
+GEOM_Client* SMESH_Gen_i::GetShapeReader()
+{
+  // create shape reader if necessary
+  if ( !myShapeReader )
+    myShapeReader = new GEOM_Client(GetContainerRef());
+  ASSERT( myShapeReader );
+  return myShapeReader;
+}
 
-        }
-        fclose(loadedFile);
-        delete[] aLine;
-        aLine = 0;
-        MESSAGE("End of Hypos Load");
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::SetGeomEngine
+ *
+ *  Set GEOM::GEOM_Gen reference
+ */
+//=============================================================================
+//GEOM::GEOM_Gen_ptr SMESH_Gen_i::SetGeomEngine( const char* containerLoc )
+void SMESH_Gen_i::SetGeomEngine( GEOM::GEOM_Gen_ptr geomcompo )
+{
+  //Engines::Component_ptr temp=GetLCC()->FindOrLoad_Component(containerLoc,"GEOM");
+  //myGeomGen=GEOM::GEOM_Gen::_narrow(temp);
+  myGeomGen=GEOM::GEOM_Gen::_duplicate(geomcompo);
+  //return myGeomGen;
+}
 
-      }
-//***************
-// Loading of the Algorithms Branch
-//***************
-      else if (strcmp(name,"Algorithms")==0) {
-
-        hdf_group[Tag_AlgorithmsRoot] = new HDFgroup(name,hdf_file); 
-        hdf_group[Tag_AlgorithmsRoot]->OpenOnDisk();
-        
-        hdf_group[Tag_AlgorithmsRoot]->InternalObjectIndentify(0,name_of_group);
-        hdf_dataset[cmpt_ds] = new HDFdataset(name_of_group,hdf_group[Tag_AlgorithmsRoot]);
-        hdf_dataset[cmpt_ds]->OpenOnDisk();
-        size=hdf_dataset[cmpt_ds]->GetSize();
-
-        char * name_of_file =new char[size];
-        hdf_dataset[cmpt_ds]->ReadFromDisk(name_of_file);
-        hdf_dataset[cmpt_ds]->CloseOnDisk();
-        hdf_group[Tag_AlgorithmsRoot]->CloseOnDisk();
-        cmpt_ds++;
-        delete[] name_of_file;
-        name_of_file = 0;
-        
-        aLine = new char[100];
-        loadedFile = fopen( algofile.ToCString(),"r");
-        while (!feof(loadedFile)) {
-          fscanf(loadedFile,"%s\n",aLine);
-          //SCRUTE(aLine);
-          if (strcmp(aLine,"")!=0) {
-            SMESH::SMESH_Hypothesis_var myHyp = this->CreateHypothesis(aLine,studyId);
-            SMESH::SMESH_Algo_var myAlgo = SMESH::SMESH_Algo::_narrow(myHyp);
-            string iorString = _orb->object_to_string(myAlgo);
-            sprintf(objectId,"%d",myAlgo->GetId());
-            _SMESHCorbaObj[string("Hypo_")+string(objectId)] = iorString;
-          }
-        }
-        fclose(loadedFile);
-        delete[] aLine;
-        aLine = 0;
-        MESSAGE("End of Algos Load");
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::SetEmbeddedMode
+ *
+ *  Set current mode
+ */
+//=============================================================================
 
-      }
+void SMESH_Gen_i::SetEmbeddedMode( CORBA::Boolean theMode )
+{
+  myIsEmbeddedMode = theMode;
+  MESSAGE("myIsEmbeddedMode " << myIsEmbeddedMode);
 
-//***************
-// Loading of the Mesh Branch
-//***************
-      else if (string(name).substr(0,4)==string("Mesh")) {
-        MESSAGE("in mesh load");
-
-        Standard_Integer myMeshId = atoi((string(name).substr(5,5)).c_str());
-        SCRUTE(myMeshId);
-
-       hdf_group[myMeshId] = new HDFgroup(name,hdf_file); 
-       hdf_group[myMeshId]->OpenOnDisk();
-
-       int nb_meshsubgroup = hdf_group[myMeshId]->nInternalObjects(); 
-       SCRUTE(nb_meshsubgroup);
-             
-       //********** Loading of the file name where the data are stored
-       MESSAGE("Mesh data file");
-       strcpy(name_of_group,"Mesh data");
-       hdf_dataset[cmpt_ds]=new HDFdataset(name_of_group,hdf_group[myMeshId]);
-       hdf_dataset[cmpt_ds]->OpenOnDisk();
-       size=hdf_dataset[cmpt_ds]->GetSize();
-       
-       char * datafilename =new char[size];
-       hdf_dataset[cmpt_ds]->ReadFromDisk(datafilename);
-       hdf_dataset[cmpt_ds]->CloseOnDisk();
-       cmpt_ds++;
-             
-       //********** 
-       //}
-       //else if (strcmp(msgname,"Ref on shape")==0) {
-       //********** Loading of the reference on the shape
-       //********** and mesh initialization
-       MESSAGE("Ref on shape");
-       strcpy(name_of_group,"Ref on shape");
-       hdf_dataset[cmpt_ds] = new HDFdataset(name_of_group,hdf_group[myMeshId]);
-       hdf_dataset[cmpt_ds]->OpenOnDisk();
-       size=hdf_dataset[cmpt_ds]->GetSize();
-             
-       char * refFromFile =new char[size];
-       hdf_dataset[cmpt_ds]->ReadFromDisk(refFromFile);
-       hdf_dataset[cmpt_ds]->CloseOnDisk();
-       cmpt_ds++;
-             
-       Standard_CString  myRefOnShape="";   //look for ref on shape
-             
-       bool _found = false;
-       SALOMEDS::SObject_var CSO = Study->FindObjectID(refFromFile);
-       SMESH::SMESH_Mesh_var myNewMesh;
-       GEOM::GEOM_Shape_var aShape;
-             
-       if (!CORBA::is_nil(CSO)) {
-         _found = true;
-         CSO->FindAttribute(anAttr, "AttributeIOR");
-         anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-         char* ShapeIOR = anIOR->Value();
-         aShape = GEOM::GEOM_Shape::_narrow(_orb->string_to_object(ShapeIOR));
-               
-         myNewMesh = this->Init(myGeomEngine,studyId,aShape);
-         string iorString = _orb->object_to_string(myNewMesh);
-         sprintf(objectId,"%d",myNewMesh->GetId());
-         _SMESHCorbaObj[string("Mesh_")+string(objectId)] = iorString;
-                               
-         //********** 
-         //********** Loading of mesh data
-         if (strcmp(datafilename,"No data")!=0) {
-                 
-           med_idt fid;
-           int ret;
-           
-           //****************************************************************************
-           //*                      OUVERTURE DU FICHIER EN LECTURE                      *
-           //****************************************************************************
-                 
-           fid = MEDouvrir(datafilename,MED_LECT);
-           if (fid < 0)
-             {
-               printf(">> ERREUR : ouverture du fichier %s \n",datafilename);
-               exit(EXIT_FAILURE);
-             }
-           else {
-                   
-             StudyContext_iStruct* myStudyContext = _mapStudyContext_i[studyId];
-             int meshId = myNewMesh->GetId();
-             SMESH_Mesh_i* meshServant = myStudyContext->mapMesh_i[meshId];
-             ::SMESH_Mesh& myLocMesh = meshServant->GetImpl();
-             SMESHDS_Mesh* mySMESHDSMesh = myLocMesh.GetMeshDS();
-                   
-             DriverMED_R_SMESHDS_Mesh* myReader = new DriverMED_R_SMESHDS_Mesh;
-                   
-             myReader->SetMesh(mySMESHDSMesh);
-             myReader->SetMeshId(myMeshId);
-             myReader->SetFileId(fid);
-             myReader->ReadMySelf();
-             //SCRUTE(mySMESHDSMesh->NbNodes());
-             //myNewMesh->ExportUNV("/tmp/test.unv");//only to check out
-                   
-             //****************************************************************************
-             //*                      FERMETURE DU FICHIER                                 *
-             //****************************************************************************
-             ret = MEDfermer(fid);
-                   
-             if (ret != 0)
-               printf(">> ERREUR : erreur a la fermeture du fichier %s\n",datafilename);
-                   
-           }
-         }
-       }
-       //********** 
-       //}
-       //else if (strcmp(msgname,"Applied Hypothesis")==0) {
-       for (int ii=0;ii<nb_meshsubgroup;ii++) 
-         {
-           hdf_group[myMeshId]->InternalObjectIndentify(ii,msgname);
-           if (strcmp(msgname,"Mesh data")==0) {
-             //nothing
-           }
-           else if (strcmp(msgname,"Ref on shape")==0) {
-             //nothing
-           }
-           else if (strcmp(msgname,"Applied Hypothesis")==0) {
-             //********** Loading of the applied hypothesis
-             strcpy(name_of_group,"Applied Hypothesis");
-             hdf_subgroup[Tag_RefOnAppliedHypothesis] = new HDFgroup(name_of_group,hdf_group[myMeshId]);
-             hdf_subgroup[Tag_RefOnAppliedHypothesis]->OpenOnDisk();
-             
-             nb_datasets = hdf_subgroup[Tag_RefOnAppliedHypothesis]->nInternalObjects();  
-             SCRUTE(nb_datasets);
-             
-             for (int j=0;j<nb_datasets;j++) {
-               sprintf(name_dataset,"Hyp %d",j);
-               hdf_dataset[cmpt_ds] = new HDFdataset(name_dataset,hdf_subgroup[Tag_RefOnAppliedHypothesis]);
-               hdf_dataset[cmpt_ds]->OpenOnDisk();
-               size=hdf_dataset[cmpt_ds]->GetSize();
-               
-               char * refFromFile =new char[size];
-               hdf_dataset[cmpt_ds]->ReadFromDisk(refFromFile);
-               //SCRUTE(refFromFile);
-               hdf_dataset[cmpt_ds]->CloseOnDisk();
-               cmpt_ds++;
-               if (_found) {
-                 SALOMEDS::SObject_var HypSO = Study->FindObjectID(refFromFile);
-                 if (!CORBA::is_nil(HypSO)) {
-                   HypSO->FindAttribute(anAttr, "AttributeIOR");
-                   anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-                   if (!CORBA::is_nil(anIOR)) {
-                     char* HypIOR = anIOR->Value();
-                     SMESH::SMESH_Hypothesis_var anHyp = SMESH::SMESH_Hypothesis::_narrow(_orb->string_to_object(HypIOR));
-                     if (!CORBA::is_nil(anHyp)) {
-                       myNewMesh->AddHypothesis(aShape,anHyp);
-                       MESSAGE("Hypothesis added ...");
-                     }
-                   }
-                 }
-               }
-             } 
-             
-             hdf_subgroup[Tag_RefOnAppliedHypothesis]->CloseOnDisk();
-             //********** 
-           }
-           else if (strcmp(msgname,"Applied Algorithms")==0) {
-
-             //********** Loading of the applied algorithms 
-             strcpy(name_of_group,"Applied Algorithms");
-             hdf_subgroup[Tag_RefOnAppliedAlgorithms] = new HDFgroup(name_of_group,hdf_group[myMeshId]);
-             hdf_subgroup[Tag_RefOnAppliedAlgorithms]->OpenOnDisk();
-             
-             nb_datasets = hdf_subgroup[Tag_RefOnAppliedAlgorithms]->nInternalObjects();  
-             SCRUTE(nb_datasets);
-             
-             for (int j=0;j<nb_datasets;j++) {
-               sprintf(name_dataset,"Algo %d",j);
-               hdf_dataset[cmpt_ds] = new HDFdataset(name_dataset,hdf_subgroup[Tag_RefOnAppliedAlgorithms]);
-               hdf_dataset[cmpt_ds]->OpenOnDisk();
-               size=hdf_dataset[cmpt_ds]->GetSize();
-               
-               char * refFromFile =new char[size];
-               hdf_dataset[cmpt_ds]->ReadFromDisk(refFromFile);
-               hdf_dataset[cmpt_ds]->CloseOnDisk();
-               cmpt_ds++;
-               
-               if (_found) {
-                 SALOMEDS::SObject_var AlgoSO = Study->FindObjectID(refFromFile);
-                 if (!CORBA::is_nil(AlgoSO)) {
-                   AlgoSO->FindAttribute(anAttr, "AttributeIOR");
-                   anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-                   if (!CORBA::is_nil(anIOR)) {
-                     char* AlgoIOR = anIOR->Value();
-                     //SCRUTE(AlgoIOR);
-                     SMESH::SMESH_Hypothesis_var myHyp = SMESH::SMESH_Hypothesis::_narrow(_orb->string_to_object(AlgoIOR));
-                     SMESH::SMESH_Algo_var anAlgo = SMESH::SMESH_Algo::_narrow(myHyp);
-                     //SMESH::SMESH_Algo_var anAlgo = SMESH::SMESH_Algo::_narrow(_orb->string_to_object(AlgoIOR));
-                     if (!CORBA::is_nil(anAlgo)) {
-                       myNewMesh->AddHypothesis(aShape,anAlgo);//essayer avec _SMESHCorbaObj
-                       MESSAGE("Algorithms added ...");
-                     }
-                   }
-                 }
-               }
-             } 
-             
-             hdf_subgroup[Tag_RefOnAppliedAlgorithms]->CloseOnDisk();
-             //********** 
-           }
-           else if (string(msgname).substr(0,9)==string("SubMeshes")) {
-             
-             
-             //********** Loading of the submeshes on subshapes
-             int myLevel1Tag, myTag;
-             SCRUTE(msgname);
-             cmpt_sm++;
-             myLevel1Tag = 10+cmpt_sm;
-             hdf_subgroup[myLevel1Tag] = new HDFgroup(name_of_group,hdf_group[myMeshId]);
-             hdf_subgroup[myLevel1Tag] = new HDFgroup(msgname,hdf_group[myMeshId]);
-             hdf_subgroup[myLevel1Tag]->OpenOnDisk();
-       
-             int nb_submeshes = hdf_subgroup[myLevel1Tag]->nInternalObjects();  
-             SCRUTE(nb_submeshes);
-
-             for (int j=0;j<nb_submeshes;j++) {
-               cmpt_sm++;
-               myTag = 10+cmpt_sm;
-               hdf_subgroup[myLevel1Tag]->InternalObjectIndentify(j,name_meshgroup);
-               SCRUTE(name_meshgroup);
-
-               hdf_subgroup[myTag] = new HDFgroup(name_meshgroup,hdf_subgroup[myLevel1Tag]);
-               hdf_subgroup[myTag]->OpenOnDisk();
-               int subMeshId = atoi((string(name_meshgroup).substr(8,18)).c_str());
-               
-               MESSAGE("Ref on shape");
-               //********** ref on shape
-               sprintf(name_dataset,"Ref on shape");
-               hdf_dataset[cmpt_ds] = new HDFdataset(name_dataset,hdf_subgroup[myTag]);
-               hdf_dataset[cmpt_ds]->OpenOnDisk();
-               size=hdf_dataset[cmpt_ds]->GetSize();
-               
-               char * refFromFile =new char[size];
-               hdf_dataset[cmpt_ds]->ReadFromDisk(refFromFile);
-               hdf_dataset[cmpt_ds]->CloseOnDisk();
-               cmpt_ds++;
-               
-               bool _found3 = false;
-               SALOMEDS::SObject_var GSO = Study->FindObjectID(refFromFile);
-               SMESH::SMESH_subMesh_var aSubMesh;
-               GEOM::GEOM_Shape_var aSubShape;
-               
-               if (!CORBA::is_nil(GSO)) {
-                 GSO->FindAttribute(anAttr, "AttributeIOR");
-                 anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-                 char* SubShapeIOR = anIOR->Value();
-                 aSubShape = GEOM::GEOM_Shape::_narrow(_orb->string_to_object(SubShapeIOR));
-                 
-                 if (!CORBA::is_nil(aSubShape)) {
-                   aSubMesh = myNewMesh->GetElementsOnShape(aSubShape);
-                   string iorString = _orb->object_to_string(aSubMesh);
-                   sprintf(objectId,"%d",subMeshId);
-                   _SMESHCorbaObj[string("SubMesh_")+string(objectId)] = iorString;
-                   _found3 = true;
-                   //SCRUTE(aSubMesh->GetNumberOfNodes());
-                   //MESSAGE("yes");
-                   //SCRUTE(aSubMesh->GetNumberOfElements());
-                 }
-               }
-                   
-               int nb_subgroup = hdf_subgroup[myTag]->nInternalObjects(); 
-               SCRUTE(nb_subgroup);
-               for (int k=0;k<nb_subgroup;k++) 
-                 {
-                   hdf_subgroup[myTag]->InternalObjectIndentify(k,sgname);
-                   if (strcmp(sgname,"Ref on shape")==0) {
-                     //nothing
-                   }
-                   else if (strcmp(sgname,"Applied Hypothesis")==0) {
-                     //********** ref on applied hypothesis
-                     MESSAGE("Applied Hypothesis");
-                     strcpy(name_meshgroup,"Applied Hypothesis");
-                     cmpt_sm++;
-                     hdf_subgroup[10+cmpt_sm] = new HDFgroup(name_meshgroup,hdf_subgroup[myTag]);
-                     hdf_subgroup[10+cmpt_sm]->OpenOnDisk();
-                     nb_datasets = hdf_subgroup[10+cmpt_sm]->nInternalObjects();  
-                     SCRUTE(nb_datasets);
-                     
-                     for (int l=0;l<nb_datasets;l++) {
-                       sprintf(name_dataset,"Hyp %d",l);
-                       hdf_dataset[cmpt_ds] = new HDFdataset(name_dataset,hdf_subgroup[10+cmpt_sm]);
-                       hdf_dataset[cmpt_ds]->OpenOnDisk();
-                       size=hdf_dataset[cmpt_ds]->GetSize();
-                       
-                       char * refFromFile =new char[size];
-                       hdf_dataset[cmpt_ds]->ReadFromDisk(refFromFile);
-                       hdf_dataset[cmpt_ds]->CloseOnDisk();
-                       cmpt_ds++;
-                       
-                       if (_found3) {
-                         SALOMEDS::SObject_var HypSO = Study->FindObjectID(refFromFile);
-                         if (!CORBA::is_nil(HypSO)) {
-                           HypSO->FindAttribute(anAttr, "AttributeIOR");
-                           anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-                           if (!CORBA::is_nil(anIOR)) {
-                             char* HypIOR = anIOR->Value();
-                             SMESH::SMESH_Hypothesis_var anHyp = SMESH::SMESH_Hypothesis::_narrow(_orb->string_to_object(HypIOR));
-                             if (!CORBA::is_nil(anHyp)) {
-                               SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather();
-                               aMesh->AddHypothesis(aSubShape,anHyp);//essayer avec _SMESHCorbaObj
-                               MESSAGE("Hypothesis added ...");
-                             }
-                           }
-                         }
-                       }
-                     } 
-                   }
-                   else if (strcmp(sgname,"Applied Algorithms")==0) {
-                     //********** ref on applied algorithms
-                     MESSAGE("Applied Algorithms");
-                     strcpy(name_meshgroup,"Applied Algorithms");
-                     cmpt_sm++;
-                     hdf_subgroup[10+cmpt_sm] = new HDFgroup(name_meshgroup,hdf_subgroup[myTag]);
-                     hdf_subgroup[10+cmpt_sm]->OpenOnDisk();
-                     nb_datasets = hdf_subgroup[10+cmpt_sm]->nInternalObjects();  
-                     SCRUTE(nb_datasets);
-                     
-                     for (int l=0;l<nb_datasets;l++) {
-                       sprintf(name_dataset,"Algo %d",l);
-                       hdf_dataset[cmpt_ds] = new HDFdataset(name_dataset,hdf_subgroup[10+cmpt_sm]);
-                       hdf_dataset[cmpt_ds]->OpenOnDisk();
-                       size=hdf_dataset[cmpt_ds]->GetSize();
-                       
-                       char * refFromFile =new char[size];
-                       hdf_dataset[cmpt_ds]->ReadFromDisk(refFromFile);
-                       hdf_dataset[cmpt_ds]->CloseOnDisk();
-                       cmpt_ds++;
-                       
-                       if (_found3) {
-                         SALOMEDS::SObject_var AlgoSO = Study->FindObjectID(refFromFile);
-                         if (!CORBA::is_nil(AlgoSO)) {
-                           AlgoSO->FindAttribute(anAttr, "AttributeIOR");
-                           anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-                           if (!CORBA::is_nil(anIOR)) {
-                             char* AlgoIOR = anIOR->Value();
-                             //SCRUTE(AlgoIOR);
-                             SMESH::SMESH_Hypothesis_var myHyp = SMESH::SMESH_Hypothesis::_narrow(_orb->string_to_object(AlgoIOR));
-                             SMESH::SMESH_Algo_var anAlgo = SMESH::SMESH_Algo::_narrow(myHyp);
-                             //SMESH::SMESH_Algo_var anAlgo = SMESH::SMESH_Algo::_narrow(_orb->string_to_object(AlgoIOR));
-                             if (!CORBA::is_nil(anAlgo)) {
-                               SMESH::SMESH_Mesh_var aMesh = aSubMesh->GetFather();
-                               aMesh->AddHypothesis(aSubShape,anAlgo);//essayer avec _SMESHCorbaObj
-                               MESSAGE("Algorithms added ...");
-                             }
-                           }
-                         }
-                       }
-                       
-                     } 
-                   }
-                 }
-               hdf_subgroup[myTag]->CloseOnDisk();
-             }
-             hdf_subgroup[myLevel1Tag]->CloseOnDisk();
-           }
-         }
-       hdf_group[myMeshId]->CloseOnDisk();     
-       
-       MESSAGE("End of Meshes Load");
-      }
+  if ( !myIsEmbeddedMode ) {
+    //PAL10867: disable signals catching with "noexcepthandler" option
+    char* envNoCatchSignals = getenv("NOT_INTERCEPT_SIGNALS");
+    if (!envNoCatchSignals || !atoi(envNoCatchSignals))
+    {
+      bool raiseFPE;
+#ifdef _DEBUG_
+      raiseFPE = true;
+      char* envDisableFPE = getenv("DISABLE_FPE");
+      if (envDisableFPE && atoi(envDisableFPE))
+        raiseFPE = false;
+#else
+      raiseFPE = false;
+#endif
+      OSD::SetSignal( raiseFPE );
     }
-  
-  MESSAGE("End of SMESH_Gen::Load");
-  
-  hdf_file->CloseOnDisk();
-  delete  hdf_file;
-  hdf_file=0;
-
-  // Remove temporary files created from the stream
-  if (isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(tmpDir.ToCString(), aFileSeq.in(), true);
-
-  return true;
+    // else OSD::SetSignal() is called in GUI
+  }
 }
 
-bool SMESH_Gen_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent,
-                           const SALOMEDS::TMPFile& theStream,
-                           const char* theURL,
-                           bool isMultiFile) {
-  return Load(theComponent, theStream, theURL, isMultiFile);
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::IsEmbeddedMode
+ *
+ *  Get current mode
+ */
+//=============================================================================
+
+CORBA::Boolean SMESH_Gen_i::IsEmbeddedMode()
+{
+  return myIsEmbeddedMode;
 }
 
 //=============================================================================
 /*!
- *  
+ *  SMESH_Gen_i::SetCurrentStudy
+ *
+ *  Set current study
  */
 //=============================================================================
 
-void SMESH_Gen_i::Close(SALOMEDS::SComponent_ptr theComponent)
+void SMESH_Gen_i::SetCurrentStudy( SALOMEDS::Study_ptr theStudy )
 {
-  MESSAGE("Close");
-  SALOMEDS::Study_var aStudy = theComponent->GetStudy();
-  SALOMEDS::ChildIterator_var itBig = aStudy->NewChildIterator(theComponent);
-  for (; itBig->More();itBig->Next()) {
-    SALOMEDS::SObject_var gotBranch = itBig->Value();
-    
-    // branch 1 : hypothesis
-    if (gotBranch->Tag()==Tag_HypothesisRoot || gotBranch->Tag()==Tag_AlgorithmsRoot) {
-      SALOMEDS::ChildIterator_var it = aStudy->NewChildIterator(gotBranch);
-      for (; it->More();it->Next()) {
-       SALOMEDS::SObject_var mySObject = it->Value();
-       SALOMEDS::GenericAttribute_var anAttr;
-       SALOMEDS::AttributeIOR_var anIOR;
-       if ( mySObject->FindAttribute(anAttr, "AttributeIOR")) {
-         anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-         SMESH::SMESH_Hypothesis_var myHyp =
-           SMESH::SMESH_Hypothesis::_narrow(_orb->string_to_object(anIOR->Value()));
-         char objectId[10];
-         sprintf(objectId,"%d",myHyp->GetId());
-//       cout<<"********** delete Hyp "<<objectId<<endl;
-         _SMESHCorbaObj.erase(string("Hypo_")+string(objectId));
-         myHyp = SMESH::SMESH_Hypothesis::_narrow(_orb->string_to_object(anIOR->Value()));
-       }
-      }
-    }
-    // branch 2 : algorithms
-    else if (gotBranch->Tag()>=3) {
-      SALOMEDS::ChildIterator_var it = aStudy->NewChildIterator(gotBranch);
-      for (; it->More();it->Next()) {
-       SALOMEDS::SObject_var mySObject = it->Value();
-       SALOMEDS::GenericAttribute_var anAttr;
-       SALOMEDS::AttributeIOR_var anIOR;
-       if ( mySObject->FindAttribute(anAttr, "AttributeIOR")) {
-         anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-         SMESH::SMESH_Mesh_var myMesh =
-           SMESH::SMESH_Mesh::_narrow(_orb->string_to_object(anIOR->Value()));
-         if (!myMesh->_is_nil()) {
-           char objectId[10];
-           sprintf(objectId,"%d",myMesh->GetId());
-//         cout<<"********** delete Mesh "<<objectId<<endl;
-           _SMESHCorbaObj.erase(string("Mesh_")+string(objectId));
-           CORBA::release(myMesh);
-         }
-         else {
-           SMESH::SMESH_subMesh_var mySubMesh =
-             SMESH::SMESH_subMesh::_narrow(_orb->string_to_object(anIOR->Value()));
-           if (!mySubMesh->_is_nil()) {
-             char objectId[10];
-             sprintf(objectId,"%d",mySubMesh->GetId());
-//           cout<<"********** delete SubMesh "<<objectId<<endl;
-             _SMESHCorbaObj.erase(string("SubMesh_")+string(objectId));
-             CORBA::release(mySubMesh);
-           }
-         }
-       }
+  setCurrentStudy( theStudy );
+}
+
+void SMESH_Gen_i::setCurrentStudy( SALOMEDS::Study_ptr theStudy,
+                                   bool                theStudyIsBeingClosed)
+{
+  int curStudyId = GetCurrentStudyID();
+  myCurrentStudy = SALOMEDS::Study::_duplicate( theStudy );
+  // create study context, if it doesn't exist and set current study
+  int studyId = GetCurrentStudyID();
+  if ( myStudyContextMap.find( studyId ) == myStudyContextMap.end() )
+    myStudyContextMap[ studyId ] = new StudyContext;
+
+  // myCurrentStudy may be nil
+  if ( !theStudyIsBeingClosed && !CORBA::is_nil( myCurrentStudy ) ) {
+    SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+    SALOMEDS::SComponent_wrap GEOM_var = myCurrentStudy->FindComponent( "GEOM" );
+    if( !GEOM_var->_is_nil() )
+      aStudyBuilder->LoadWith( GEOM_var, GetGeomEngine() );
+    // NPAL16168, issue 0020210
+    // Let meshes update their data depending on GEOM groups that could change
+    if ( curStudyId != studyId )
+    {
+      CORBA::String_var compDataType = ComponentDataType();
+      SALOMEDS::SComponent_wrap me = myCurrentStudy->FindComponent( compDataType.in() );
+      if ( !me->_is_nil() ) {
+        SALOMEDS::ChildIterator_wrap anIter = myCurrentStudy->NewChildIterator( me );
+        for ( ; anIter->More(); anIter->Next() ) {
+          SALOMEDS::SObject_wrap so = anIter->Value();
+          CORBA::Object_var     ior = SObjectToObject( so );
+          if ( SMESH_Mesh_i*   mesh = SMESH::DownCast<SMESH_Mesh_i*>( ior ))
+            mesh->CheckGeomGroupModif();
+        }
       }
     }
   }
@@ -1522,235 +642,4434 @@ void SMESH_Gen_i::Close(SALOMEDS::SComponent_ptr theComponent)
 
 //=============================================================================
 /*!
- *  
+ *  SMESH_Gen_i::GetCurrentStudy
+ *
+ *  Get current study
  */
 //=============================================================================
 
-char* SMESH_Gen_i::ComponentDataType()
+SALOMEDS::Study_ptr SMESH_Gen_i::GetCurrentStudy()
+{
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetCurrentStudy: study Id = " << GetCurrentStudyID() );
+  return SALOMEDS::Study::_duplicate( myCurrentStudy );
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::GetCurrentStudyContext
+ *
+ *  Get current study context
+ */
+//=============================================================================
+StudyContext* SMESH_Gen_i::GetCurrentStudyContext()
 {
-  MESSAGE("SMESH_Gen_i::ComponentDataType");
-  return strdup("SMESH");
+  if ( !CORBA::is_nil( myCurrentStudy ) &&
+      myStudyContextMap.find( GetCurrentStudyID() ) != myStudyContextMap.end() )
+    return myStudyContextMap[ myCurrentStudy->StudyId() ];
+  else
+    return 0;
 }
 
-    
 //=============================================================================
 /*!
- *  
+ *  SMESH_Gen_i::CreateHypothesis
+ *
+ *  Create hypothesis/algorothm of given type and publish it in the study
  */
 //=============================================================================
 
-char* SMESH_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject,
-                                         const char* IORString,
-                                         CORBA::Boolean isMultiFile,
-                                         CORBA::Boolean isASCII)
+SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::CreateHypothesis( const char* theHypName,
+                                                           const char* theLibName )
+     throw ( SALOME::SALOME_Exception )
 {
-  MESSAGE("SMESH_Gen_i::IORToLocalPersistentID");
+  Unexpect aCatch(SALOME_SalomeException);
+  // Create hypothesis/algorithm
+  SMESH::SMESH_Hypothesis_var hyp = this->createHypothesis( theHypName, theLibName );
+
+  // Publish hypothesis/algorithm in the study
+  if ( CanPublishInStudy( hyp ) ) {
+    SALOMEDS::SObject_wrap aSO = PublishHypothesis( myCurrentStudy, hyp );
+    if ( !aSO->_is_nil() ) {
+      // Update Python script
+      TPythonDump() << aSO << " = " << this << ".CreateHypothesis('"
+                    << theHypName << "', '" << theLibName << "')";
+    }
+  }
 
-  char objectId[10];
+  return hyp._retn();
+}
 
-  SMESH::SMESH_Algo_var myAlgo = SMESH::SMESH_Algo::_narrow(_orb->string_to_object(IORString));
-  if (! CORBA::is_nil(myAlgo))
+//================================================================================
+/*!
+ * \brief Return a hypothesis holding parameter values corresponding either to the mesh
+ * existing on the given geometry or to size of the geometry.
+ *  \param theHypType - hypothesis type name
+ *  \param theLibName - plugin library name
+ *  \param theMesh - The mesh of interest
+ *  \param theGeom - The shape to get parameter values from
+ *  \retval SMESH::SMESH_Hypothesis_ptr - The returned hypothesis may be the one existing
+ *     in a study and used to compute the mesh, or a temporary one created just to pass
+ *     parameter values
+ */
+//================================================================================
+
+SMESH::SMESH_Hypothesis_ptr
+SMESH_Gen_i::GetHypothesisParameterValues (const char*           theHypType,
+                                           const char*           theLibName,
+                                           SMESH::SMESH_Mesh_ptr theMesh,
+                                           GEOM::GEOM_Object_ptr theGeom,
+                                           CORBA::Boolean        byMesh)
+  throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if ( byMesh && CORBA::is_nil( theMesh ) )
+    return SMESH::SMESH_Hypothesis::_nil();
+  if ( byMesh && CORBA::is_nil( theGeom ) )
+    return SMESH::SMESH_Hypothesis::_nil();
+
+  // -----------------------------------------------
+  // find hypothesis used to mesh theGeom
+  // -----------------------------------------------
+
+  // get mesh and shape
+  SMESH_Mesh_i* meshServant = SMESH::DownCast<SMESH_Mesh_i*>( theMesh );
+  TopoDS_Shape shape = GeomObjectToShape( theGeom );
+  if ( byMesh && ( !meshServant || meshServant->NbNodes()==0 || shape.IsNull() ))
+    return SMESH::SMESH_Hypothesis::_nil();
+  ::SMESH_Mesh* mesh = meshServant ? &meshServant->GetImpl() : (::SMESH_Mesh*)0;
+
+  // create a temporary hypothesis to know its dimention
+  SMESH::SMESH_Hypothesis_var tmpHyp = this->createHypothesis( theHypType, theLibName );
+  SMESH_Hypothesis_i* hypServant = SMESH::DownCast<SMESH_Hypothesis_i*>( tmpHyp );
+  if ( !hypServant )
+    return SMESH::SMESH_Hypothesis::_nil();
+  ::SMESH_Hypothesis* hyp = hypServant->GetImpl();
+
+  if ( byMesh ) {
+    // look for a hypothesis of theHypType used to mesh the shape
+    if ( myGen.GetShapeDim( shape ) == hyp->GetDim() )
     {
-      string prefix = "Hypo_";
-      sprintf(objectId,"%d",myAlgo->GetId());
-      string lpID = prefix + string(objectId);
-      return CORBA::string_dup(lpID.c_str());
-    }
-  else {
-    SMESH::SMESH_Hypothesis_var myHypo = SMESH::SMESH_Hypothesis::_narrow(_orb->string_to_object(IORString));
-    if (! CORBA::is_nil(myHypo))
-      {
-        string prefix = "Hypo_";
-        sprintf(objectId,"%d",myHypo->GetId());
-        string lpID = prefix + string(objectId);
-        return CORBA::string_dup(lpID.c_str());
+      // check local shape
+      SMESH::ListOfHypothesis_var aHypList = theMesh->GetHypothesisList( theGeom );
+      int nbLocalHyps = aHypList->length();
+      for ( int i = 0; i < nbLocalHyps; i++ ) {
+        CORBA::String_var hypName = aHypList[i]->GetName();
+        if ( strcmp( theHypType, hypName.in() ) == 0 ) // FOUND local!
+          return SMESH::SMESH_Hypothesis::_duplicate( aHypList[i] );
       }
-    else {
-      SMESH::SMESH_Mesh_var myMesh = SMESH::SMESH_Mesh::_narrow(_orb->string_to_object(IORString));
-      if (! CORBA::is_nil(myMesh))
-       {
-         string prefix = "Mesh_";
-         sprintf(objectId,"%d",myMesh->GetId());
-         string lpID = prefix + string(objectId);
-         return CORBA::string_dup(lpID.c_str());
-       }
-      else {
-       SMESH::SMESH_subMesh_var mySubMesh = SMESH::SMESH_subMesh::_narrow(_orb->string_to_object(IORString));
-       if (! CORBA::is_nil(mySubMesh))
-         {
-           string prefix = "SubMesh_";
-           sprintf(objectId,"%d",mySubMesh->GetId());
-           string lpID = prefix + string(objectId);
-           return CORBA::string_dup(lpID.c_str());
-         }
-       else return (strdup("no object"));
+      // check super shapes
+      TopTools_ListIteratorOfListOfShape itShape( mesh->GetAncestors( shape ));
+      while ( nbLocalHyps == 0 && itShape.More() ) {
+        GEOM::GEOM_Object_ptr geomObj = ShapeToGeomObject( itShape.Value() );
+        if ( ! CORBA::is_nil( geomObj )) {
+          SMESH::ListOfHypothesis_var aHypList = theMesh->GetHypothesisList( geomObj );
+          nbLocalHyps = aHypList->length();
+          for ( int i = 0; i < nbLocalHyps; i++ )
+            if ( strcmp( theHypType, aHypList[i]->GetName() ) == 0 ) // FOUND global!
+              return SMESH::SMESH_Hypothesis::_duplicate( aHypList[i] );
+        }
+        itShape.Next();
       }
     }
+
+    // let the temporary hypothesis find out somehow parameter values by mesh
+    if ( hyp->SetParametersByMesh( mesh, shape ))
+      return SMESH::SMESH_Hypothesis::_duplicate( tmpHyp );
+  }
+  else {
+    double diagonal = 0;
+    if ( mesh )
+      diagonal = mesh->GetShapeDiagonalSize();
+    else
+      diagonal = ::SMESH_Mesh::GetShapeDiagonalSize( shape );
+    ::SMESH_Hypothesis::TDefaults dflts;
+    dflts._elemLength = diagonal / myGen.GetBoundaryBoxSegmentation();
+    dflts._nbSegments = myGen.GetDefaultNbSegments();
+    dflts._shape      = &shape;
+    // let the temporary hypothesis initialize it's values
+    if ( hyp->SetParametersByDefaults( dflts, mesh ))
+      return SMESH::SMESH_Hypothesis::_duplicate( tmpHyp );
   }
+
+  return SMESH::SMESH_Hypothesis::_nil();
 }
 
 //=============================================================================
 /*!
- *  
+ * Sets number of segments per diagonal of boundary box of geometry by which
+ * default segment length of appropriate 1D hypotheses is defined
  */
 //=============================================================================
 
-char* SMESH_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject,
-                                         const char* aLocalPersistentID,
-                                         CORBA::Boolean isMultiFile,
-                                         CORBA::Boolean isASCII)
+void SMESH_Gen_i::SetBoundaryBoxSegmentation( CORBA::Long theNbSegments )
+  throw ( SALOME::SALOME_Exception )
+{
+  if ( theNbSegments > 0 )
+    myGen.SetBoundaryBoxSegmentation( int( theNbSegments ));
+  else
+    THROW_SALOME_CORBA_EXCEPTION( "non-positive number of segments", SALOME::BAD_PARAM );
+}
+//=============================================================================
+  /*!
+   * \brief Sets default number of segments per edge
+   */
+//=============================================================================
+void SMESH_Gen_i::SetDefaultNbSegments(CORBA::Long theNbSegments)
+  throw ( SALOME::SALOME_Exception )
 {
-  MESSAGE("SMESH_Gen_i::LocalPersistentIDToIOR");
-  SCRUTE(aLocalPersistentID);
-  string clef = string(aLocalPersistentID);
-  SCRUTE(_SMESHCorbaObj[clef].c_str());
-  return CORBA::string_dup(_SMESHCorbaObj[clef].c_str());
+  if ( theNbSegments > 0 )
+    myGen.SetDefaultNbSegments( int(theNbSegments) );
+  else
+    THROW_SALOME_CORBA_EXCEPTION( "non-positive number of segments", SALOME::BAD_PARAM );
 }
 
 //=============================================================================
 /*!
- *  
- */
+  Set an option value
+*/
 //=============================================================================
 
-SMESH_topo* SMESH_Gen_i::ExploreMainShape(GEOM::GEOM_Gen_ptr geomEngine,
-                                          CORBA::Long studyId,
-                                          GEOM::GEOM_Shape_ptr aShape)
+void SMESH_Gen_i::SetOption(const char* name, const char* value)
 {
-  MESSAGE("SMESH_Mesh_i::ExploreMainShape");
-  // _narrow() duplicates the reference and check the type
-  GEOM::GEOM_Gen_var geom = GEOM::GEOM_Gen::_narrow(geomEngine);
-  GEOM::GEOM_Shape_var myShape = GEOM::GEOM_Shape::_narrow(aShape);
-
-  if (CORBA::is_nil(geom))
-    THROW_SALOME_CORBA_EXCEPTION("bad geom reference", \
-                                 SALOME::BAD_PARAM);
-  if (CORBA::is_nil(myShape))
-    THROW_SALOME_CORBA_EXCEPTION("bad shape reference", \
-                                 SALOME::BAD_PARAM);
-  MESSAGE("---");
-  SCRUTE(myShape->Name());
-  geom->GetCurrentStudy(studyId);
-  SCRUTE(studyId);
-  TopoDS_Shape mainShape  = _ShapeReader->GetShape(geom,myShape);
-  MESSAGE("---");
-
-  // create an SMESH_topo object for the mainShape
-
-  SMESH_topo* myTopo = new SMESH_topo();
-  MESSAGE("---");
-
-  // explore local TopoDS_Shape, store reference of local TopoDS subShapes
-
-  for (TopExp_Explorer exp(mainShape,TopAbs_COMPOUND); exp.More(); exp.Next())
-    {
-      const TopoDS_Compound& E = TopoDS::Compound(exp.Current());
-      int i = myTopo->_myShapes[TopAbs_COMPOUND].Add(E);
-      SCRUTE(i);
-    }
-  for (TopExp_Explorer exp(mainShape,TopAbs_COMPSOLID); exp.More(); exp.Next())
-    {
-      const TopoDS_CompSolid& E = TopoDS::CompSolid(exp.Current());
-      int i = myTopo->_myShapes[TopAbs_COMPSOLID].Add(E);
-      SCRUTE(i);
-    }
-  for (TopExp_Explorer exp(mainShape,TopAbs_SOLID); exp.More(); exp.Next())
-    {
-      const TopoDS_Solid& E = TopoDS::Solid(exp.Current());
-      int i = myTopo->_myShapes[TopAbs_SOLID].Add(E);
-      SCRUTE(i);
-    }
-  for (TopExp_Explorer exp(mainShape,TopAbs_SHELL); exp.More(); exp.Next())
+  if ( name && value && strlen( value ) > 0 )
+  {
+    string msgToGUI; 
+    if ( strcmp(name, "historical_python_dump") == 0 )
     {
-      const TopoDS_Shell& E = TopoDS::Shell(exp.Current());
-      int i = myTopo->_myShapes[TopAbs_SHELL].Add(E);
-      SCRUTE(i);
+      myIsHistoricalPythonDump = ( value[0] == '1' || toupper(value[0]) == 'T' ); // 1 || true
+      msgToGUI = "preferences/SMESH/historical_python_dump/";
+      msgToGUI += myIsHistoricalPythonDump ? "true" : "false";
     }
-  for (TopExp_Explorer exp(mainShape,TopAbs_FACE); exp.More(); exp.Next())
+    else if ( strcmp(name, "forget_mesh_on_hyp_modif") == 0 )
     {
-      const TopoDS_Face& E = TopoDS::Face(exp.Current());
-      int i = myTopo->_myShapes[TopAbs_FACE].Add(E);
-      SCRUTE(i);
+      myToForgetMeshDataOnHypModif = ( value[0] == '1' || toupper(value[0]) == 'T' ); // 1 || true
+      msgToGUI = "preferences/SMESH/forget_mesh_on_hyp_modif/";
+      msgToGUI += myToForgetMeshDataOnHypModif ? "true" : "false";
     }
-  for (TopExp_Explorer exp(mainShape,TopAbs_WIRE); exp.More(); exp.Next())
+
+    // update preferences in case if SetOption() is invoked from python console
+    if ( !msgToGUI.empty() )
     {
-      const TopoDS_Wire& E = TopoDS::Wire(exp.Current());
-      int i = myTopo->_myShapes[TopAbs_WIRE].Add(E);
-      SCRUTE(i);
+      CORBA::Object_var obj = SMESH_Gen_i::GetNS()->Resolve( "/Kernel/Session" );
+      SALOME::Session_var session = SALOME::Session::_narrow( obj );
+      if ( !CORBA::is_nil( session ) )
+        session->emitMessageOneWay(msgToGUI.c_str());
     }
-  for (TopExp_Explorer exp(mainShape,TopAbs_EDGE); exp.More(); exp.Next())
+  }
+}
+
+//=============================================================================
+/*!
+  Return an option value
+*/
+//=============================================================================
+
+char* SMESH_Gen_i::GetOption(const char* name)
+{
+  if ( name )
+  {
+    if ( strcmp(name, "historical_python_dump") == 0 )
     {
-      const TopoDS_Edge& E = TopoDS::Edge(exp.Current());
-      int i = myTopo->_myShapes[TopAbs_EDGE].Add(E);
-      SCRUTE(i);
+      return CORBA::string_dup( myIsHistoricalPythonDump ? "true" : "false" );
     }
-  for (TopExp_Explorer exp(mainShape,TopAbs_VERTEX); exp.More(); exp.Next())
+    if ( strcmp(name, "forget_mesh_on_hyp_modif") == 0 )
     {
-      const TopoDS_Vertex& E = TopoDS::Vertex(exp.Current());
-      int i = myTopo->_myShapes[TopAbs_VERTEX].Add(E);
-      SCRUTE(i);
+      return CORBA::string_dup( myToForgetMeshDataOnHypModif ? "true" : "false" );
     }
-  
-  // explore subShapes of distant CORBA object,
-  // associate distant CORBA subShape references
-  // with local reference to local TopoDS subShape
+  }
+  return CORBA::string_dup( "" );
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::CreateMesh
+ *
+ *  Create empty mesh on a shape and publish it in the study
+ */
+//=============================================================================
+
+SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMesh( GEOM::GEOM_Object_ptr theShapeObject )
+     throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMesh" );
+  // create mesh
+  SMESH::SMESH_Mesh_var mesh = this->createMesh();
+  // set shape
+  SMESH_Mesh_i* meshServant = SMESH::DownCast<SMESH_Mesh_i*>( mesh );
+  ASSERT( meshServant );
+  meshServant->SetShape( theShapeObject );
+
+  // publish mesh in the study
+  if ( CanPublishInStudy( mesh ) ) {
+    SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+    aStudyBuilder->NewCommand();  // There is a transaction
+    SALOMEDS::SObject_wrap aSO = PublishMesh( myCurrentStudy, mesh.in() );
+    aStudyBuilder->CommitCommand();
+    if ( !aSO->_is_nil() ) {
+      // Update Python script
+      TPythonDump() << aSO << " = " << this << ".CreateMesh(" << theShapeObject << ")";
+    }
+  }
+
+  return mesh._retn();
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::CreateEmptyMesh
+ *
+ *  Create empty mesh
+ */
+//=============================================================================
+
+SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateEmptyMesh()
+     throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMesh" );
+  // create mesh
+  SMESH::SMESH_Mesh_var mesh = this->createMesh();
+
+  // publish mesh in the study
+  if ( CanPublishInStudy( mesh ) ) {
+    SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+    aStudyBuilder->NewCommand();  // There is a transaction
+    SALOMEDS::SObject_wrap aSO = PublishMesh( myCurrentStudy, mesh.in() );
+    aStudyBuilder->CommitCommand();
+    if ( !aSO->_is_nil() ) {
+      // Update Python script
+      TPythonDump() << aSO << " = " << this << ".CreateEmptyMesh()";
+    }
+  }
+
+  return mesh._retn();
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::CreateMeshFromUNV
+ *
+ *  Create mesh and import data from UNV file
+ */
+//=============================================================================
+
+SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMeshesFromUNV( const char* theFileName )
+  throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMeshesFromUNV" );
+
+  SMESH::SMESH_Mesh_var aMesh = createMesh();
+  string aFileName;
+  // publish mesh in the study
+  if ( CanPublishInStudy( aMesh ) ) {
+    SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+    aStudyBuilder->NewCommand();  // There is a transaction
+    SALOMEDS::SObject_wrap aSO = PublishMesh( myCurrentStudy, aMesh.in(), aFileName.c_str() );
+    aStudyBuilder->CommitCommand();
+    if ( !aSO->_is_nil() ) {
+      // Update Python script
+      TPythonDump() << aSO << " = " << this << ".CreateMeshesFromUNV(r'" << theFileName << "')";
+    }
+  }
+
+  SMESH_Mesh_i* aServant = dynamic_cast<SMESH_Mesh_i*>( GetServant( aMesh ).in() );
+  ASSERT( aServant );
+  aServant->ImportUNVFile( theFileName );
+
+  // Dump creation of groups
+  SMESH::ListOfGroups_var groups = aServant->GetGroups();
+
+  aServant->GetImpl().GetMeshDS()->Modified();
+  return aMesh._retn();
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::CreateMeshFromMED
+ *
+ *  Create mesh and import data from MED file
+ */
+//=============================================================================
+
+SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromMEDorSAUV( const char* theFileName,
+                                                           SMESH::DriverMED_ReadStatus& theStatus,
+                                                           const char* theCommandNameForPython,
+                                                           const char* theFileNameForPython)
+{
+#ifdef WIN32
+  char bname[ _MAX_FNAME ];
+  _splitpath( theFileNameForPython, NULL, NULL, bname, NULL );
+  string aFileName = bname;
+#else
+  string aFileName = basename( theFileNameForPython );
+#endif
+  // Retrieve mesh names from the file
+  DriverMED_R_SMESHDS_Mesh myReader;
+  myReader.SetFile( theFileName );
+  myReader.SetMeshId( -1 );
+  Driver_Mesh::Status aStatus;
+  list<string> aNames = myReader.GetMeshNames(aStatus);
+  SMESH::mesh_array_var aResult = new SMESH::mesh_array();
+  theStatus = (SMESH::DriverMED_ReadStatus)aStatus;
+
+  { // open a new scope to make aPythonDump die before PythonDump in SMESH_Mesh::GetGroups()
+
+  // Python Dump
+  TPythonDump aPythonDump;
+  aPythonDump << "([";
+
+  if (theStatus == SMESH::DRS_OK) {
+    SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+    aStudyBuilder->NewCommand();  // There is a transaction
+    aResult->length( aNames.size() );
+    int i = 0;
+
+    // Iterate through all meshes and create mesh objects
+    for ( list<string>::iterator it = aNames.begin(); it != aNames.end(); it++ ) {
+      // Python Dump
+      if (i > 0) aPythonDump << ", ";
+
+      // create mesh
+      SMESH::SMESH_Mesh_var mesh = createMesh();
+
+      // publish mesh in the study
+      SALOMEDS::SObject_wrap aSO;
+      if ( CanPublishInStudy( mesh ) )
+        // little trick: for MED file theFileName and theFileNameForPython are the same, but they are different for SAUV
+        // - as names of meshes are stored in MED file, we use them for data publishing
+        // - as mesh name is not stored in UNV file, we use file name as name of mesh when publishing data
+        aSO = PublishMesh( myCurrentStudy, mesh.in(), ( theFileName == theFileNameForPython ) ? (*it).c_str() : aFileName.c_str() );
+      if ( !aSO->_is_nil() ) {
+        // Python Dump
+        aPythonDump << aSO;
+      } else {
+        // Python Dump
+        aPythonDump << "mesh_" << i;
+      }
+
+      // Read mesh data (groups are published automatically by ImportMEDFile())
+      SMESH_Mesh_i* meshServant = dynamic_cast<SMESH_Mesh_i*>( GetServant( mesh ).in() );
+      ASSERT( meshServant );
+      SMESH::DriverMED_ReadStatus status1 =
+        meshServant->ImportMEDFile( theFileName, (*it).c_str() );
+      if (status1 > theStatus)
+        theStatus = status1;
+
+      aResult[i++] = SMESH::SMESH_Mesh::_duplicate( mesh );
+      meshServant->GetImpl().GetMeshDS()->Modified();
+    }
+    aStudyBuilder->CommitCommand();
+  }
+
+  // Update Python script
+  aPythonDump << "], status) = " << this << "." << theCommandNameForPython << "(r'" << theFileNameForPython << "')";
+  }
+  // Dump creation of groups
+  for ( int i = 0; i < aResult->length(); ++i )
+    SMESH::ListOfGroups_var groups = aResult[ i ]->GetGroups();
+
+  return aResult._retn();
+}
+
+SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromMED( const char* theFileName,
+                                                     SMESH::DriverMED_ReadStatus& theStatus)
+     throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMeshFromMED" );
+  SMESH::mesh_array* result = CreateMeshesFromMEDorSAUV(theFileName, theStatus, "CreateMeshesFromMED", theFileName);
+  return result;
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::CreateMeshFromSAUV
+ *
+ *  Create mesh and import data from SAUV file
+ */
+//=============================================================================
+
+SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromSAUV( const char* theFileName,
+                                                      SMESH::DriverMED_ReadStatus& theStatus)
+     throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMeshFromSAUV" );
+  std::string sauvfilename(theFileName);
+  std::string medfilename(theFileName);
+  medfilename += ".med";
+  std::string cmd;
+#ifdef WNT
+  cmd = "%PYTHONBIN% ";
+#else
+  cmd = "python ";
+#endif
+  cmd += "-c \"";
+  cmd += "from medutilities import convert ; convert(r'" + sauvfilename + "', 'GIBI', 'MED', 1, r'" + medfilename + "')";
+  cmd += "\"";
+  system(cmd.c_str());
+  SMESH::mesh_array* result = CreateMeshesFromMEDorSAUV(medfilename.c_str(), theStatus, "CreateMeshesFromSAUV", sauvfilename.c_str());
+#ifdef WNT
+  cmd = "%PYTHONBIN% ";
+#else
+  cmd = "python ";
+#endif
+  cmd += "-c \"";
+  cmd += "from medutilities import my_remove ; my_remove(r'" + medfilename + "')";
+  cmd += "\"";
+  system(cmd.c_str());
+  return result;
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::CreateMeshFromSTL
+ *
+ *  Create mesh and import data from STL file
+ */
+//=============================================================================
+
+SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMeshesFromSTL( const char* theFileName )
+  throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMeshesFromSTL" );
+
+  SMESH::SMESH_Mesh_var aMesh = createMesh();
+  //string aFileName;
+#ifdef WIN32
+  char bname[ _MAX_FNAME ];
+  _splitpath( theFileName, NULL, NULL, bname, NULL );
+  string aFileName = bname;
+#else
+  string aFileName = basename( theFileName );
+#endif
+  // publish mesh in the study
+  if ( CanPublishInStudy( aMesh ) ) {
+    SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+    aStudyBuilder->NewCommand();  // There is a transaction
+    SALOMEDS::SObject_wrap aSO = PublishInStudy
+      ( myCurrentStudy, SALOMEDS::SObject::_nil(), aMesh.in(), aFileName.c_str() );
+    aStudyBuilder->CommitCommand();
+    if ( !aSO->_is_nil() ) {
+      // Update Python script
+      TPythonDump() << aSO << " = " << this << ".CreateMeshesFromSTL(r'" << theFileName << "')";
+    }
+  }
+
+  SMESH_Mesh_i* aServant = dynamic_cast<SMESH_Mesh_i*>( GetServant( aMesh ).in() );
+  ASSERT( aServant );
+  aServant->ImportSTLFile( theFileName );
+  aServant->GetImpl().GetMeshDS()->Modified();
+  return aMesh._retn();
+}
+
+//================================================================================
+/*!
+ * \brief Create meshes and import data from the CGSN file
+ */
+//================================================================================
+
+SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromCGNS( const char* theFileName,
+                                                      SMESH::DriverMED_ReadStatus& theStatus)
+  throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+
+  SMESH::mesh_array_var aResult = new SMESH::mesh_array();
+
+#ifdef WITH_CGNS
+  // Retrieve nb meshes from the file
+  DriverCGNS_Read myReader;
+  myReader.SetFile( theFileName );
+  Driver_Mesh::Status aStatus;
+  int nbMeshes = myReader.GetNbMeshes(aStatus);
+  theStatus = (SMESH::DriverMED_ReadStatus)aStatus;
+
+  aResult->length( nbMeshes );
+
+  { // open a new scope to make aPythonDump die before PythonDump in SMESH_Mesh::GetGroups()
+
+    // Python Dump
+    TPythonDump aPythonDump;
+    aPythonDump << "([";
+
+    if (theStatus == SMESH::DRS_OK)
+    {
+      SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+      aStudyBuilder->NewCommand();  // There is a transaction
+
+      int i = 0;
+
+      // Iterate through all meshes and create mesh objects
+      for ( ; i < nbMeshes; ++i )
+      {
+        // Python Dump
+        if (i > 0) aPythonDump << ", ";
+
+        // create mesh
+        SMESH::SMESH_Mesh_var mesh = createMesh();
+        aResult[i] = SMESH::SMESH_Mesh::_duplicate( mesh );
+
+        // Read mesh data (groups are published automatically by ImportMEDFile())
+        SMESH_Mesh_i* meshServant = dynamic_cast<SMESH_Mesh_i*>( GetServant( mesh ).in() );
+        ASSERT( meshServant );
+        string meshName;
+        SMESH::DriverMED_ReadStatus status1 =
+          meshServant->ImportCGNSFile( theFileName, i, meshName );
+        if (status1 > theStatus)
+          theStatus = status1;
+
+        meshServant->GetImpl().GetMeshDS()->Modified();
+        // publish mesh in the study
+        SALOMEDS::SObject_wrap aSO;
+        if ( CanPublishInStudy( mesh ) )
+          aSO = PublishMesh( myCurrentStudy, mesh.in(), meshName.c_str() );
+
+        // Python Dump
+        if ( !aSO->_is_nil() ) {
+          aPythonDump << aSO;
+        }
+        else {
+          aPythonDump << "mesh_" << i;
+        }
+      }
+      aStudyBuilder->CommitCommand();
+    }
+
+    aPythonDump << "], status) = " << this << ".CreateMeshesFromCGNS(r'" << theFileName << "')";
+  }
+  // Dump creation of groups
+  for ( int i = 0; i < aResult->length(); ++i )
+    SMESH::ListOfGroups_var groups = aResult[ i ]->GetGroups();
+#else
+  THROW_SALOME_CORBA_EXCEPTION("CGNS library is unavailable", SALOME::INTERNAL_ERROR);
+#endif
+
+  return aResult._retn();
+}
+
+//================================================================================
+/*!
+ * \brief Create a mesh and import data from a GMF file
+ */
+//================================================================================
+
+SMESH::SMESH_Mesh_ptr
+SMESH_Gen_i::CreateMeshesFromGMF( const char*             theFileName,
+                                  CORBA::Boolean          theMakeRequiredGroups,
+                                  SMESH::ComputeError_out theError)
+    throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+
+  SMESH::SMESH_Mesh_var aMesh = createMesh();
+#ifdef WIN32
+  char bname[ _MAX_FNAME ];
+  _splitpath( theFileName, NULL, NULL, bname, NULL );
+  string aFileName = bname;
+#else
+  string aFileName = basename( theFileName );
+#endif
+  // publish mesh in the study
+  if ( CanPublishInStudy( aMesh ) ) {
+    SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+    aStudyBuilder->NewCommand();  // There is a transaction
+    SALOMEDS::SObject_wrap aSO = PublishInStudy
+      ( myCurrentStudy, SALOMEDS::SObject::_nil(), aMesh.in(), aFileName.c_str() );
+    aStudyBuilder->CommitCommand();
+    if ( !aSO->_is_nil() ) {
+      // Update Python script
+      TPythonDump() << "("<< aSO << ", error) = " << this << ".CreateMeshesFromGMF(r'"
+                    << theFileName << "', "
+                    << theMakeRequiredGroups << " )";
+    }
+  }
+  SMESH_Mesh_i* aServant = dynamic_cast<SMESH_Mesh_i*>( GetServant( aMesh ).in() );
+  ASSERT( aServant );
+  theError = aServant->ImportGMFFile( theFileName, theMakeRequiredGroups );
+  aServant->GetImpl().GetMeshDS()->Modified();
+  return aMesh._retn();
+}
+
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::IsReadyToCompute
+ *
+ *  Returns true if mesh contains enough data to be computed
+ */
+//=============================================================================
+
+CORBA::Boolean SMESH_Gen_i::IsReadyToCompute( SMESH::SMESH_Mesh_ptr theMesh,
+                                              GEOM::GEOM_Object_ptr theShapeObject )
+  throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::IsReadyToCompute" );
+
+  if ( CORBA::is_nil( theShapeObject ) )
+    THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference",
+                                  SALOME::BAD_PARAM );
+
+  if ( CORBA::is_nil( theMesh ) )
+    THROW_SALOME_CORBA_EXCEPTION( "bad Mesh reference",
+                                  SALOME::BAD_PARAM );
+
+  try {
+    // get mesh servant
+    SMESH_Mesh_i* meshServant = dynamic_cast<SMESH_Mesh_i*>( GetServant( theMesh ).in() );
+    ASSERT( meshServant );
+    if ( meshServant ) {
+      // get local TopoDS_Shape
+      TopoDS_Shape myLocShape = GeomObjectToShape( theShapeObject );
+      // call implementation
+      ::SMESH_Mesh& myLocMesh = meshServant->GetImpl();
+      return myGen.CheckAlgoState( myLocMesh, myLocShape );
+    }
+  }
+  catch ( SALOME_Exception& S_ex ) {
+    INFOS( "catch exception "<< S_ex.what() );
+  }
+  return false;
+}
+
+//================================================================================
+/*!
+ * \brief  Find SObject for an algo
+ */
+//================================================================================
+
+SALOMEDS::SObject_ptr SMESH_Gen_i::GetAlgoSO(const ::SMESH_Algo* algo)
+{
+  if ( algo ) {
+    if ( !myCurrentStudy->_is_nil() ) {
+      // find algo in the study
+      CORBA::String_var compDataType  = ComponentDataType();
+      SALOMEDS::SComponent_wrap father = myCurrentStudy->FindComponent( compDataType.in() );
+      if ( !father->_is_nil() ) {
+        SALOMEDS::ChildIterator_wrap itBig = myCurrentStudy->NewChildIterator( father );
+        for ( ; itBig->More(); itBig->Next() ) {
+          SALOMEDS::SObject_wrap gotBranch = itBig->Value();
+          if ( gotBranch->Tag() == GetAlgorithmsRootTag() ) {
+            SALOMEDS::ChildIterator_wrap algoIt = myCurrentStudy->NewChildIterator( gotBranch );
+            for ( ; algoIt->More(); algoIt->Next() ) {
+              SALOMEDS::SObject_wrap algoSO = algoIt->Value();
+              CORBA::Object_var     algoIOR = SObjectToObject( algoSO );
+              if ( !CORBA::is_nil( algoIOR )) {
+                SMESH_Hypothesis_i* impl = SMESH::DownCast<SMESH_Hypothesis_i*>( algoIOR );
+                if ( impl && impl->GetImpl() == algo )
+                  return algoSO._retn();
+              }
+            } // loop on algo SO's
+            break;
+          } // if algo tag
+        } // SMESH component iterator
+      }
+    }
+  }
+  return SALOMEDS::SObject::_nil();
+}
+
+//================================================================================
+/*!
+ * \brief Return errors of mesh computation
+ */
+//================================================================================
+
+SMESH::compute_error_array* SMESH_Gen_i::GetComputeErrors( SMESH::SMESH_Mesh_ptr theMesh,
+                                                           GEOM::GEOM_Object_ptr theSubObject )
+  throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetComputeErrors()" );
+
+  if ( CORBA::is_nil( theSubObject ) && theMesh->HasShapeToMesh())
+    THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM );
+
+  if ( CORBA::is_nil( theMesh ) )
+    THROW_SALOME_CORBA_EXCEPTION( "bad Mesh reference",SALOME::BAD_PARAM );
+
+  SMESH::compute_error_array_var error_array = new SMESH::compute_error_array;
+  try {
+    if ( SMESH_Mesh_i* meshServant = SMESH::DownCast<SMESH_Mesh_i*>( theMesh ))
+    {
+      TopoDS_Shape shape;
+      if(theMesh->HasShapeToMesh())
+        shape = GeomObjectToShape( theSubObject );
+      else
+        shape = SMESH_Mesh::PseudoShape();
+
+      ::SMESH_Mesh& mesh = meshServant->GetImpl();
+
+      error_array->length( mesh.GetMeshDS()->MaxShapeIndex() );
+      int nbErr = 0;
+
+      SMESH_subMesh *sm = mesh.GetSubMesh(shape);
+      const bool includeSelf = true, complexShapeFirst = true;
+      SMESH_subMeshIteratorPtr smIt = sm->getDependsOnIterator(includeSelf,
+                                                               complexShapeFirst);
+      while ( smIt->more() )
+      {
+        sm = smIt->next();
+        // if ( sm->GetSubShape().ShapeType() == TopAbs_VERTEX )
+        //   break;
+        SMESH_ComputeErrorPtr error = sm->GetComputeError();
+        if ( error && !error->IsOK() && error->myAlgo )
+        {
+          SMESH::ComputeError & errStruct = error_array[ nbErr++ ];
+          errStruct.code       = -( error->myName < 0 ? error->myName + 1: error->myName ); // -1 -> 0
+          errStruct.comment    = error->myComment.c_str();
+          errStruct.subShapeID = sm->GetId();
+          SALOMEDS::SObject_wrap algoSO = GetAlgoSO( error->myAlgo );
+          if ( !algoSO->_is_nil() ) {
+            CORBA::String_var algoName = algoSO->GetName();
+            errStruct.algoName = algoName;
+          }
+          else {
+            errStruct.algoName = error->myAlgo->GetName();
+          }
+          errStruct.hasBadMesh = !error->myBadElements.empty();
+        }
+      }
+      error_array->length( nbErr );
+    }
+  }
+  catch ( SALOME_Exception& S_ex ) {
+    INFOS( "catch exception "<< S_ex.what() );
+  }
+
+  return error_array._retn();
+}
+
+//================================================================================
+/*!
+ * \brief Return mesh elements preventing computation of a subshape
+ */
+//================================================================================
+
+SMESH::MeshPreviewStruct*
+SMESH_Gen_i::GetBadInputElements( SMESH::SMESH_Mesh_ptr theMesh,
+                                  CORBA::Short          theSubShapeID )
+  throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetBadInputElements()" );
+
+  if ( CORBA::is_nil( theMesh ) )
+    THROW_SALOME_CORBA_EXCEPTION( "bad Mesh reference",SALOME::BAD_PARAM );
+
+  SMESH::MeshPreviewStruct_var result = new SMESH::MeshPreviewStruct;
+  try {
+    // mesh servant
+    if ( SMESH_Mesh_i* meshServant = SMESH::DownCast<SMESH_Mesh_i*>( theMesh ))
+    {
+      // mesh implementation
+      ::SMESH_Mesh& mesh = meshServant->GetImpl();
+      // submesh by subshape id
+      if ( SMESH_subMesh * sm = mesh.GetSubMeshContaining( theSubShapeID ))
+      {
+        // compute error
+        SMESH_ComputeErrorPtr error = sm->GetComputeError();
+        if ( error && !error->myBadElements.empty())
+        {
+          typedef map<const SMDS_MeshElement*, int > TNode2LocalIDMap;
+          typedef TNode2LocalIDMap::iterator         TNodeLocalID;
+
+          // get nodes of elements and count elements
+          TNode2LocalIDMap mapNode2LocalID;
+          list< TNodeLocalID > connectivity;
+          int i, nbElements = 0, nbConnNodes = 0;
+
+          list<const SMDS_MeshElement*>::iterator elemIt  = error->myBadElements.begin();
+          list<const SMDS_MeshElement*>::iterator elemEnd = error->myBadElements.end();
+          for ( ; elemIt != elemEnd; ++elemIt, ++nbElements )
+          {
+            SMDS_ElemIteratorPtr nIt = (*elemIt)->nodesIterator();
+            while ( nIt->more() )
+              connectivity.push_back
+                ( mapNode2LocalID.insert( make_pair( nIt->next(), ++nbConnNodes)).first );
+          }
+          // fill node coords and assign local ids to the nodes
+          int nbNodes = mapNode2LocalID.size();
+          result->nodesXYZ.length( nbNodes );
+          TNodeLocalID node2ID = mapNode2LocalID.begin();
+          for ( i = 0; i < nbNodes; ++i, ++node2ID ) {
+            node2ID->second = i;
+            const SMDS_MeshNode* node = (const SMDS_MeshNode*) node2ID->first;
+            result->nodesXYZ[i].x = node->X();
+            result->nodesXYZ[i].y = node->Y();
+            result->nodesXYZ[i].z = node->Z();
+          }
+          // fill connectivity
+          result->elementConnectivities.length( nbConnNodes );
+          list< TNodeLocalID >::iterator connIt = connectivity.begin();
+          for ( i = 0; i < nbConnNodes; ++i, ++connIt ) {
+            result->elementConnectivities[i] = (*connIt)->second;
+          }
+          // fill element types
+          result->elementTypes.length( nbElements );
+          for ( i = 0, elemIt = error->myBadElements.begin(); i <nbElements; ++i, ++elemIt )
+          {
+            const SMDS_MeshElement* elem = *elemIt;
+            result->elementTypes[i].SMDS_ElementType = (SMESH::ElementType) elem->GetType();
+            result->elementTypes[i].isPoly           = elem->IsPoly();
+            result->elementTypes[i].nbNodesInElement = elem->NbNodes();
+          }
+        }
+      }
+    }
+  }
+  catch ( SALOME_Exception& S_ex ) {
+    INFOS( "catch exception "<< S_ex.what() );
+  }
+
+  return result._retn();
+}
+
+//================================================================================
+/*!
+ * \brief Create a group of elements preventing computation of a sub-shape
+ */
+//================================================================================
+
+SMESH::ListOfGroups*
+SMESH_Gen_i::MakeGroupsOfBadInputElements( SMESH::SMESH_Mesh_ptr theMesh,
+                                           CORBA::Short          theSubShapeID,
+                                           const char*           theGroupName )
+  throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+
+  SMESH::ListOfGroups_var groups;
+
+  if ( CORBA::is_nil( theMesh ) )
+    THROW_SALOME_CORBA_EXCEPTION( "bad Mesh reference",SALOME::BAD_PARAM );
+
+  try {
+    if ( SMESH_Mesh_i* meshServant = SMESH::DownCast<SMESH_Mesh_i*>( theMesh ))
+    {
+      groups = meshServant->MakeGroupsOfBadInputElements( theSubShapeID, theGroupName );
+      TPythonDump() << groups << " = " << this
+                    << ".MakeGroupsOfBadInputElements( "
+                    << theMesh << ", " << theSubShapeID << ", '" << theGroupName << "' )";
+    }
+  }
+  catch ( SALOME_Exception& S_ex ) {
+    INFOS( "catch exception "<< S_ex.what() );
+  }
+  return groups._retn();
+}
+
+//================================================================================
+/*!
+ * \brief Returns errors of hypotheses definintion
+ * \param theMesh - the mesh
+ * \param theSubObject - the main or sub- shape
+ * \retval SMESH::algo_error_array* - sequence of errors
+ */
+//================================================================================
+
+SMESH::algo_error_array* SMESH_Gen_i::GetAlgoState( SMESH::SMESH_Mesh_ptr theMesh,
+                                                    GEOM::GEOM_Object_ptr theSubObject )
+      throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetAlgoState()" );
+
+  if ( CORBA::is_nil( theSubObject ) && theMesh->HasShapeToMesh())
+    THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM );
+
+  if ( CORBA::is_nil( theMesh ) )
+    THROW_SALOME_CORBA_EXCEPTION( "bad Mesh reference",SALOME::BAD_PARAM );
+
+  SMESH::algo_error_array_var error_array = new SMESH::algo_error_array;
+  try {
+    SMESH_Mesh_i* meshServant = SMESH::DownCast<SMESH_Mesh_i*>( theMesh );
+    ASSERT( meshServant );
+    if ( meshServant ) {
+      TopoDS_Shape myLocShape;
+      if(theMesh->HasShapeToMesh())
+        myLocShape = GeomObjectToShape( theSubObject );
+      else
+        myLocShape = SMESH_Mesh::PseudoShape();
+
+      ::SMESH_Mesh& myLocMesh = meshServant->GetImpl();
+      list< ::SMESH_Gen::TAlgoStateError > error_list;
+      list< ::SMESH_Gen::TAlgoStateError >::iterator error;
+      // call ::SMESH_Gen::GetAlgoState()
+      myGen.GetAlgoState( myLocMesh, myLocShape, error_list );
+      error_array->length( error_list.size() );
+      int i = 0;
+      for ( error = error_list.begin(); error != error_list.end(); ++error )
+      {
+        // fill AlgoStateError structure
+        SMESH::AlgoStateError & errStruct = error_array[ i++ ];
+        errStruct.state        = SMESH_Mesh_i::ConvertHypothesisStatus( error->_name );
+        errStruct.algoDim      = error->_algoDim;
+        errStruct.isGlobalAlgo = error->_isGlobalAlgo;
+        errStruct.algoName     = "";
+        SALOMEDS::SObject_wrap algoSO = GetAlgoSO( error->_algo );
+        if ( !algoSO->_is_nil() ) {
+          CORBA::String_var algoName = algoSO->GetName();
+          errStruct.algoName = algoName.in();
+        }
+      }
+    }
+  }
+  catch ( SALOME_Exception& S_ex ) {
+    INFOS( "catch exception "<< S_ex.what() );
+  }
+  return error_array._retn();
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::GetSubShapesId
+ *
+ *  Get sub-shapes unique ID's list
+ */
+//=============================================================================
+
+SMESH::long_array* SMESH_Gen_i::GetSubShapesId( GEOM::GEOM_Object_ptr theMainShapeObject,
+                                            const SMESH::object_array& theListOfSubShapeObject )
+     throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetSubShapesId" );
+
+  SMESH::long_array_var shapesId = new SMESH::long_array;
+  set<int> setId;
+
+  if ( CORBA::is_nil( theMainShapeObject ) )
+    THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference",
+                                  SALOME::BAD_PARAM );
+
+  try
+    {
+      TopoDS_Shape myMainShape = GeomObjectToShape(theMainShapeObject);
+      TopTools_IndexedMapOfShape myIndexToShape;
+      TopExp::MapShapes(myMainShape,myIndexToShape);
+
+      for ( int i = 0; i < theListOfSubShapeObject.length(); i++ )
+        {
+          GEOM::GEOM_Object_var aShapeObject
+            = GEOM::GEOM_Object::_narrow(theListOfSubShapeObject[i]);
+          if ( CORBA::is_nil( aShapeObject ) )
+            THROW_SALOME_CORBA_EXCEPTION ("bad shape object reference", \
+                                        SALOME::BAD_PARAM );
+
+          TopoDS_Shape locShape  = GeomObjectToShape(aShapeObject);
+          for (TopExp_Explorer exp(locShape,TopAbs_FACE); exp.More(); exp.Next())
+            {
+              const TopoDS_Face& F = TopoDS::Face(exp.Current());
+              setId.insert(myIndexToShape.FindIndex(F));
+              if(MYDEBUG) SCRUTE(myIndexToShape.FindIndex(F));
+            }
+          for (TopExp_Explorer exp(locShape,TopAbs_EDGE); exp.More(); exp.Next())
+            {
+              const TopoDS_Edge& E = TopoDS::Edge(exp.Current());
+              setId.insert(myIndexToShape.FindIndex(E));
+              if(MYDEBUG) SCRUTE(myIndexToShape.FindIndex(E));
+            }
+          for (TopExp_Explorer exp(locShape,TopAbs_VERTEX); exp.More(); exp.Next())
+            {
+              const TopoDS_Vertex& V = TopoDS::Vertex(exp.Current());
+              setId.insert(myIndexToShape.FindIndex(V));
+              if(MYDEBUG) SCRUTE(myIndexToShape.FindIndex(V));
+            }
+        }
+      shapesId->length(setId.size());
+      set<int>::iterator iind;
+      int i=0;
+      for (iind = setId.begin(); iind != setId.end(); iind++)
+        {
+          if(MYDEBUG) SCRUTE((*iind));
+          shapesId[i] = (*iind);
+          if(MYDEBUG) SCRUTE(shapesId[i]);
+          i++;
+        }
+    }
+  catch (SALOME_Exception& S_ex)
+    {
+      THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM);
+    }
+
+  return shapesId._retn();
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::Compute
+ *
+ *  Compute mesh on a shape
+ */
+//=============================================================================
+
+CORBA::Boolean SMESH_Gen_i::Compute( SMESH::SMESH_Mesh_ptr theMesh,
+                                     GEOM::GEOM_Object_ptr theShapeObject )
+     throw ( SALOME::SALOME_Exception )
+{
+  MEMOSTAT;
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Compute" );
+
+  if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh())
+    THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference",
+                                  SALOME::BAD_PARAM );
+
+  if ( CORBA::is_nil( theMesh ) )
+    THROW_SALOME_CORBA_EXCEPTION( "bad Mesh reference",
+                                  SALOME::BAD_PARAM );
+
+  // Update Python script
+  TPythonDump() << "isDone = " << this << ".Compute( "
+                << theMesh << ", " << theShapeObject << ")";
+
+  try {
+    // get mesh servant
+    SMESH_Mesh_i* meshServant = dynamic_cast<SMESH_Mesh_i*>( GetServant( theMesh ).in() );
+    meshServant->Load();
+    ASSERT( meshServant );
+    if ( meshServant ) {
+      // NPAL16168: "geometrical group edition from a submesh don't modifiy mesh computation"
+      meshServant->CheckGeomGroupModif();
+      // get local TopoDS_Shape
+      TopoDS_Shape myLocShape;
+      if(theMesh->HasShapeToMesh())
+        myLocShape = GeomObjectToShape( theShapeObject );
+      else
+        myLocShape = SMESH_Mesh::PseudoShape();
+      // call implementation compute
+      ::SMESH_Mesh& myLocMesh = meshServant->GetImpl();
+#ifdef WITH_SMESH_CANCEL_COMPUTE
+      myGen.PrepareCompute( myLocMesh, myLocShape);
+#endif
+      bool ok = myGen.Compute( myLocMesh, myLocShape);
+      meshServant->CreateGroupServants(); // algos can create groups (issue 0020918)
+      myLocMesh.GetMeshDS()->Modified();
+      return ok;
+    }
+  }
+  catch ( std::bad_alloc ) {
+    INFOS( "Compute(): lack of memory" );
+  }
+  catch ( SALOME_Exception& S_ex ) {
+    INFOS( "Compute(): catch exception "<< S_ex.what() );
+  }
+  catch ( ... ) {
+    INFOS( "Compute(): unknown exception " );
+  }
+  return false;
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::CancelCompute
+ *
+ *  Cancel Compute mesh on a shape
+ */
+//=============================================================================
+
+void SMESH_Gen_i::CancelCompute( SMESH::SMESH_Mesh_ptr theMesh,
+                                 GEOM::GEOM_Object_ptr theShapeObject )
+{
+#ifdef WITH_SMESH_CANCEL_COMPUTE
+  SMESH_Mesh_i* meshServant = dynamic_cast<SMESH_Mesh_i*>( GetServant( theMesh ).in() );
+  ::SMESH_Mesh& myLocMesh = meshServant->GetImpl();
+  TopoDS_Shape myLocShape;
+  if(theMesh->HasShapeToMesh())
+    myLocShape = GeomObjectToShape( theShapeObject );
+  else
+    myLocShape = SMESH_Mesh::PseudoShape();
+  myGen.CancelCompute( myLocMesh, myLocShape);
+#endif
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::Precompute
+ *
+ *  Compute mesh as preview till indicated dimension on shape
+ */
+//=============================================================================
+
+SMESH::MeshPreviewStruct* SMESH_Gen_i::Precompute( SMESH::SMESH_Mesh_ptr theMesh,
+                                                   GEOM::GEOM_Object_ptr theShapeObject,
+                                                   SMESH::Dimension      theDimension,
+                                                   SMESH::long_array&    theShapesId)
+     throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Precompute" );
+
+  if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh())
+    THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference",
+                                  SALOME::BAD_PARAM );
+
+  if ( CORBA::is_nil( theMesh ) )
+    THROW_SALOME_CORBA_EXCEPTION( "bad Mesh reference",
+                                  SALOME::BAD_PARAM );
+
+  SMESH::MeshPreviewStruct_var result = new SMESH::MeshPreviewStruct;
+  try {
+    // get mesh servant
+    SMESH_Mesh_i* meshServant = dynamic_cast<SMESH_Mesh_i*>( GetServant( theMesh ).in() );
+    meshServant->Load();
+    ASSERT( meshServant );
+    if ( meshServant ) {
+      // NPAL16168: "geometrical group edition from a submesh don't modifiy mesh computation"
+      meshServant->CheckGeomGroupModif();
+      // get local TopoDS_Shape
+      TopoDS_Shape myLocShape;
+      if(theMesh->HasShapeToMesh())
+        myLocShape = GeomObjectToShape( theShapeObject );
+      else
+        return result._retn();;
+
+      // call implementation compute
+      ::SMESH_Mesh& myLocMesh = meshServant->GetImpl();
+      TSetOfInt shapeIds;
+      ::MeshDimension aDim = (MeshDimension)theDimension;
+      if ( myGen.Compute( myLocMesh, myLocShape, false, false, aDim, &shapeIds ) )
+      {
+        int nbShapeId = shapeIds.size();
+        theShapesId.length( nbShapeId );
+        // iterates on shapes and collect mesh entities into mesh preview
+        TSetOfInt::const_iterator idIt = shapeIds.begin();
+        TSetOfInt::const_iterator idEnd = shapeIds.end();
+        std::map< int, int > mapOfShIdNb;
+        std::set< SMESH_TLink > setOfEdge;
+        std::list< SMDSAbs_ElementType > listOfElemType;
+        typedef map<const SMDS_MeshElement*, int > TNode2LocalIDMap;
+        typedef TNode2LocalIDMap::iterator         TNodeLocalID;
+        TNode2LocalIDMap mapNode2LocalID;
+        list< TNodeLocalID > connectivity;
+        int i, nbConnNodes = 0;
+        std::set< const SMESH_subMesh* > setOfVSubMesh;
+        // iterates on shapes
+        for ( ; idIt != idEnd; idIt++ )
+        {
+          if ( mapOfShIdNb.find( *idIt ) != mapOfShIdNb.end() )
+            continue;
+          SMESH_subMesh* sm = myLocMesh.GetSubMeshContaining(*idIt);
+          if ( !sm || !sm->IsMeshComputed() )
+            continue;
+
+          const TopoDS_Shape& aSh = sm->GetSubShape();
+          const int shDim = myGen.GetShapeDim( aSh );
+          if ( shDim < 1 || shDim > theDimension )
+            continue;
+
+          mapOfShIdNb[ *idIt ] = 0;
+          theShapesId[ mapOfShIdNb.size() - 1 ] = *idIt;
+
+          SMESHDS_SubMesh* smDS = sm->GetSubMeshDS();
+          if ( !smDS ) continue;
+
+          if ( theDimension == SMESH::DIM_2D )
+          {
+            SMDS_ElemIteratorPtr faceIt = smDS->GetElements();
+            while ( faceIt->more() )
+            {
+              const SMDS_MeshElement* face = faceIt->next();
+              int aNbNode = face->NbNodes();
+              if ( aNbNode > 4 )
+                aNbNode /= 2; // do not take into account additional middle nodes
+
+              SMDS_MeshNode* node1 = (SMDS_MeshNode*)face->GetNode( 0 );
+              for ( int nIndx = 0; nIndx < aNbNode; nIndx++ )
+              {
+                SMDS_MeshNode* node2 = (SMDS_MeshNode*)face->GetNode( nIndx+1 < aNbNode ? nIndx+1 : 0 );
+                if ( setOfEdge.insert( SMESH_TLink ( node1, node2 ) ).second )
+                {
+                  listOfElemType.push_back( SMDSAbs_Edge );
+                  connectivity.push_back
+                    ( mapNode2LocalID.insert( make_pair( node1, ++nbConnNodes)).first );
+                  connectivity.push_back
+                    ( mapNode2LocalID.insert( make_pair( node2, ++nbConnNodes)).first );
+                }
+                node1 = node2;
+              }
+            }
+          }
+          else if ( theDimension == SMESH::DIM_1D )
+          {
+            SMDS_NodeIteratorPtr nodeIt = smDS->GetNodes();
+            while ( nodeIt->more() )
+            {
+              listOfElemType.push_back( SMDSAbs_Node );
+              connectivity.push_back
+                ( mapNode2LocalID.insert( make_pair( nodeIt->next(), ++nbConnNodes)).first );
+            }
+            // add corner nodes by first vertex from edge
+            SMESH_subMeshIteratorPtr edgeSmIt =
+              sm->getDependsOnIterator(/*includeSelf*/false,
+                                       /*complexShapeFirst*/false);
+            while ( edgeSmIt->more() )
+            {
+              SMESH_subMesh* vertexSM = edgeSmIt->next();
+              // check that vertex is not already treated
+              if ( !setOfVSubMesh.insert( vertexSM ).second )
+                continue;
+              if ( vertexSM->GetSubShape().ShapeType() != TopAbs_VERTEX )
+                continue;
+
+              const SMESHDS_SubMesh* vertexSmDS = vertexSM->GetSubMeshDS();
+              SMDS_NodeIteratorPtr nodeIt = vertexSmDS->GetNodes();
+              while ( nodeIt->more() )
+              {
+                listOfElemType.push_back( SMDSAbs_Node );
+                connectivity.push_back
+                  ( mapNode2LocalID.insert( make_pair( nodeIt->next(), ++nbConnNodes)).first );
+              }
+            }
+          }
+        }
+
+        // fill node coords and assign local ids to the nodes
+        int nbNodes = mapNode2LocalID.size();
+        result->nodesXYZ.length( nbNodes );
+        TNodeLocalID node2ID = mapNode2LocalID.begin();
+        for ( i = 0; i < nbNodes; ++i, ++node2ID ) {
+          node2ID->second = i;
+          const SMDS_MeshNode* node = (const SMDS_MeshNode*) node2ID->first;
+          result->nodesXYZ[i].x = node->X();
+          result->nodesXYZ[i].y = node->Y();
+          result->nodesXYZ[i].z = node->Z();
+        }
+        // fill connectivity
+        result->elementConnectivities.length( nbConnNodes );
+        list< TNodeLocalID >::iterator connIt = connectivity.begin();
+        for ( i = 0; i < nbConnNodes; ++i, ++connIt ) {
+          result->elementConnectivities[i] = (*connIt)->second;
+        }
+
+        // fill element types
+        result->elementTypes.length( listOfElemType.size() );
+        std::list< SMDSAbs_ElementType >::const_iterator typeIt = listOfElemType.begin();
+        std::list< SMDSAbs_ElementType >::const_iterator typeEnd = listOfElemType.end();
+        for ( i = 0; typeIt != typeEnd; ++i, ++typeIt )
+        {
+          SMDSAbs_ElementType elemType = *typeIt;
+          result->elementTypes[i].SMDS_ElementType = (SMESH::ElementType)elemType;
+          result->elementTypes[i].isPoly           = false;
+          result->elementTypes[i].nbNodesInElement = elemType == SMDSAbs_Edge ? 2 : 1;
+        }
+
+        // correct number of shapes
+        theShapesId.length( mapOfShIdNb.size() );
+      }
+    }
+  }
+  catch ( std::bad_alloc ) {
+    INFOS( "Precompute(): lack of memory" );
+  }
+  catch ( SALOME_Exception& S_ex ) {
+    INFOS( "Precompute(): catch exception "<< S_ex.what() );
+  }
+  catch ( ... ) {
+    INFOS( "Precompute(): unknown exception " );
+  }
+  return result._retn();
+}
+
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::Evaluate
+ *
+ *  Evaluate mesh on a shape
+ */
+//=============================================================================
+
+SMESH::long_array* SMESH_Gen_i::Evaluate(SMESH::SMESH_Mesh_ptr theMesh,
+                                         GEOM::GEOM_Object_ptr theShapeObject)
+//                                     SMESH::long_array& theNbElems)
+     throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Evaluate" );
+
+  if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh())
+    THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference",
+                                  SALOME::BAD_PARAM );
+
+  if ( CORBA::is_nil( theMesh ) )
+    THROW_SALOME_CORBA_EXCEPTION( "bad Mesh reference",
+                                  SALOME::BAD_PARAM );
+
+  SMESH::long_array_var nbels = new SMESH::long_array;
+  nbels->length(SMESH::Entity_Last);
+  int i = SMESH::Entity_Node;
+  for (; i < SMESH::Entity_Last; i++)
+    nbels[i] = 0;
+
+  // Update Python script
+  TPythonDump() << "theNbElems = " << this << ".Evaluate( "
+                << theMesh << ", " << theShapeObject << ")";
+
+  try {
+    // get mesh servant
+    SMESH_Mesh_i* meshServant = dynamic_cast<SMESH_Mesh_i*>( GetServant( theMesh ).in() );
+    ASSERT( meshServant );
+    if ( meshServant ) {
+      // NPAL16168: "geometrical group edition from a submesh don't modifiy mesh computation"
+      meshServant->CheckGeomGroupModif();
+      // get local TopoDS_Shape
+      TopoDS_Shape myLocShape;
+      if(theMesh->HasShapeToMesh())
+        myLocShape = GeomObjectToShape( theShapeObject );
+      else
+        myLocShape = SMESH_Mesh::PseudoShape();
+      // call implementation compute
+      ::SMESH_Mesh& myLocMesh = meshServant->GetImpl();
+      MapShapeNbElems aResMap;
+      /*CORBA::Boolean ret =*/ myGen.Evaluate( myLocMesh, myLocShape, aResMap);
+      MapShapeNbElemsItr anIt = aResMap.begin();
+      for(; anIt!=aResMap.end(); anIt++) {
+        const vector<int>& aVec = (*anIt).second;
+        for(i = SMESH::Entity_Node; i < aVec.size(); i++) {
+          int nbElem = aVec[i];
+          if ( nbElem < 0 ) // algo failed, check that it has reported a message
+          {
+            SMESH_subMesh* sm = anIt->first;
+            SMESH_ComputeErrorPtr& error = sm->GetComputeError();
+            const SMESH_Algo* algo = myGen.GetAlgo( myLocMesh, sm->GetSubShape());
+            if ( (algo && !error.get()) || error->IsOK() )
+              error.reset( new SMESH_ComputeError( COMPERR_ALGO_FAILED,"Failed to evaluate",algo));
+          }
+          else
+          {
+            nbels[i] += aVec[i];
+          }
+        }
+      }
+      return nbels._retn();
+    }
+  }
+  catch ( std::bad_alloc ) {
+    INFOS( "Evaluate(): lack of memory" );
+  }
+  catch ( SALOME_Exception& S_ex ) {
+    INFOS( "Evaluate(): catch exception "<< S_ex.what() );
+  }
+  catch ( ... ) {
+    INFOS( "Evaluate(): unknown exception " );
+  }
+
+  return nbels._retn();
+}
+
+//================================================================================
+/*!
+ * \brief Return geometrical object the given element is built on
+ *  \param theMesh - the mesh the element is in
+ *  \param theElementID - the element ID
+ *  \param theGeomName - the name of the result geom object if it is not yet published
+ *  \retval GEOM::GEOM_Object_ptr - the found or just published geom object (no need to UnRegister())
+ */
+//================================================================================
+
+GEOM::GEOM_Object_ptr
+SMESH_Gen_i::GetGeometryByMeshElement( SMESH::SMESH_Mesh_ptr  theMesh,
+                                       CORBA::Long            theElementID,
+                                       const char*            theGeomName)
+  throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+
+  GEOM::GEOM_Object_wrap geom = FindGeometryByMeshElement(theMesh, theElementID);
+  if ( !geom->_is_nil() ) {
+    GEOM::GEOM_Object_var mainShape = theMesh->GetShapeToMesh();
+    GEOM::GEOM_Gen_ptr    geomGen   = GetGeomEngine();
+
+    // try to find the corresponding SObject
+    SALOMEDS::SObject_wrap SObj = ObjectToSObject( myCurrentStudy, geom.in() );
+    if ( SObj->_is_nil() ) // submesh can be not found even if published
+    {
+      // try to find published submesh
+      GEOM::ListOfLong_var list = geom->GetSubShapeIndices();
+      if ( !geom->IsMainShape() && list->length() == 1 ) {
+        SALOMEDS::SObject_wrap mainSO = ObjectToSObject( myCurrentStudy, mainShape );
+        SALOMEDS::ChildIterator_wrap it;
+        if ( !mainSO->_is_nil() ) {
+          it = myCurrentStudy->NewChildIterator( mainSO );
+        }
+        if ( !it->_is_nil() ) {
+          for ( it->InitEx(true); it->More(); it->Next() ) {
+            SALOMEDS::SObject_wrap      so = it->Value();
+            CORBA::Object_var         obj = SObjectToObject( so );
+            GEOM::GEOM_Object_var subGeom = GEOM::GEOM_Object::_narrow( obj );
+            if ( !subGeom->_is_nil() ) {
+              GEOM::ListOfLong_var subList = subGeom->GetSubShapeIndices();
+              if ( subList->length() == 1 && list[0] == subList[0] ) {
+                SObj = so;
+                geom = subGeom;
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+    if ( SObj->_is_nil() ) // publish a new subshape
+      SObj = geomGen->AddInStudy( myCurrentStudy, geom, theGeomName, mainShape );
+
+    // return only published geometry
+    if ( !SObj->_is_nil() ) {
+      //return geom._retn(); -- servant of geom must be UnRegister()ed;
+      CORBA::Object_var    obj = SObjectToObject( SObj );
+      GEOM::GEOM_Object_var go = GEOM::GEOM_Object::_narrow( obj );
+      return go._retn();
+    }
+  }
+  return GEOM::GEOM_Object::_nil();
+}
+
+//================================================================================
+/*!
+ * \brief Return geometrical object the given element is built on.
+ *  \param theMesh - the mesh the element is in
+ *  \param theElementID - the element ID
+ *  \retval GEOM::GEOM_Object_ptr - the found or created (UnRegister()!) geom object
+ */
+//================================================================================
+
+GEOM::GEOM_Object_ptr
+SMESH_Gen_i::FindGeometryByMeshElement( SMESH::SMESH_Mesh_ptr  theMesh,
+                                        CORBA::Long            theElementID)
+  throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if ( CORBA::is_nil( theMesh ) )
+    THROW_SALOME_CORBA_EXCEPTION( "bad Mesh reference", SALOME::BAD_PARAM );
+
+  GEOM::GEOM_Object_var mainShape = theMesh->GetShapeToMesh();
+  GEOM::GEOM_Gen_ptr    geomGen   = GetGeomEngine();
+
+  // get a core mesh DS
+  SMESH_Mesh_i* meshServant = SMESH::DownCast<SMESH_Mesh_i*>( theMesh );
+  if ( meshServant && !geomGen->_is_nil() && !mainShape->_is_nil() )
+  {
+    ::SMESH_Mesh & mesh = meshServant->GetImpl();
+    SMESHDS_Mesh* meshDS = mesh.GetMeshDS();
+    // find the element in mesh
+    if ( const SMDS_MeshElement * elem = meshDS->FindElement( theElementID ) ) {
+      // find a shape id by the element
+      if ( int shapeID = ::SMESH_MeshEditor( &mesh ).FindShape( elem )) {
+        // get a geom object by the shape id
+        GEOM::GEOM_Object_var geom = ShapeToGeomObject( meshDS->IndexToShape( shapeID ));
+        if ( geom->_is_nil() ) {
+          // try to find a published sub-shape
+          SALOMEDS::SObject_wrap mainSO = ObjectToSObject( myCurrentStudy, mainShape );
+          SALOMEDS::ChildIterator_wrap it;
+          if ( !mainSO->_is_nil() ) {
+            it = myCurrentStudy->NewChildIterator( mainSO );
+          }
+          if ( !it->_is_nil() ) {
+            for ( it->InitEx(true); it->More(); it->Next() ) {
+              SALOMEDS::SObject_wrap      so = it->Value();
+              CORBA::Object_var         obj = SObjectToObject( so );
+              GEOM::GEOM_Object_var subGeom = GEOM::GEOM_Object::_narrow( obj );
+              if ( !subGeom->_is_nil() ) {
+                GEOM::ListOfLong_var subList = subGeom->GetSubShapeIndices();
+                if ( subList->length() == 1 && shapeID == subList[0] ) {
+                  geom = subGeom;
+                  break;
+                }
+              }
+            }
+          }
+        }
+        if ( geom->_is_nil() ) {
+          // explode
+          GEOM::GEOM_IShapesOperations_wrap op =
+            geomGen->GetIShapesOperations( GetCurrentStudyID() );
+          if ( !op->_is_nil() )
+            geom = op->GetSubShape( mainShape, shapeID );
+        }
+        else {
+          geom->Register();
+        }
+        if ( !geom->_is_nil() ) {
+          GeomObjectToShape( geom ); // let geom client remember the found shape
+          return geom._retn();
+        }
+      }
+    }
+  }
+  return GEOM::GEOM_Object::_nil();
+}
+
+//================================================================================
+/*!
+ *  SMESH_Gen_i::Concatenate
+ *
+ *  Concatenate the given meshes into one mesh
+ */
+//================================================================================
+
+SMESH::SMESH_Mesh_ptr SMESH_Gen_i::Concatenate(const SMESH::mesh_array& theMeshesArray,
+                                               CORBA::Boolean           theUniteIdenticalGroups,
+                                               CORBA::Boolean           theMergeNodesAndElements,
+                                               CORBA::Double            theMergeTolerance)
+  throw ( SALOME::SALOME_Exception )
+{
+  return ConcatenateCommon(theMeshesArray,
+                           theUniteIdenticalGroups,
+                           theMergeNodesAndElements,
+                           theMergeTolerance,
+                           false);
+}
+
+//================================================================================
+/*!
+ *  SMESH_Gen_i::ConcatenateWithGroups
+ *
+ *  Concatenate the given meshes into one mesh
+ *  Create the groups of all elements from initial meshes
+ */
+//================================================================================
+
+SMESH::SMESH_Mesh_ptr
+SMESH_Gen_i::ConcatenateWithGroups(const SMESH::mesh_array& theMeshesArray,
+                                   CORBA::Boolean           theUniteIdenticalGroups,
+                                   CORBA::Boolean           theMergeNodesAndElements,
+                                   CORBA::Double            theMergeTolerance)
+  throw ( SALOME::SALOME_Exception )
+{
+  return ConcatenateCommon(theMeshesArray,
+                           theUniteIdenticalGroups,
+                           theMergeNodesAndElements,
+                           theMergeTolerance,
+                           true);
+}
+
+//================================================================================
+/*!
+ *  SMESH_Gen_i::ConcatenateCommon
+ *
+ *  Concatenate the given meshes into one mesh
+ */
+//================================================================================
+
+SMESH::SMESH_Mesh_ptr
+SMESH_Gen_i::ConcatenateCommon(const SMESH::mesh_array& theMeshesArray,
+                               CORBA::Boolean           theUniteIdenticalGroups,
+                               CORBA::Boolean           theMergeNodesAndElements,
+                               CORBA::Double            theMergeTolerance,
+                               CORBA::Boolean           theCommonGroups)
+  throw ( SALOME::SALOME_Exception )
+{
+  typedef map<int, int> TIDsMap;
+  typedef list<SMESH::SMESH_Group_var> TListOfNewGroups;
+  typedef map< pair<string, SMESH::ElementType>, TListOfNewGroups > TGroupsMap;
+  typedef std::set<SMESHDS_GroupBase*> TGroups;
+
+  TPythonDump* pPythonDump = new TPythonDump;
+  TPythonDump& aPythonDump = *pPythonDump; // prevent dump of called methods
+
+  // create mesh
+  SMESH::SMESH_Mesh_var aNewMesh = CreateEmptyMesh();
+
+  SMESHDS_Mesh* aNewMeshDS = 0;
+  if ( !aNewMesh->_is_nil() ) {
+    SMESH_Mesh_i* aNewImpl = dynamic_cast<SMESH_Mesh_i*>( GetServant( aNewMesh ).in() );
+    if ( aNewImpl ) {
+      ::SMESH_Mesh& aLocMesh = aNewImpl->GetImpl();
+      aNewMeshDS = aLocMesh.GetMeshDS();
+
+      TGroupsMap aGroupsMap;
+      TListOfNewGroups aListOfNewGroups;
+      SMESH_MeshEditor aNewEditor = ::SMESH_MeshEditor(&aLocMesh);
+      SMESH::ListOfGroups_var aListOfGroups = new SMESH::ListOfGroups();
+
+      // loop on meshes
+      for ( int i = 0; i < theMeshesArray.length(); i++) {
+        SMESH::SMESH_Mesh_var anInitMesh = theMeshesArray[i];
+        if ( !anInitMesh->_is_nil() ) {
+          SMESH_Mesh_i* anInitImpl = dynamic_cast<SMESH_Mesh_i*>( GetServant( anInitMesh ).in() );
+          if ( anInitImpl ) {
+            ::SMESH_Mesh& aInitLocMesh = anInitImpl->GetImpl();
+            aInitLocMesh.Load();
+            SMESHDS_Mesh* anInitMeshDS = aInitLocMesh.GetMeshDS();
+
+            TIDsMap nodesMap;
+            TIDsMap elemsMap;
+
+            // loop on elements of mesh
+            SMDS_ElemIteratorPtr itElems = anInitMeshDS->elementsIterator();
+            const SMDS_MeshElement* anElem = 0;
+            const SMDS_MeshElement* aNewElem = 0;
+            int anElemNbNodes = 0;
+
+            int anNbNodes   = 0;
+            int anNbEdges   = 0;
+            int anNbFaces   = 0;
+            int anNbVolumes = 0;
+            int aNbBalls    = 0;
+
+            SMESH::long_array_var anIDsNodes   = new SMESH::long_array();
+            SMESH::long_array_var anIDsEdges   = new SMESH::long_array();
+            SMESH::long_array_var anIDsFaces   = new SMESH::long_array();
+            SMESH::long_array_var anIDsVolumes = new SMESH::long_array();
+            SMESH::long_array_var anIDsBalls   = new SMESH::long_array();
+
+            if( theCommonGroups ) {
+              anIDsNodes->length(   anInitMeshDS->NbNodes()   );
+              anIDsEdges->length(   anInitMeshDS->NbEdges()   );
+              anIDsFaces->length(   anInitMeshDS->NbFaces()   );
+              anIDsVolumes->length( anInitMeshDS->NbVolumes() );
+              anIDsBalls->length(   anInitMeshDS->NbBalls() );
+            }
+
+            for ( int j = 0; itElems->more(); j++) {
+              anElem = itElems->next();
+              SMDSAbs_ElementType anElemType = anElem->GetType();
+              anElemNbNodes = anElem->NbNodes();
+              std::vector<const SMDS_MeshNode*> aNodesArray (anElemNbNodes);
+
+              // loop on nodes of element
+              const SMDS_MeshNode* aNode = 0;
+              const SMDS_MeshNode* aNewNode = 0;
+              SMDS_ElemIteratorPtr itNodes = anElem->nodesIterator();
+
+              for ( int k = 0; itNodes->more(); k++) {
+                aNode = static_cast<const SMDS_MeshNode*>(itNodes->next());
+                if ( nodesMap.find(aNode->GetID()) == nodesMap.end() ) {
+                  aNewNode = aNewMeshDS->AddNode(aNode->X(), aNode->Y(), aNode->Z());
+                  nodesMap.insert( make_pair(aNode->GetID(), aNewNode->GetID()) );
+                  if( theCommonGroups )
+                    anIDsNodes[anNbNodes++] = aNewNode->GetID();
+                }
+                else
+                  aNewNode = aNewMeshDS->FindNode( nodesMap.find(aNode->GetID())->second );
+                aNodesArray[k] = aNewNode;
+              }//nodes loop
+
+              // creates a corresponding element on existent nodes in new mesh
+              switch ( anElem->GetEntityType() ) {
+              case SMDSEntity_Polyhedra:
+                if ( const SMDS_VtkVolume* aVolume =
+                     dynamic_cast<const SMDS_VtkVolume*> (anElem))
+                {
+                  aNewElem = aNewMeshDS->AddPolyhedralVolume(aNodesArray,
+                                                             aVolume->GetQuantities());
+                  elemsMap.insert(make_pair(anElem->GetID(), aNewElem->GetID()));
+                  if( theCommonGroups )
+                    anIDsVolumes[anNbVolumes++] = aNewElem->GetID();
+                }
+                break;
+              case SMDSEntity_Ball:
+                if ( const SMDS_BallElement* aBall =
+                     dynamic_cast<const SMDS_BallElement*> (anElem))
+                {
+                  aNewElem = aNewEditor.AddElement(aNodesArray, SMDSAbs_Ball,
+                                                   /*isPoly=*/false, /*id=*/0,
+                                                   aBall->GetDiameter() );
+                  elemsMap.insert(make_pair(anElem->GetID(), aNewElem->GetID()));
+                  if( theCommonGroups )
+                    anIDsBalls[aNbBalls++] = aNewElem->GetID();
+                }
+                break;
+              default:
+                {
+                  aNewElem = aNewEditor.AddElement(aNodesArray,
+                                                   anElemType,
+                                                   anElem->IsPoly());
+                  elemsMap.insert(make_pair(anElem->GetID(), aNewElem->GetID()));
+                  if( theCommonGroups ) {
+                    if( anElemType == SMDSAbs_Edge )
+                      anIDsEdges[anNbEdges++] = aNewElem->GetID();
+                    else if( anElemType == SMDSAbs_Face )
+                      anIDsFaces[anNbFaces++] = aNewElem->GetID();
+                    else if( anElemType == SMDSAbs_Volume )
+                      anIDsVolumes[anNbVolumes++] = aNewElem->GetID();
+                  }
+                }
+              }
+            } //elems loop
+
+            // copy orphan nodes
+            SMDS_NodeIteratorPtr  itNodes = anInitMeshDS->nodesIterator();
+            while ( itNodes->more() )
+            {
+              const SMDS_MeshNode* aNode = itNodes->next();
+              if ( aNode->NbInverseElements() == 0 )
+              {
+                const SMDS_MeshNode* aNewNode =
+                  aNewMeshDS->AddNode(aNode->X(), aNode->Y(), aNode->Z());
+                nodesMap.insert( make_pair(aNode->GetID(), aNewNode->GetID()) );
+                if( theCommonGroups )
+                  anIDsNodes[anNbNodes++] = aNewNode->GetID();
+              }
+            }
+
+
+            aListOfGroups = anInitImpl->GetGroups();
+            SMESH::SMESH_GroupBase_ptr aGroup;
+
+            // loop on groups of mesh
+            SMESH::long_array_var anInitIDs = new SMESH::long_array();
+            SMESH::long_array_var anNewIDs = new SMESH::long_array();
+            SMESH::SMESH_Group_var aNewGroup;
+
+            SMESH::ElementType aGroupType;
+            CORBA::String_var aGroupName;
+            if ( theCommonGroups ) {
+              for(aGroupType=SMESH::NODE;aGroupType<=SMESH::BALL;aGroupType=(SMESH::ElementType)(aGroupType+1)) {
+                string str = "Gr";
+                SALOMEDS::SObject_wrap aMeshSObj = ObjectToSObject( myCurrentStudy, anInitMesh );
+                if(aMeshSObj)
+                  str += aMeshSObj->GetName();
+                str += "_";
+
+                int anLen = 0;
+
+                switch(aGroupType) {
+                case SMESH::NODE:
+                  str += "Nodes";
+                  anIDsNodes->length(anNbNodes);
+                  anLen = anNbNodes;
+                  break;
+                case SMESH::EDGE:
+                  str += "Edges";
+                  anIDsEdges->length(anNbEdges);
+                  anLen = anNbEdges;
+                  break;
+                case SMESH::FACE:
+                  str += "Faces";
+                  anIDsFaces->length(anNbFaces);
+                  anLen = anNbFaces;
+                  break;
+                case SMESH::VOLUME:
+                  str += "Volumes";
+                  anIDsVolumes->length(anNbVolumes);
+                  anLen = anNbVolumes;
+                  break;
+                case SMESH::BALL:
+                  str += "Balls";
+                  anIDsBalls->length(aNbBalls);
+                  anLen = aNbBalls;
+                  break;
+                default:
+                  break;
+                }
+
+                if(anLen) {
+                  aGroupName = str.c_str();
+
+                  // add a new group in the mesh
+                  aNewGroup = aNewImpl->CreateGroup(aGroupType, aGroupName);
+
+                  switch(aGroupType) {
+                  case SMESH::NODE:
+                    aNewGroup->Add( anIDsNodes );
+                    break;
+                  case SMESH::EDGE:
+                    aNewGroup->Add( anIDsEdges );
+                    break;
+                  case SMESH::FACE:
+                    aNewGroup->Add( anIDsFaces );
+                    break;
+                  case SMESH::VOLUME:
+                    aNewGroup->Add( anIDsVolumes );
+                    break;
+                  case SMESH::BALL:
+                    aNewGroup->Add( anIDsBalls );
+                    break;
+                  default:
+                    break;
+                  }
+
+                  aListOfNewGroups.clear();
+                  aListOfNewGroups.push_back(aNewGroup);
+                  aGroupsMap.insert(make_pair( make_pair(aGroupName, aGroupType), aListOfNewGroups ));
+                }
+              }
+            }
+
+            // check that current group name and type don't have identical ones in union mesh
+            for (int iG = 0; iG < aListOfGroups->length(); iG++) {
+              aGroup = aListOfGroups[iG];
+              aListOfNewGroups.clear();
+              aGroupType = aGroup->GetType();
+              aGroupName = aGroup->GetName();
+
+              TGroupsMap::iterator anIter = aGroupsMap.find(make_pair(aGroupName, aGroupType));
+
+              // convert a list of IDs
+              anInitIDs = aGroup->GetListOfID();
+              anNewIDs->length(anInitIDs->length());
+              if ( aGroupType == SMESH::NODE )
+                for (int j = 0; j < anInitIDs->length(); j++) {
+                  anNewIDs[j] = nodesMap.find(anInitIDs[j])->second;
+                }
+              else
+                for (int j = 0; j < anInitIDs->length(); j++) {
+                  anNewIDs[j] = elemsMap.find(anInitIDs[j])->second;
+                }
+
+              // check that current group name and type don't have identical ones in union mesh
+              if ( anIter == aGroupsMap.end() ) {
+                // add a new group in the mesh
+                aNewGroup = aNewImpl->CreateGroup(aGroupType, aGroupName);
+                // add elements into new group
+                aNewGroup->Add( anNewIDs );
+
+                aListOfNewGroups.push_back(aNewGroup);
+                aGroupsMap.insert(make_pair( make_pair(aGroupName, aGroupType), aListOfNewGroups ));
+              }
+
+              else if ( theUniteIdenticalGroups ) {
+                // unite identical groups
+                TListOfNewGroups& aNewGroups = anIter->second;
+                aNewGroups.front()->Add( anNewIDs );
+              }
+
+              else {
+                // rename identical groups
+                aNewGroup = aNewImpl->CreateGroup(aGroupType, aGroupName);
+                aNewGroup->Add( anNewIDs );
+
+                TListOfNewGroups& aNewGroups = anIter->second;
+                string aNewGroupName;
+                if (aNewGroups.size() == 1) {
+                  aNewGroupName = string(aGroupName) + "_1";
+                  aNewGroups.front()->SetName(aNewGroupName.c_str());
+                }
+                char aGroupNum[128];
+                sprintf(aGroupNum, "%u", aNewGroups.size()+1);
+                aNewGroupName = string(aGroupName) + "_" + string(aGroupNum);
+                aNewGroup->SetName(aNewGroupName.c_str());
+                aNewGroups.push_back(aNewGroup);
+              }
+            }//groups loop
+          }
+        }
+      }//meshes loop
+
+      if (theMergeNodesAndElements) {
+        // merge nodes
+        TIDSortedNodeSet aMeshNodes; // no input nodes
+        SMESH_MeshEditor::TListOfListOfNodes aGroupsOfNodes;
+        aNewEditor.FindCoincidentNodes( aMeshNodes, theMergeTolerance, aGroupsOfNodes );
+        aNewEditor.MergeNodes( aGroupsOfNodes );
+        // merge elements
+        aNewEditor.MergeEqualElements();
+      }
+    }
+  }
+
+  // Update Python script
+  aPythonDump << aNewMesh << " = " << this;
+  if( !theCommonGroups )
+    aPythonDump << ".Concatenate(";
+  else
+    aPythonDump << ".ConcatenateWithGroups(";
+  aPythonDump << "[";
+  for ( int i = 0; i < theMeshesArray.length(); i++) {
+    if (i > 0) aPythonDump << ", ";
+    aPythonDump << theMeshesArray[i];
+  }
+  aPythonDump << "], ";
+  aPythonDump << theUniteIdenticalGroups << ", "
+              << theMergeNodesAndElements << ", "
+              << TVar( theMergeTolerance ) << ")";
+
+  delete pPythonDump; // enable python dump from GetGroups()
+
+  // 0020577: EDF 1164 SMESH: Bad dump of concatenate with create common groups
+  if ( !aNewMesh->_is_nil() )
+  {
+    SMESH::ListOfGroups_var groups = aNewMesh->GetGroups();
+  }
+
+  // IPAL21468 Change icon of compound because it need not be computed.
+  SALOMEDS::SObject_wrap aMeshSObj = ObjectToSObject( myCurrentStudy, aNewMesh );
+  SetPixMap( aMeshSObj, "ICON_SMESH_TREE_MESH" );
+
+  if (aNewMeshDS)
+    aNewMeshDS->Modified();
+  return aNewMesh._retn();
+}
+
+//================================================================================
+/*!
+ * \brief Create a mesh by copying a part of another mesh
+ *  \param meshPart - a part of mesh to copy
+ *  \param toCopyGroups - to create in the new mesh groups
+ *                        the copied elements belongs to
+ *  \param toKeepIDs - to preserve IDs of the copied elements or not
+ *  \retval SMESH::SMESH_Mesh_ptr - the new mesh
+ */
+//================================================================================
+
+SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CopyMesh(SMESH::SMESH_IDSource_ptr meshPart,
+                                            const char*               meshName,
+                                            CORBA::Boolean            toCopyGroups,
+                                            CORBA::Boolean            toKeepIDs)
+{
+  Unexpect aCatch(SALOME_SalomeException);
+
+  TPythonDump* pyDump = new TPythonDump; // prevent dump from CreateMesh()
+
+  // 1. Get source mesh
+
+  if ( CORBA::is_nil( meshPart ))
+    THROW_SALOME_CORBA_EXCEPTION( "bad IDSource", SALOME::BAD_PARAM );
+
+  SMESH::SMESH_Mesh_var srcMesh = meshPart->GetMesh();
+  SMESH_Mesh_i*       srcMesh_i = SMESH::DownCast<SMESH_Mesh_i*>( srcMesh );
+  if ( !srcMesh_i )
+    THROW_SALOME_CORBA_EXCEPTION( "bad mesh of IDSource", SALOME::BAD_PARAM );
+
+  SMESHDS_Mesh* srcMeshDS = srcMesh_i->GetImpl().GetMeshDS();
+
+  // 2. Make a new mesh
+
+  SMESH::SMESH_Mesh_var newMesh = CreateMesh(GEOM::GEOM_Object::_nil());
+  SMESH_Mesh_i*       newMesh_i = SMESH::DownCast<SMESH_Mesh_i*>( newMesh );
+  if ( !newMesh_i )
+    THROW_SALOME_CORBA_EXCEPTION( "can't create a mesh", SALOME::INTERNAL_ERROR );
+  SALOMEDS::SObject_wrap meshSO = ObjectToSObject(myCurrentStudy, newMesh );
+  if ( !meshSO->_is_nil() )
+  {
+    SetName( meshSO, meshName, "Mesh" );
+    SetPixMap( meshSO, "ICON_SMESH_TREE_MESH_IMPORTED");
+  }
+  SMESHDS_Mesh* newMeshDS = newMesh_i->GetImpl().GetMeshDS();
+  ::SMESH_MeshEditor editor( &newMesh_i->GetImpl() );
+
+  // 3. Get elements to copy
+
+  SMDS_ElemIteratorPtr srcElemIt; SMDS_NodeIteratorPtr srcNodeIt;
+  TIDSortedElemSet srcElems;
+  SMESH::array_of_ElementType_var srcElemTypes = meshPart->GetTypes();
+  if ( SMESH::DownCast<SMESH_Mesh_i*>( meshPart ))
+  {
+    srcElemIt = srcMeshDS->elementsIterator();
+    srcNodeIt = srcMeshDS->nodesIterator();
+  }
+  else
+  {
+    SMESH::long_array_var ids = meshPart->GetIDs();
+    if ( srcElemTypes->length() == 1 && srcElemTypes[0] == SMESH::NODE ) // group of nodes
+    {
+      for (int i=0; i < ids->length(); i++)
+        if ( const SMDS_MeshElement * elem = srcMeshDS->FindNode( ids[i] ))
+          srcElems.insert( elem );
+    }
+    else
+    {
+      for (int i=0; i < ids->length(); i++)
+        if ( const SMDS_MeshElement * elem = srcMeshDS->FindElement( ids[i] ))
+          srcElems.insert( elem );
+    }
+    if ( srcElems.empty() )
+      return newMesh._retn();
+
+    typedef SMDS_SetIterator< SMDS_pElement, TIDSortedElemSet::const_iterator > ElIter;
+    srcElemIt = SMDS_ElemIteratorPtr( new ElIter( srcElems.begin(), srcElems.end() ));
+  }
+
+  // 4. Copy elements
+
+  typedef map<SMDS_pElement, SMDS_pElement, TIDCompare> TE2EMap;
+  TE2EMap e2eMapByType[ SMDSAbs_NbElementTypes ];
+  TE2EMap& n2nMap = e2eMapByType[ SMDSAbs_Node ];
+  int iN;
+  const SMDS_MeshNode *nSrc, *nTgt;
+  vector< const SMDS_MeshNode* > nodes;
+  while ( srcElemIt->more() )
+  {
+    const SMDS_MeshElement * elem = srcElemIt->next();
+    // find / add nodes
+    nodes.resize( elem->NbNodes());
+    SMDS_ElemIteratorPtr nIt = elem->nodesIterator();
+    if ( toKeepIDs ) {
+      for ( iN = 0; nIt->more(); ++iN )
+      {
+        nSrc = static_cast<const SMDS_MeshNode*>( nIt->next() );
+        nTgt = newMeshDS->FindNode( nSrc->GetID());
+        if ( !nTgt )
+          nTgt = newMeshDS->AddNodeWithID( nSrc->X(), nSrc->Y(), nSrc->Z(), nSrc->GetID());
+        nodes[ iN ] = nTgt;
+      }
+    }
+    else {
+      for ( iN = 0; nIt->more(); ++iN )
+      {
+        nSrc = static_cast<const SMDS_MeshNode*>( nIt->next() );
+        TE2EMap::iterator n2n = n2nMap.insert( make_pair( nSrc, SMDS_pNode(0) )).first;
+        if ( !n2n->second )
+          n2n->second = newMeshDS->AddNode( nSrc->X(), nSrc->Y(), nSrc->Z() );
+        nodes[ iN ] = (const SMDS_MeshNode*) n2n->second;
+      }
+    }
+    // add elements
+    if ( elem->GetType() != SMDSAbs_Node )
+    {
+      int ID = toKeepIDs ? elem->GetID() : 0;
+      const SMDS_MeshElement * newElem;
+      switch ( elem->GetEntityType() ) {
+      case SMDSEntity_Polyhedra:
+        newElem = editor.GetMeshDS()->
+          AddPolyhedralVolumeWithID( nodes,
+                                     static_cast<const SMDS_VtkVolume*>(elem)->GetQuantities(),
+                                     ID);
+        break;
+      case SMDSEntity_Ball:
+        newElem = editor.AddElement( nodes, SMDSAbs_Ball, false, ID,
+                                     static_cast<const SMDS_BallElement*>(elem)->GetDiameter());
+        break;
+      default:
+        newElem = editor.AddElement( nodes,elem->GetType(),elem->IsPoly(),ID);
+
+      if ( toCopyGroups && !toKeepIDs )
+        e2eMapByType[ elem->GetType() ].insert( make_pair( elem, newElem ));
+      }
+    }
+  } // while ( srcElemIt->more() )
+
+  // 4(b). Copy free nodes
+
+  if ( srcNodeIt && srcMeshDS->NbNodes() != newMeshDS->NbNodes() )
+  {
+    while ( srcNodeIt->more() )
+    {
+      nSrc = srcNodeIt->next();
+      if ( nSrc->NbInverseElements() == 0 )
+      {
+        if ( toKeepIDs )
+          nTgt = newMeshDS->AddNodeWithID( nSrc->X(), nSrc->Y(), nSrc->Z(), nSrc->GetID());
+        else
+          n2nMap[ nSrc ] = newMeshDS->AddNode( nSrc->X(), nSrc->Y(), nSrc->Z() );
+      }
+    }
+  }
+
+  // 5. Copy groups
+
+  int nbNewGroups = 0;
+  if ( toCopyGroups )
+  {
+    SMESH_Mesh::GroupIteratorPtr gIt = srcMesh_i->GetImpl().GetGroups();
+    while ( gIt->more() )
+    {
+      SMESH_Group* group = gIt->next();
+      const SMESHDS_GroupBase* groupDS = group->GetGroupDS();
+
+      // Check group type. We copy nodal groups containing nodes of copied element
+      SMDSAbs_ElementType groupType = groupDS->GetType();
+      if ( groupType != SMDSAbs_Node &&
+           newMeshDS->GetMeshInfo().NbElements( groupType ) == 0 )
+        continue; // group type differs from types of meshPart
+
+      // Find copied elements in the group
+      vector< const SMDS_MeshElement* > groupElems;
+      SMDS_ElemIteratorPtr eIt = groupDS->GetElements();
+      if ( toKeepIDs )
+      {
+        const SMDS_MeshElement* foundElem;
+        if ( groupType == SMDSAbs_Node )
+        {
+          while ( eIt->more() )
+            if (( foundElem = newMeshDS->FindNode( eIt->next()->GetID() )))
+              groupElems.push_back( foundElem );
+        }
+        else
+        {
+          while ( eIt->more() )
+            if (( foundElem = newMeshDS->FindElement( eIt->next()->GetID() )))
+              groupElems.push_back( foundElem );
+        }
+      }
+      else
+      {
+        TE2EMap & e2eMap = e2eMapByType[ groupDS->GetType() ];
+        if ( e2eMap.empty() ) continue;
+        int minID = e2eMap.begin()->first->GetID();
+        int maxID = e2eMap.rbegin()->first->GetID();
+        TE2EMap::iterator e2e;
+        while ( eIt->more() && groupElems.size() < e2eMap.size())
+        {
+          const SMDS_MeshElement* e = eIt->next();
+          if ( e->GetID() < minID || e->GetID() > maxID ) continue;
+          if ((e2e = e2eMap.find( e )) != e2eMap.end())
+            groupElems.push_back( e2e->second );
+        }
+      }
+      // Make a new group
+      if ( !groupElems.empty() )
+      {
+        SMESH::SMESH_Group_var newGroupObj =
+          newMesh->CreateGroup( SMESH::ElementType(groupType), group->GetName() );
+        if ( SMESH_GroupBase_i* newGroup_i = SMESH::DownCast<SMESH_GroupBase_i*>( newGroupObj))
+        {
+          SMESHDS_GroupBase * newGroupDS = newGroup_i->GetGroupDS();
+          SMDS_MeshGroup& smdsGroup = ((SMESHDS_Group*)newGroupDS)->SMDSGroup();
+          for ( unsigned i = 0; i < groupElems.size(); ++i )
+            smdsGroup.Add( groupElems[i] );
+
+          nbNewGroups++;
+        }
+      }
+    }
+  }
+
+  newMeshDS->Modified();
+
+  *pyDump << newMesh << " = " << this
+          << ".CopyMesh( " << meshPart << ", "
+          << "'" << meshName << "', "
+          << toCopyGroups << ", "
+          << toKeepIDs << ")";
+
+  delete pyDump; pyDump = 0; // allow dump in GetGroups()
+
+  if ( nbNewGroups > 0 ) // dump created groups
+    SMESH::ListOfGroups_var groups = newMesh->GetGroups();
+
+  return newMesh._retn();
+}
+
+//================================================================================
+/*!
+ *  SMESH_Gen_i::GetMEDVersion
+ *
+ *  Get MED version of the file by its name
+ */
+//================================================================================
+CORBA::Boolean SMESH_Gen_i::GetMEDVersion(const char* theFileName,
+                                          SMESH::MED_VERSION& theVersion)
+{
+  theVersion = SMESH::MED_V2_1;
+  MED::EVersion aVersion = MED::GetVersionId( theFileName );
+  switch( aVersion ) {
+    case MED::eV2_1     : theVersion = SMESH::MED_V2_1; return true;
+    case MED::eV2_2     : theVersion = SMESH::MED_V2_2; return true;
+    case MED::eVUnknown : return false;
+  }
+  return false;
+}
+
+//================================================================================
+/*!
+ *  SMESH_Gen_i::GetMeshNames
+ *
+ *  Get names of meshes defined in file with the specified name
+ */
+//================================================================================
+SMESH::string_array* SMESH_Gen_i::GetMeshNames(const char* theFileName)
+{
+  SMESH::string_array_var aResult = new SMESH::string_array();
+  MED::PWrapper aMed = MED::CrWrapper( theFileName );
+  MED::TErr anErr;
+  MED::TInt aNbMeshes = aMed->GetNbMeshes( &anErr );
+  if( anErr >= 0 ) {
+    aResult->length( aNbMeshes );
+    for( MED::TInt i = 0; i < aNbMeshes; i++ ) {
+      MED::PMeshInfo aMeshInfo = aMed->GetPMeshInfo( i+1 );
+      aResult[i] = CORBA::string_dup( aMeshInfo->GetName().c_str() );
+    }
+  }
+  return aResult._retn();
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::Save
+ *
+ *  Save SMESH module's data
+ */
+//=============================================================================
+SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
+                                      const char*              theURL,
+                                      bool                     isMultiFile )
+{
+  INFOS( "SMESH_Gen_i::Save" );
+
+  //  ASSERT( theComponent->GetStudy()->StudyId() == myCurrentStudy->StudyId() )
+  // san -- in case <myCurrentStudy> differs from theComponent's study,
+  // use that of the component
+  if ( myCurrentStudy->_is_nil() ||
+    theComponent->GetStudy()->StudyId() != myCurrentStudy->StudyId() )
+    SetCurrentStudy( theComponent->GetStudy() );
+
+  // Store study contents as a set of python commands
+  SavePython(myCurrentStudy);
+
+  StudyContext* myStudyContext = GetCurrentStudyContext();
+
+  // Declare a byte stream
+  SALOMEDS::TMPFile_var aStreamFile;
+
+  // Obtain a temporary dir
+  TCollection_AsciiString tmpDir =
+    ( isMultiFile ) ? TCollection_AsciiString( ( char* )theURL ) : ( char* )SALOMEDS_Tool::GetTmpDir().c_str();
+
+  // Create a sequence of files processed
+  SALOMEDS::ListOfFileNames_var aFileSeq = new SALOMEDS::ListOfFileNames;
+  aFileSeq->length( NUM_TMP_FILES );
+
+  TCollection_AsciiString aStudyName( "" );
+  if ( isMultiFile )
+    aStudyName = ( (char*)SALOMEDS_Tool::GetNameFromPath( myCurrentStudy->URL() ).c_str() );
+
+  // Set names of temporary files
+  TCollection_AsciiString filename =
+    aStudyName + TCollection_AsciiString( "_SMESH.hdf" );        // for SMESH data itself
+  TCollection_AsciiString meshfile =
+    aStudyName + TCollection_AsciiString( "_SMESH_Mesh.med" );   // for mesh data to be stored in MED file
+  aFileSeq[ 0 ] = CORBA::string_dup( filename.ToCString() );
+  aFileSeq[ 1 ] = CORBA::string_dup( meshfile.ToCString() );
+  filename = tmpDir + filename;
+  meshfile = tmpDir + meshfile;
+
+  HDFfile*    aFile;
+  HDFdataset* aDataset;
+  HDFgroup*   aTopGroup;
+  HDFgroup*   aGroup;
+  HDFgroup*   aSubGroup;
+  HDFgroup*   aSubSubGroup;
+  hdf_size    aSize[ 1 ];
+
+
+  //Remove the files if they exist: BugID: 11225
+#ifndef WNT /* unix functionality */
+  TCollection_AsciiString cmd("rm -f \"");
+#else /* windows */
+  TCollection_AsciiString cmd("del /F \"");
+#endif
+
+  cmd+=filename;
+  cmd+="\" \"";
+  cmd+=meshfile;
+  cmd+="\"";
+  system(cmd.ToCString());
+
+  // MED writer to be used by storage process
+  DriverMED_W_SMESHDS_Mesh myWriter;
+  myWriter.SetFile( meshfile.ToCString() );
+
+  // IMP issue 20918
+  // SetStoreName() to groups before storing hypotheses to let them refer to
+  // groups using "store name", which is "Group <group_persistent_id>"
+  {
+    SALOMEDS::ChildIterator_wrap itBig = myCurrentStudy->NewChildIterator( theComponent );
+    for ( ; itBig->More(); itBig->Next() ) {
+      SALOMEDS::SObject_wrap gotBranch = itBig->Value();
+      if ( gotBranch->Tag() > GetAlgorithmsRootTag() ) {
+        CORBA::Object_var anObject = SObjectToObject( gotBranch );
+        if ( !CORBA::is_nil( anObject ) ) {
+          SMESH::SMESH_Mesh_var myMesh = SMESH::SMESH_Mesh::_narrow( anObject ) ;
+          if ( !myMesh->_is_nil() ) {
+            myMesh->Load(); // load from study file if not yet done
+            TPythonDump pd; // not to dump GetGroups()
+            SMESH::ListOfGroups_var groups = myMesh->GetGroups();
+            pd << ""; // to avoid optimizing pd out
+            for ( int i = 0; i < groups->length(); ++i )
+            {
+              SMESH_GroupBase_i* grImpl = SMESH::DownCast<SMESH_GroupBase_i*>( groups[i]);
+              if ( grImpl )
+              {
+                CORBA::String_var objStr = GetORB()->object_to_string( grImpl->_this() );
+                int anId = myStudyContext->findId( string( objStr.in() ) );
+                char grpName[ 30 ];
+                sprintf( grpName, "Group %d", anId );
+                SMESHDS_GroupBase* aGrpBaseDS = grImpl->GetGroupDS();
+                aGrpBaseDS->SetStoreName( grpName );
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  // Write data
+  // ---> create HDF file
+  aFile = new HDFfile( (char*) filename.ToCString() );
+  aFile->CreateOnDisk();
+
+  // --> iterator for top-level objects
+  SALOMEDS::ChildIterator_wrap itBig = myCurrentStudy->NewChildIterator( theComponent );
+  for ( ; itBig->More(); itBig->Next() ) {
+    SALOMEDS::SObject_wrap gotBranch = itBig->Value();
+
+    // --> hypotheses root branch (only one for the study)
+    if ( gotBranch->Tag() == GetHypothesisRootTag() ) {
+      // create hypotheses root HDF group
+      aTopGroup = new HDFgroup( "Hypotheses", aFile );
+      aTopGroup->CreateOnDisk();
+
+      // iterator for all hypotheses
+      SALOMEDS::ChildIterator_wrap it = myCurrentStudy->NewChildIterator( gotBranch );
+      for ( ; it->More(); it->Next() ) {
+        SALOMEDS::SObject_wrap mySObject = it->Value();
+        CORBA::Object_var anObject = SObjectToObject( mySObject );
+        if ( !CORBA::is_nil( anObject ) ) {
+          SMESH::SMESH_Hypothesis_var myHyp = SMESH::SMESH_Hypothesis::_narrow( anObject );
+          if ( !myHyp->_is_nil() ) {
+            SMESH_Hypothesis_i* myImpl = dynamic_cast<SMESH_Hypothesis_i*>( GetServant( myHyp ).in() );
+            if ( myImpl ) {
+              string hypname = string( myHyp->GetName() );
+              string libname = string( myHyp->GetLibName() );
+              // BUG SWP13062
+              // Needs for save crossplatform libname, i.e. parth of name ( ".dll" for
+              // WNT and ".so" for X-system) must be deleted
+              int libname_len = libname.length();
+#ifdef WNT
+              if( libname_len > 4 )
+                libname.resize( libname_len - 4 );
+#else
+              // PAL17753 (Regresion: missing hypothesis in restored study)
+              // "lib" also should be removed from the beginning
+              //if( libname_len > 3 )
+                //libname.resize( libname_len - 3 );
+              if( libname_len > 6 )
+                libname = libname.substr( 3, libname_len - 3 - 3 );
+#endif
+              CORBA::String_var objStr = GetORB()->object_to_string( anObject );
+              int    id      = myStudyContext->findId( string( objStr.in() ) );
+              string hypdata = string( myImpl->SaveTo() );
+
+              // for each hypothesis create HDF group basing on its id
+              char hypGrpName[30];
+              sprintf( hypGrpName, "Hypothesis %d", id );
+              aGroup = new HDFgroup( hypGrpName, aTopGroup );
+              aGroup->CreateOnDisk();
+              // --> type name of hypothesis
+              aSize[ 0 ] = hypname.length() + 1;
+              aDataset = new HDFdataset( "Name", aGroup, HDF_STRING, aSize, 1 );
+              aDataset->CreateOnDisk();
+              aDataset->WriteOnDisk( ( char* )( hypname.c_str() ) );
+              aDataset->CloseOnDisk();
+              // --> server plugin library name of hypothesis
+              aSize[ 0 ] = libname.length() + 1;
+              aDataset = new HDFdataset( "LibName", aGroup, HDF_STRING, aSize, 1 );
+              aDataset->CreateOnDisk();
+              aDataset->WriteOnDisk( ( char* )( libname.c_str() ) );
+              aDataset->CloseOnDisk();
+              // --> persistent data of hypothesis
+              aSize[ 0 ] = hypdata.length() + 1;
+              aDataset = new HDFdataset( "Data", aGroup, HDF_STRING, aSize, 1 );
+              aDataset->CreateOnDisk();
+              aDataset->WriteOnDisk( ( char* )( hypdata.c_str() ) );
+              aDataset->CloseOnDisk();
+              // close hypothesis HDF group
+              aGroup->CloseOnDisk();
+            }
+          }
+        }
+      }
+      // close hypotheses root HDF group
+      aTopGroup->CloseOnDisk();
+    }
+    // --> algorithms root branch (only one for the study)
+    else if ( gotBranch->Tag() == GetAlgorithmsRootTag() ) {
+      // create algorithms root HDF group
+      aTopGroup = new HDFgroup( "Algorithms", aFile );
+      aTopGroup->CreateOnDisk();
+
+      // iterator for all algorithms
+      SALOMEDS::ChildIterator_wrap it = myCurrentStudy->NewChildIterator( gotBranch );
+      for ( ; it->More(); it->Next() ) {
+        SALOMEDS::SObject_wrap mySObject = it->Value();
+        CORBA::Object_var anObject = SObjectToObject( mySObject );
+        if ( !CORBA::is_nil( anObject ) ) {
+          SMESH::SMESH_Hypothesis_var myHyp = SMESH::SMESH_Hypothesis::_narrow( anObject );
+          if ( !myHyp->_is_nil() ) {
+            SMESH_Hypothesis_i* myImpl = dynamic_cast<SMESH_Hypothesis_i*>( GetServant( myHyp ).in() );
+            if ( myImpl ) {
+              string hypname = string( myHyp->GetName() );
+              string libname = string( myHyp->GetLibName() );
+              // BUG SWP13062
+              // Needs for save crossplatform libname, i.e. parth of name ( ".dll" for
+              // WNT and ".so" for X-system) must be deleted
+              int libname_len = libname.length();
+#ifdef WNT
+              if( libname_len > 4 )
+                libname.resize( libname_len - 4 );
+#else
+              // PAL17753 (Regresion: missing hypothesis in restored study)
+              // "lib" also should be removed from the beginning
+              //if( libname_len > 3 )
+                //libname.resize( libname_len - 3 );
+              if( libname_len > 6 )
+                libname = libname.substr( 3, libname_len - 3 - 3 );
+#endif
+              CORBA::String_var objStr = GetORB()->object_to_string( anObject );
+              int    id      = myStudyContext->findId( string( objStr.in() ) );
+              string hypdata = string( myImpl->SaveTo() );
+
+              // for each algorithm create HDF group basing on its id
+              char hypGrpName[30];
+              sprintf( hypGrpName, "Algorithm %d", id );
+              aGroup = new HDFgroup( hypGrpName, aTopGroup );
+              aGroup->CreateOnDisk();
+              // --> type name of algorithm
+              aSize[0] = hypname.length() + 1;
+              aDataset = new HDFdataset( "Name", aGroup, HDF_STRING, aSize, 1 );
+              aDataset->CreateOnDisk();
+              aDataset->WriteOnDisk( ( char* )( hypname.c_str() ) );
+              aDataset->CloseOnDisk();
+              // --> server plugin library name of hypothesis
+              aSize[0] = libname.length() + 1;
+              aDataset = new HDFdataset( "LibName", aGroup, HDF_STRING, aSize, 1 );
+              aDataset->CreateOnDisk();
+              aDataset->WriteOnDisk( ( char* )( libname.c_str() ) );
+              aDataset->CloseOnDisk();
+              // --> persistent data of algorithm
+              aSize[0] = hypdata.length() + 1;
+              aDataset = new HDFdataset( "Data", aGroup, HDF_STRING, aSize, 1 );
+              aDataset->CreateOnDisk();
+              aDataset->WriteOnDisk( ( char* )( hypdata.c_str() ) );
+              aDataset->CloseOnDisk();
+              // close algorithm HDF group
+              aGroup->CloseOnDisk();
+            }
+          }
+        }
+      }
+      // close algorithms root HDF group
+      aTopGroup->CloseOnDisk();
+    }
+    // --> mesh objects roots branches
+    else if ( gotBranch->Tag() > GetAlgorithmsRootTag() ) {
+      CORBA::Object_var anObject = SObjectToObject( gotBranch );
+      if ( !CORBA::is_nil( anObject ) ) {
+        SMESH::SMESH_Mesh_var myMesh = SMESH::SMESH_Mesh::_narrow( anObject ) ;
+        if ( !myMesh->_is_nil() ) {
+          SMESH_Mesh_i* myImpl = dynamic_cast<SMESH_Mesh_i*>( GetServant( myMesh ).in() );
+          if ( myImpl ) {
+            CORBA::String_var objStr = GetORB()->object_to_string( anObject );
+            int id = myStudyContext->findId( string( objStr.in() ) );
+            ::SMESH_Mesh& myLocMesh = myImpl->GetImpl();
+            SMESHDS_Mesh* mySMESHDSMesh = myLocMesh.GetMeshDS();
+            bool hasShape = myLocMesh.HasShapeToMesh();
+
+            // for each mesh open the HDF group basing on its id
+            char meshGrpName[ 30 ];
+            sprintf( meshGrpName, "Mesh %d", id );
+            aTopGroup = new HDFgroup( meshGrpName, aFile );
+            aTopGroup->CreateOnDisk();
+
+            // --> put dataset to hdf file which is a flag that mesh has data
+            string strHasData = "0";
+            // check if the mesh is not empty
+            if ( mySMESHDSMesh->NbNodes() > 0 ) {
+              // write mesh data to med file
+              myWriter.SetMesh( mySMESHDSMesh );
+              myWriter.SetMeshId( id );
+              strHasData = "1";
+            }
+            aSize[ 0 ] = strHasData.length() + 1;
+            aDataset = new HDFdataset( "Has data", aTopGroup, HDF_STRING, aSize, 1 );
+            aDataset->CreateOnDisk();
+            aDataset->WriteOnDisk( ( char* )( strHasData.c_str() ) );
+            aDataset->CloseOnDisk();
+
+            // ouv : NPAL12872
+            // for each mesh open the HDF group basing on its auto color parameter
+            char meshAutoColorName[ 30 ];
+            sprintf( meshAutoColorName, "AutoColorMesh %d", id );
+            int anAutoColor[1];
+            anAutoColor[0] = myImpl->GetAutoColor();
+            aSize[ 0 ] = 1;
+            aDataset = new HDFdataset( meshAutoColorName, aTopGroup, HDF_INT32, aSize, 1 );
+            aDataset->CreateOnDisk();
+            aDataset->WriteOnDisk( anAutoColor );
+            aDataset->CloseOnDisk();
+
+            // issue 0020693. Store _isModified flag
+            int isModified = myLocMesh.GetIsModified();
+            aSize[ 0 ] = 1;
+            aDataset = new HDFdataset( "_isModified", aTopGroup, HDF_INT32, aSize, 1 );
+            aDataset->CreateOnDisk();
+            aDataset->WriteOnDisk( &isModified );
+            aDataset->CloseOnDisk();
+
+            // issue 20918. Store Persistent Id of SMESHDS_Mesh
+            int meshPersistentId = mySMESHDSMesh->GetPersistentId();
+            aSize[ 0 ] = 1;
+            aDataset = new HDFdataset( "meshPersistentId", aTopGroup, HDF_INT32, aSize, 1 );
+            aDataset->CreateOnDisk();
+            aDataset->WriteOnDisk( &meshPersistentId );
+            aDataset->CloseOnDisk();
+
+            // write reference on a shape if exists
+            SALOMEDS::SObject_wrap myRef;
+            bool shapeRefFound = false;
+            bool found = gotBranch->FindSubObject( GetRefOnShapeTag(), myRef.inout() );
+            if ( found ) {
+              SALOMEDS::SObject_wrap myShape;
+              bool ok = myRef->ReferencedObject( myShape.inout() );
+              if ( ok ) {
+                shapeRefFound = (! CORBA::is_nil( myShape->GetObject() ));
+                string myRefOnObject = myShape->GetID();
+                if ( shapeRefFound && myRefOnObject.length() > 0 ) {
+                  aSize[ 0 ] = myRefOnObject.length() + 1;
+                  aDataset = new HDFdataset( "Ref on shape", aTopGroup, HDF_STRING, aSize, 1 );
+                  aDataset->CreateOnDisk();
+                  aDataset->WriteOnDisk( ( char* )( myRefOnObject.c_str() ) );
+                  aDataset->CloseOnDisk();
+                }
+              }
+            }
+
+            // write applied hypotheses if exist
+            SALOMEDS::SObject_wrap myHypBranch;
+            found = gotBranch->FindSubObject( GetRefOnAppliedHypothesisTag(), myHypBranch.inout() );
+            if ( found && !shapeRefFound && hasShape) { // remove applied hyps
+              myCurrentStudy->NewBuilder()->RemoveObjectWithChildren( myHypBranch );
+            }
+            if ( found && (shapeRefFound || !hasShape) ) {
+              aGroup = new HDFgroup( "Applied Hypotheses", aTopGroup );
+              aGroup->CreateOnDisk();
+
+              SALOMEDS::ChildIterator_wrap it = myCurrentStudy->NewChildIterator( myHypBranch );
+              int hypNb = 0;
+              for ( ; it->More(); it->Next() ) {
+                SALOMEDS::SObject_wrap mySObject = it->Value();
+                SALOMEDS::SObject_wrap myRefOnHyp;
+                bool ok = mySObject->ReferencedObject( myRefOnHyp.inout() );
+                if ( ok ) {
+                  // san - it is impossible to recover applied hypotheses
+                  //       using their entries within Load() method,
+                  // for there are no AttributeIORs in the study when Load() is working.
+                  // Hence, it is better to store persistent IDs of hypotheses as references to them
+
+                  //string myRefOnObject = myRefOnHyp->GetID();
+                  CORBA::Object_var anObject = SObjectToObject( myRefOnHyp );
+                  CORBA::String_var objStr = GetORB()->object_to_string( anObject );
+                  int id = myStudyContext->findId( string( objStr.in() ) );
+                  //if ( myRefOnObject.length() > 0 ) {
+                  //aSize[ 0 ] = myRefOnObject.length() + 1;
+                  char hypName[ 30 ], hypId[ 30 ];
+                  sprintf( hypName, "Hyp %d", ++hypNb );
+                  sprintf( hypId, "%d", id );
+                  aSize[ 0 ] = strlen( hypId ) + 1;
+                  aDataset = new HDFdataset( hypName, aGroup, HDF_STRING, aSize, 1 );
+                  aDataset->CreateOnDisk();
+                  //aDataset->WriteOnDisk( ( char* )( myRefOnObject.c_str() ) );
+                  aDataset->WriteOnDisk( hypId );
+                  aDataset->CloseOnDisk();
+                  //}
+                }
+              }
+              aGroup->CloseOnDisk();
+            }
+
+            // write applied algorithms if exist
+            SALOMEDS::SObject_wrap myAlgoBranch;
+            found = gotBranch->FindSubObject( GetRefOnAppliedAlgorithmsTag(),
+                                              myAlgoBranch.inout() );
+            if ( found && !shapeRefFound && hasShape) { // remove applied algos
+              myCurrentStudy->NewBuilder()->RemoveObjectWithChildren( myAlgoBranch );
+            }
+            if ( found && (shapeRefFound || !hasShape)) {
+              aGroup = new HDFgroup( "Applied Algorithms", aTopGroup );
+              aGroup->CreateOnDisk();
+
+              SALOMEDS::ChildIterator_wrap it = myCurrentStudy->NewChildIterator( myAlgoBranch );
+              int algoNb = 0;
+              for ( ; it->More(); it->Next() ) {
+                SALOMEDS::SObject_wrap mySObject = it->Value();
+                SALOMEDS::SObject_wrap myRefOnAlgo;
+                bool ok = mySObject->ReferencedObject( myRefOnAlgo.inout() );
+                if ( ok ) {
+                  // san - it is impossible to recover applied algorithms
+                  //       using their entries within Load() method,
+                  // for there are no AttributeIORs in the study when Load() is working.
+                  // Hence, it is better to store persistent IDs of algorithms as references to them
+
+                  //string myRefOnObject = myRefOnAlgo->GetID();
+                  CORBA::Object_var anObject = SObjectToObject( myRefOnAlgo );
+                  CORBA::String_var objStr = GetORB()->object_to_string( anObject );
+                  int id = myStudyContext->findId( string( objStr.in() ) );
+                  //if ( myRefOnObject.length() > 0 ) {
+                  //aSize[ 0 ] = myRefOnObject.length() + 1;
+                  char algoName[ 30 ], algoId[ 30 ];
+                  sprintf( algoName, "Algo %d", ++algoNb );
+                  sprintf( algoId, "%d", id );
+                  aSize[ 0 ] = strlen( algoId ) + 1;
+                  aDataset = new HDFdataset( algoName, aGroup, HDF_STRING, aSize, 1 );
+                  aDataset->CreateOnDisk();
+                  //aDataset->WriteOnDisk( ( char* )( myRefOnObject.c_str() ) );
+                  aDataset->WriteOnDisk( algoId );
+                  aDataset->CloseOnDisk();
+                  //}
+                }
+              }
+              aGroup->CloseOnDisk();
+            }
+
+            // --> submesh objects sub-branches
+
+            for ( int i = GetSubMeshOnVertexTag(); i <= GetSubMeshOnCompoundTag(); i++ ) {
+              SALOMEDS::SObject_wrap mySubmeshBranch;
+              found = gotBranch->FindSubObject( i, mySubmeshBranch.inout() );
+
+              if ( found ) // check if there is shape reference in submeshes
+              {
+                bool hasShapeRef = false;
+                SALOMEDS::ChildIterator_wrap itSM =
+                  myCurrentStudy->NewChildIterator( mySubmeshBranch );
+                for ( ; itSM->More(); itSM->Next() ) {
+                  SALOMEDS::SObject_wrap mySubRef, myShape, mySObject = itSM->Value();
+                  if ( mySObject->FindSubObject( GetRefOnShapeTag(), mySubRef.inout() ))
+                    mySubRef->ReferencedObject( myShape.inout() );
+                  if ( !CORBA::is_nil( myShape ) && !CORBA::is_nil( myShape->GetObject() ))
+                    hasShapeRef = true;
+                  else
+                  { // remove one submesh
+                    if ( shapeRefFound )
+                    { // unassign hypothesis
+                      SMESH::SMESH_subMesh_var mySubMesh =
+                        SMESH::SMESH_subMesh::_narrow( SObjectToObject( mySObject ));
+                      if ( !mySubMesh->_is_nil() ) {
+                        int shapeID = mySubMesh->GetId();
+                        TopoDS_Shape S = mySMESHDSMesh->IndexToShape( shapeID );
+                        const list<const SMESHDS_Hypothesis*>& hypList =
+                          mySMESHDSMesh->GetHypothesis( S );
+                        list<const SMESHDS_Hypothesis*>::const_iterator hyp = hypList.begin();
+                        while ( hyp != hypList.end() ) {
+                          int hypID = (*hyp++)->GetID(); // goto next hyp here because
+                          myLocMesh.RemoveHypothesis( S, hypID ); // hypList changes here
+                        }
+                      }
+                    }
+                    myCurrentStudy->NewBuilder()->RemoveObjectWithChildren( mySObject );
+                  }
+                } // loop on submeshes of a type
+                if ( !shapeRefFound || !hasShapeRef ) { // remove the whole submeshes branch
+                  myCurrentStudy->NewBuilder()->RemoveObjectWithChildren( mySubmeshBranch );
+                  found = false;
+                }
+              }  // end check if there is shape reference in submeshes
+              if ( found ) {
+                char name_meshgroup[ 30 ];
+                if ( i == GetSubMeshOnVertexTag() )
+                  strcpy( name_meshgroup, "SubMeshes On Vertex" );
+                else if ( i == GetSubMeshOnEdgeTag() )
+                  strcpy( name_meshgroup, "SubMeshes On Edge" );
+                else if ( i == GetSubMeshOnWireTag() )
+                  strcpy( name_meshgroup, "SubMeshes On Wire" );
+                else if ( i == GetSubMeshOnFaceTag() )
+                  strcpy( name_meshgroup, "SubMeshes On Face" );
+                else if ( i == GetSubMeshOnShellTag() )
+                  strcpy( name_meshgroup, "SubMeshes On Shell" );
+                else if ( i == GetSubMeshOnSolidTag() )
+                  strcpy( name_meshgroup, "SubMeshes On Solid" );
+                else if ( i == GetSubMeshOnCompoundTag() )
+                  strcpy( name_meshgroup, "SubMeshes On Compound" );
+
+                // for each type of submeshes create container HDF group
+                aGroup = new HDFgroup( name_meshgroup, aTopGroup );
+                aGroup->CreateOnDisk();
+
+                // iterator for all submeshes of given type
+                SALOMEDS::ChildIterator_wrap itSM = myCurrentStudy->NewChildIterator( mySubmeshBranch );
+                for ( ; itSM->More(); itSM->Next() ) {
+                  SALOMEDS::SObject_wrap mySObject = itSM->Value();
+                  CORBA::Object_var anSubObject = SObjectToObject( mySObject );
+                  if ( !CORBA::is_nil( anSubObject ))
+                  {
+                    SMESH::SMESH_subMesh_var mySubMesh = SMESH::SMESH_subMesh::_narrow( anSubObject ) ;
+                    CORBA::String_var objStr = GetORB()->object_to_string( anSubObject );
+                    int subid = myStudyContext->findId( string( objStr.in() ) );
+
+                    // for each mesh open the HDF group basing on its id
+                    char submeshGrpName[ 30 ];
+                    sprintf( submeshGrpName, "SubMesh %d", subid );
+                    aSubGroup = new HDFgroup( submeshGrpName, aGroup );
+                    aSubGroup->CreateOnDisk();
+
+                    // write reference on a shape, already checked if it exists
+                    SALOMEDS::SObject_wrap mySubRef, myShape;
+                    if ( mySObject->FindSubObject( GetRefOnShapeTag(), mySubRef.inout() ))
+                      mySubRef->ReferencedObject( myShape.inout() );
+                    string myRefOnObject = myShape->GetID();
+                    if ( myRefOnObject.length() > 0 ) {
+                      aSize[ 0 ] = myRefOnObject.length() + 1;
+                      aDataset = new HDFdataset( "Ref on shape", aSubGroup, HDF_STRING, aSize, 1 );
+                      aDataset->CreateOnDisk();
+                      aDataset->WriteOnDisk( ( char* )( myRefOnObject.c_str() ) );
+                      aDataset->CloseOnDisk();
+                    }
+
+                    // write applied hypotheses if exist
+                    SALOMEDS::SObject_wrap mySubHypBranch;
+                    found = mySObject->FindSubObject( GetRefOnAppliedHypothesisTag(),
+                                                      mySubHypBranch.inout() );
+                    if ( found ) {
+                      aSubSubGroup = new HDFgroup( "Applied Hypotheses", aSubGroup );
+                      aSubSubGroup->CreateOnDisk();
+
+                      SALOMEDS::ChildIterator_wrap it = myCurrentStudy->NewChildIterator( mySubHypBranch );
+                      int hypNb = 0;
+                      for ( ; it->More(); it->Next() ) {
+                        SALOMEDS::SObject_wrap mySubSObject = it->Value();
+                        SALOMEDS::SObject_wrap myRefOnHyp;
+                        bool ok = mySubSObject->ReferencedObject( myRefOnHyp.inout() );
+                        if ( ok ) {
+                          //string myRefOnObject = myRefOnHyp->GetID();
+                          CORBA::Object_var anObject = SObjectToObject( myRefOnHyp );
+                          CORBA::String_var objStr = GetORB()->object_to_string( anObject );
+                          int id = myStudyContext->findId( string( objStr.in() ) );
+                          //if ( myRefOnObject.length() > 0 ) {
+                          //aSize[ 0 ] = myRefOnObject.length() + 1;
+                          char hypName[ 30 ], hypId[ 30 ];
+                          sprintf( hypName, "Hyp %d", ++hypNb );
+                          sprintf( hypId, "%d", id );
+                          aSize[ 0 ] = strlen( hypId ) + 1;
+                          aDataset = new HDFdataset( hypName, aSubSubGroup, HDF_STRING, aSize, 1 );
+                          aDataset->CreateOnDisk();
+                          //aDataset->WriteOnDisk( ( char* )( myRefOnObject.c_str() ) );
+                          aDataset->WriteOnDisk( hypId );
+                          aDataset->CloseOnDisk();
+                          //}
+                        }
+                      }
+                      aSubSubGroup->CloseOnDisk();
+                    }
+
+                    // write applied algorithms if exist
+                    SALOMEDS::SObject_wrap mySubAlgoBranch;
+                    found = mySObject->FindSubObject( GetRefOnAppliedAlgorithmsTag(),
+                                                      mySubAlgoBranch.inout() );
+                    if ( found ) {
+                      aSubSubGroup = new HDFgroup( "Applied Algorithms", aSubGroup );
+                      aSubSubGroup->CreateOnDisk();
+
+                      SALOMEDS::ChildIterator_wrap it =
+                        myCurrentStudy->NewChildIterator( mySubAlgoBranch );
+                      int algoNb = 0;
+                      for ( ; it->More(); it->Next() ) {
+                        SALOMEDS::SObject_wrap mySubSObject = it->Value();
+                        SALOMEDS::SObject_wrap myRefOnAlgo;
+                        bool ok = mySubSObject->ReferencedObject( myRefOnAlgo.inout() );
+                        if ( ok ) {
+                          //string myRefOnObject = myRefOnAlgo->GetID();
+                          CORBA::Object_var anObject = SObjectToObject( myRefOnAlgo );
+                          CORBA::String_var objStr = GetORB()->object_to_string( anObject );
+                          int id = myStudyContext->findId( string( objStr.in() ) );
+                          //if ( myRefOnObject.length() > 0 ) {
+                          //aSize[ 0 ] = myRefOnObject.length() + 1;
+                          char algoName[ 30 ], algoId[ 30 ];
+                          sprintf( algoName, "Algo %d", ++algoNb );
+                          sprintf( algoId, "%d", id );
+                          aSize[ 0 ] = strlen( algoId ) + 1;
+                          aDataset = new HDFdataset( algoName, aSubSubGroup, HDF_STRING, aSize, 1 );
+                          aDataset->CreateOnDisk();
+                          //aDataset->WriteOnDisk( ( char* )( myRefOnObject.c_str() ) );
+                          aDataset->WriteOnDisk( algoId );
+                          aDataset->CloseOnDisk();
+                          //}
+                        }
+                      }
+                      aSubSubGroup->CloseOnDisk();
+                    }
+                    // close submesh HDF group
+                    aSubGroup->CloseOnDisk();
+                  }
+                }
+                // close container of submeshes by type HDF group
+                aGroup->CloseOnDisk();
+              }
+            }
+            // All sub-meshes will be stored in MED file
+            // .. will NOT (PAL 12992)
+            //if ( shapeRefFound )
+            //myWriter.AddAllSubMeshes();
+
+            // store submesh order if any
+            const TListOfListOfInt& theOrderIds = myLocMesh.GetMeshOrder();
+            if ( theOrderIds.size() ) {
+              char order_list[ 30 ];
+              strcpy( order_list, "Mesh Order" );
+              // count number of submesh ids
+              int nbIDs = 0;
+              TListOfListOfInt::const_iterator idIt = theOrderIds.begin();
+              for ( ; idIt != theOrderIds.end(); idIt++ )
+                nbIDs += (*idIt).size();
+              // number of values = number of IDs +
+              //                    number of lists (for separators) - 1
+              int* smIDs = new int [ nbIDs + theOrderIds.size() - 1 ];
+              idIt = theOrderIds.begin();
+              for ( int i = 0; idIt != theOrderIds.end(); idIt++ ) {
+                const TListOfInt& idList = *idIt;
+                if (idIt != theOrderIds.begin()) // not first list
+                  smIDs[ i++ ] = -1/* *idList.size()*/; // separator between lists
+                // dump submesh ids from current list
+                TListOfInt::const_iterator id_smId = idList.begin();
+                for( ; id_smId != idList.end(); id_smId++ )
+                  smIDs[ i++ ] = *id_smId;
+              }
+              // write HDF group
+              aSize[ 0 ] = nbIDs + theOrderIds.size() - 1;
+
+              aDataset = new HDFdataset( order_list, aTopGroup, HDF_INT32, aSize, 1 );
+              aDataset->CreateOnDisk();
+              aDataset->WriteOnDisk( smIDs );
+              aDataset->CloseOnDisk();
+              //
+              delete[] smIDs;
+            }
+
+            // groups root sub-branch
+            SALOMEDS::SObject_wrap myGroupsBranch;
+            for ( int i = GetNodeGroupsTag(); i <= GetBallElementsGroupsTag(); i++ ) {
+              found = gotBranch->FindSubObject( i, myGroupsBranch.inout() );
+              if ( found ) {
+                char name_group[ 30 ];
+                if ( i == GetNodeGroupsTag() )
+                  strcpy( name_group, "Groups of Nodes" );
+                else if ( i == GetEdgeGroupsTag() )
+                  strcpy( name_group, "Groups of Edges" );
+                else if ( i == GetFaceGroupsTag() )
+                  strcpy( name_group, "Groups of Faces" );
+                else if ( i == GetVolumeGroupsTag() )
+                  strcpy( name_group, "Groups of Volumes" );
+                else if ( i == Get0DElementsGroupsTag() )
+                  strcpy( name_group, "Groups of 0D Elements" );
+                else if ( i == GetBallElementsGroupsTag() )
+                  strcpy( name_group, "Groups of Balls" );
+
+                aGroup = new HDFgroup( name_group, aTopGroup );
+                aGroup->CreateOnDisk();
+
+                SALOMEDS::ChildIterator_wrap it = myCurrentStudy->NewChildIterator( myGroupsBranch );
+                for ( ; it->More(); it->Next() ) {
+                  SALOMEDS::SObject_wrap mySObject = it->Value();
+                  CORBA::Object_var aSubObject = SObjectToObject( mySObject );
+                  if ( !CORBA::is_nil( aSubObject ) ) {
+                    SMESH_GroupBase_i* myGroupImpl =
+                      dynamic_cast<SMESH_GroupBase_i*>( GetServant( aSubObject ).in() );
+                    if ( !myGroupImpl )
+                      continue;
+                    SMESHDS_GroupBase* aGrpBaseDS = myGroupImpl->GetGroupDS();
+                    if ( !aGrpBaseDS )
+                      continue;
+
+                    CORBA::String_var objStr = GetORB()->object_to_string( aSubObject );
+                    int anId = myStudyContext->findId( string( objStr.in() ) );
+
+                    // For each group, create a dataset named "Group <group_persistent_id>"
+                    // and store the group's user name into it
+                    const char* grpName = aGrpBaseDS->GetStoreName();
+                    char* aUserName = myGroupImpl->GetName();
+                    aSize[ 0 ] = strlen( aUserName ) + 1;
+
+                    aDataset = new HDFdataset( grpName, aGroup, HDF_STRING, aSize, 1 );
+                    aDataset->CreateOnDisk();
+                    aDataset->WriteOnDisk( aUserName );
+                    aDataset->CloseOnDisk();
+
+                    // ouv : NPAL12872
+                    // For each group, create a dataset named "Group <group_persistent_id> Color"
+                    // and store the group's color into it
+                    char grpColorName[ 30 ];
+                    sprintf( grpColorName, "ColorGroup %d", anId );
+                    SALOMEDS::Color aColor = myGroupImpl->GetColor();
+                    double anRGB[3];
+                    anRGB[ 0 ] = aColor.R;
+                    anRGB[ 1 ] = aColor.G;
+                    anRGB[ 2 ] = aColor.B;
+                    aSize[ 0 ] = 3;
+                    aDataset = new HDFdataset( grpColorName, aGroup, HDF_FLOAT64, aSize, 1 );
+                    aDataset->CreateOnDisk();
+                    aDataset->WriteOnDisk( anRGB );
+                    aDataset->CloseOnDisk();
+
+                    // Pass SMESHDS_Group to MED writer
+                    SMESHDS_Group* aGrpDS = dynamic_cast<SMESHDS_Group*>( aGrpBaseDS );
+                    if ( aGrpDS )
+                      myWriter.AddGroup( aGrpDS );
+
+                    // write reference on a shape if exists
+                    SMESHDS_GroupOnGeom* aGeomGrp =
+                      dynamic_cast<SMESHDS_GroupOnGeom*>( aGrpBaseDS );
+                    if ( aGeomGrp ) {
+                      SALOMEDS::SObject_wrap mySubRef, myShape;
+                      if (mySObject->FindSubObject( GetRefOnShapeTag(), mySubRef.inout() ) &&
+                          mySubRef->ReferencedObject( myShape.inout() ) &&
+                          !CORBA::is_nil( myShape->GetObject() ))
+                      {
+                        string myRefOnObject = myShape->GetID();
+                        if ( myRefOnObject.length() > 0 ) {
+                          char aRefName[ 30 ];
+                          sprintf( aRefName, "Ref on shape %d", anId);
+                          aSize[ 0 ] = myRefOnObject.length() + 1;
+                          aDataset = new HDFdataset(aRefName, aGroup, HDF_STRING, aSize, 1);
+                          aDataset->CreateOnDisk();
+                          aDataset->WriteOnDisk( ( char* )( myRefOnObject.c_str() ) );
+                          aDataset->CloseOnDisk();
+                        }
+                      }
+                      else // shape ref is invalid:
+                      {
+                        // save a group on geometry as ordinary group
+                        myWriter.AddGroup( aGeomGrp );
+                      }
+                    }
+                    else if ( SMESH_GroupOnFilter_i* aFilterGrp_i = 
+                              dynamic_cast<SMESH_GroupOnFilter_i*>( myGroupImpl ))
+                    {
+                      std::string str = aFilterGrp_i->FilterToString();
+                      std::string hdfGrpName = "Filter " + SMESH_Comment(anId);
+                      aSize[ 0 ] = str.length() + 1;
+                      aDataset = new HDFdataset( hdfGrpName.c_str(), aGroup, HDF_STRING, aSize, 1);
+                      aDataset->CreateOnDisk();
+                      aDataset->WriteOnDisk( ( char* )( str.c_str() ) );
+                      aDataset->CloseOnDisk();
+                    }
+                  }
+                }
+                aGroup->CloseOnDisk();
+              }
+            } // loop on groups
+
+            if ( strcmp( strHasData.c_str(), "1" ) == 0 )
+            {
+              // Flush current mesh information into MED file
+              myWriter.Perform();
+
+              // save info on nb of elements
+              SMESH_PreMeshInfo::SaveToFile( myImpl, id, aFile );
+
+              // maybe a shape was deleted in the study
+              if ( !shapeRefFound && !mySMESHDSMesh->ShapeToMesh().IsNull() && hasShape) {
+                TopoDS_Shape nullShape;
+                myLocMesh.ShapeToMesh( nullShape ); // remove shape referring data
+              }
+
+              if ( !mySMESHDSMesh->SubMeshes().empty() )
+              {
+                // Store submeshes
+                // ----------------
+                aGroup = new HDFgroup( "Submeshes", aTopGroup );
+                aGroup->CreateOnDisk();
+
+                // each element belongs to one or none submesh,
+                // so for each node/element, we store a submesh ID
+
+                // Make maps of submesh IDs of elements sorted by element IDs
+                typedef int TElemID;
+                typedef int TSubMID;
+                map< TElemID, TSubMID > eId2smId, nId2smId;
+                map< TElemID, TSubMID >::iterator hint; // insertion to map is done before hint
+                const map<int,SMESHDS_SubMesh*>& aSubMeshes = mySMESHDSMesh->SubMeshes();
+                map<int,SMESHDS_SubMesh*>::const_iterator itSubM ( aSubMeshes.begin() );
+                SMDS_NodeIteratorPtr itNode;
+                SMDS_ElemIteratorPtr itElem;
+                for ( itSubM = aSubMeshes.begin(); itSubM != aSubMeshes.end() ; itSubM++ )
+                {
+                  TSubMID          aSubMeID = itSubM->first;
+                  SMESHDS_SubMesh* aSubMesh = itSubM->second;
+                  if ( aSubMesh->IsComplexSubmesh() )
+                    continue; // submesh containing other submeshs
+                  // nodes
+                  hint = nId2smId.begin(); // optimize insertion basing on increasing order of elem Ids in submesh
+                  for ( itNode = aSubMesh->GetNodes(); itNode->more(); ++hint)
+                    hint = nId2smId.insert( hint, make_pair( itNode->next()->GetID(), aSubMeID ));
+                  // elements
+                  hint = eId2smId.begin();
+                  for ( itElem = aSubMesh->GetElements(); itElem->more(); ++hint)
+                    hint = eId2smId.insert( hint, make_pair( itElem->next()->GetID(), aSubMeID ));
+                }
+
+                // Care of elements that are not on submeshes
+                if ( mySMESHDSMesh->NbNodes() != nId2smId.size() ) {
+                  for ( itNode = mySMESHDSMesh->nodesIterator(); itNode->more(); )
+                    /*  --- stl_map.h says : */
+                    /*  A %map relies on unique keys and thus a %pair is only inserted if its */
+                    /*  first element (the key) is not already present in the %map.           */
+                    nId2smId.insert( make_pair( itNode->next()->GetID(), 0 ));
+                }
+                int nbElems = mySMESHDSMesh->NbEdges() + mySMESHDSMesh->NbFaces() + mySMESHDSMesh->NbVolumes();
+                if ( nbElems != eId2smId.size() ) {
+                  for ( itElem = mySMESHDSMesh->elementsIterator(); itElem->more(); )
+                    eId2smId.insert( make_pair( itElem->next()->GetID(), 0 ));
+                }
+
+                // Store submesh IDs
+                for ( int isNode = 0; isNode < 2; ++isNode )
+                {
+                  map< TElemID, TSubMID >& id2smId = isNode ? nId2smId : eId2smId;
+                  if ( id2smId.empty() ) continue;
+                  map< TElemID, TSubMID >::const_iterator id_smId = id2smId.begin();
+                  // make and fill array of submesh IDs
+                  int* smIDs = new int [ id2smId.size() ];
+                  for ( int i = 0; id_smId != id2smId.end(); ++id_smId, ++i )
+                    smIDs[ i ] = id_smId->second;
+                  // write HDF group
+                  aSize[ 0 ] = id2smId.size();
+                  string aDSName( isNode ? "Node Submeshes" : "Element Submeshes");
+                  aDataset = new HDFdataset( (char*)aDSName.c_str(), aGroup, HDF_INT32, aSize, 1 );
+                  aDataset->CreateOnDisk();
+                  aDataset->WriteOnDisk( smIDs );
+                  aDataset->CloseOnDisk();
+                  //
+                  delete[] smIDs;
+                }
+
+                aGroup->CloseOnDisk();
+
+                // Store node positions on sub-shapes (SMDS_Position):
+                // ----------------------------------------------------
+
+                aGroup = new HDFgroup( "Node Positions", aTopGroup );
+                aGroup->CreateOnDisk();
+
+                // in aGroup, create 5 datasets to contain:
+                // "Nodes on Edges" - ID of node on edge
+                // "Edge positions" - U parameter on node on edge
+                // "Nodes on Faces" - ID of node on face
+                // "Face U positions" - U parameter of node on face
+                // "Face V positions" - V parameter of node on face
+
+                // Find out nb of nodes on edges and faces
+                // Collect corresponing sub-meshes
+                int nbEdgeNodes = 0, nbFaceNodes = 0;
+                list<SMESHDS_SubMesh*> aEdgeSM, aFaceSM;
+                // loop on SMESHDS_SubMesh'es
+                for ( itSubM = aSubMeshes.begin(); itSubM != aSubMeshes.end() ; itSubM++ )
+                {
+                  SMESHDS_SubMesh* aSubMesh = (*itSubM).second;
+                  if ( aSubMesh->IsComplexSubmesh() )
+                    continue; // submesh containing other submeshs
+                  int nbNodes = aSubMesh->NbNodes();
+                  if ( nbNodes == 0 ) continue;
+
+                  int aShapeID = (*itSubM).first;
+                  if ( aShapeID < 1 || aShapeID > mySMESHDSMesh->MaxShapeIndex() )
+                    continue;
+                  int aShapeType = mySMESHDSMesh->IndexToShape( aShapeID ).ShapeType();
+                  // write only SMDS_FacePosition and SMDS_EdgePosition
+                  switch ( aShapeType ) {
+                  case TopAbs_FACE:
+                    nbFaceNodes += nbNodes;
+                    aFaceSM.push_back( aSubMesh );
+                    break;
+                  case TopAbs_EDGE:
+                    nbEdgeNodes += nbNodes;
+                    aEdgeSM.push_back( aSubMesh );
+                    break;
+                  default:
+                    continue;
+                  }
+                }
+                // Treat positions on edges or faces
+                for ( int onFace = 0; onFace < 2; onFace++ )
+                {
+                  // Create arrays to store in datasets
+                  int iNode = 0, nbNodes = ( onFace ? nbFaceNodes : nbEdgeNodes );
+                  if (!nbNodes) continue;
+                  int* aNodeIDs = new int [ nbNodes ];
+                  double* aUPos = new double [ nbNodes ];
+                  double* aVPos = ( onFace ? new double[ nbNodes ] : 0 );
+
+                  // Fill arrays
+                  // loop on sub-meshes
+                  list<SMESHDS_SubMesh*> * pListSM = ( onFace ? &aFaceSM : &aEdgeSM );
+                  list<SMESHDS_SubMesh*>::iterator itSM = pListSM->begin();
+                  for ( ; itSM != pListSM->end(); itSM++ )
+                  {
+                    SMESHDS_SubMesh* aSubMesh = (*itSM);
+
+                    SMDS_NodeIteratorPtr itNode = aSubMesh->GetNodes();
+                    // loop on nodes in aSubMesh
+                    while ( itNode->more() )
+                    {
+                      //node ID
+                      const SMDS_MeshNode* node = itNode->next();
+                      aNodeIDs [ iNode ] = node->GetID();
+
+                      // Position
+                      const SMDS_PositionPtr pos = node->GetPosition();
+                      if ( onFace ) { // on FACE
+                        const SMDS_FacePosition* fPos =
+                          dynamic_cast<const SMDS_FacePosition*>( pos );
+                        if ( fPos ) {
+                          aUPos[ iNode ] = fPos->GetUParameter();
+                          aVPos[ iNode ] = fPos->GetVParameter();
+                          iNode++;
+                        }
+                        else
+                          nbNodes--;
+                      }
+                      else { // on EDGE
+                        const SMDS_EdgePosition* ePos =
+                          dynamic_cast<const SMDS_EdgePosition*>( pos );
+                        if ( ePos ) {
+                          aUPos[ iNode ] = ePos->GetUParameter();
+                          iNode++;
+                        }
+                        else
+                          nbNodes--;
+                      }
+                    } // loop on nodes in aSubMesh
+                  } // loop on sub-meshes
+
+                  // Write datasets
+                  if ( nbNodes )
+                  {
+                    aSize[ 0 ] = nbNodes;
+                    // IDS
+                    string aDSName( onFace ? "Nodes on Faces" : "Nodes on Edges");
+                    aDataset = new HDFdataset( (char*)aDSName.c_str(), aGroup, HDF_INT32, aSize, 1 );
+                    aDataset->CreateOnDisk();
+                    aDataset->WriteOnDisk( aNodeIDs );
+                    aDataset->CloseOnDisk();
+
+                    // U Positions
+                    aDSName = ( onFace ? "Face U positions" : "Edge positions");
+                    aDataset = new HDFdataset( (char*)aDSName.c_str(), aGroup, HDF_FLOAT64, aSize, 1);
+                    aDataset->CreateOnDisk();
+                    aDataset->WriteOnDisk( aUPos );
+                    aDataset->CloseOnDisk();
+                    // V Positions
+                    if ( onFace ) {
+                      aDataset = new HDFdataset( "Face V positions", aGroup, HDF_FLOAT64, aSize, 1);
+                      aDataset->CreateOnDisk();
+                      aDataset->WriteOnDisk( aVPos );
+                      aDataset->CloseOnDisk();
+                    }
+                  }
+                  delete [] aNodeIDs;
+                  delete [] aUPos;
+                  if ( aVPos ) delete [] aVPos;
+
+                } // treat positions on edges or faces
+
+                // close "Node Positions" group
+                aGroup->CloseOnDisk();
+
+              } // if ( there are submeshes in SMESHDS_Mesh )
+            } // if ( hasData )
+
+            // close mesh HDF group
+            aTopGroup->CloseOnDisk();
+          }
+        }
+      }
+    }
+  }
+
+  // close HDF file
+  aFile->CloseOnDisk();
+  delete aFile;
+
+  // Convert temporary files to stream
+  aStreamFile = SALOMEDS_Tool::PutFilesToStream( tmpDir.ToCString(), aFileSeq.in(), isMultiFile );
+
+  // Remove temporary files and directory
+  if ( !isMultiFile )
+    SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.ToCString(), aFileSeq.in(), true );
+
+  INFOS( "SMESH_Gen_i::Save() completed" );
+  return aStreamFile._retn();
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::SaveASCII
+ *
+ *  Save SMESH module's data in ASCII format
+ */
+//=============================================================================
+
+SALOMEDS::TMPFile* SMESH_Gen_i::SaveASCII( SALOMEDS::SComponent_ptr theComponent,
+                                           const char*              theURL,
+                                           bool                     isMultiFile ) {
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::SaveASCII" );
+  SALOMEDS::TMPFile_var aStreamFile = Save( theComponent, theURL, isMultiFile );
+  return aStreamFile._retn();
+
+  //after usual saving needs to encipher binary to text string
+  //Any binary symbol will be represent as "|xx" () hexadecimal format number
+  int size = aStreamFile.in().length();
+  _CORBA_Octet* buffer = new _CORBA_Octet[size*3+1];
+  for ( int i = 0; i < size; i++ )
+    sprintf( (char*)&(buffer[i*3]), "|%02x", aStreamFile[i] );
+
+  buffer[size * 3] = '\0';
+
+  SALOMEDS::TMPFile_var anAsciiStreamFile = new SALOMEDS::TMPFile(size*3, size*3, buffer, 1);
+
+  return anAsciiStreamFile._retn();
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::loadGeomData
+ *
+ *  Load GEOM module data
+ */
+//=============================================================================
+
+void SMESH_Gen_i::loadGeomData( SALOMEDS::SComponent_ptr theCompRoot )
+{
+  if ( theCompRoot->_is_nil() )
+    return;
+
+  SALOMEDS::Study_var aStudy = SALOMEDS::Study::_narrow( theCompRoot->GetStudy() );
+  if ( aStudy->_is_nil() )
+    return;
+
+  SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
+  aStudyBuilder->LoadWith( theCompRoot, GetGeomEngine() );
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::Load
+ *
+ *  Load SMESH module's data
+ */
+//=============================================================================
+
+bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
+                        const SALOMEDS::TMPFile& theStream,
+                        const char*              theURL,
+                        bool                     isMultiFile )
+{
+  INFOS( "SMESH_Gen_i::Load" );
+
+  if ( myCurrentStudy->_is_nil() ||
+       theComponent->GetStudy()->StudyId() != myCurrentStudy->StudyId() )
+    SetCurrentStudy( theComponent->GetStudy() );
+
+  /*  if( !theComponent->_is_nil() )
+      {
+      //SALOMEDS::Study_var aStudy = SALOMEDS::Study::_narrow( theComponent->GetStudy() );
+      if( !myCurrentStudy->FindComponent( "GEOM" )->_is_nil() )
+      loadGeomData( myCurrentStudy->FindComponent( "GEOM" ) );
+      }*/
+
+  StudyContext* myStudyContext = GetCurrentStudyContext();
 
-  string filenode = "toposhape.txt";
-  ofstream fic(filenode.c_str());
+  // Get temporary files location
+  TCollection_AsciiString tmpDir =
+    isMultiFile ? TCollection_AsciiString( ( char* )theURL ) : ( char* )SALOMEDS_Tool::GetTmpDir().c_str();
+
+  INFOS( "THE URL++++++++++++++" );
+  INFOS( theURL );
+  INFOS( "THE TMP PATH+++++++++" );
+  INFOS( tmpDir );
+
+  // Convert the stream into sequence of files to process
+  SALOMEDS::ListOfFileNames_var aFileSeq = SALOMEDS_Tool::PutStreamToFiles( theStream,
+                                                                            tmpDir.ToCString(),
+                                                                            isMultiFile );
+  TCollection_AsciiString aStudyName( "" );
+  if ( isMultiFile )
+    aStudyName = ( (char*)SALOMEDS_Tool::GetNameFromPath( myCurrentStudy->URL() ).c_str() );
+
+  // Set names of temporary files
+  TCollection_AsciiString filename = tmpDir + aStudyName + TCollection_AsciiString( "_SMESH.hdf" );
+  TCollection_AsciiString meshfile = tmpDir + aStudyName + TCollection_AsciiString( "_SMESH_Mesh.med" );
+
+  int size;
+  HDFfile*    aFile;
+  HDFdataset* aDataset;
+  HDFgroup*   aTopGroup;
+  HDFgroup*   aGroup;
+  HDFgroup*   aSubGroup;
+  HDFgroup*   aSubSubGroup;
+
+  // Read data
+  // ---> open HDF file
+  aFile = new HDFfile( (char*) filename.ToCString() );
+  try {
+    aFile->OpenOnDisk( HDF_RDONLY );
+  }
+  catch ( HDFexception ) {
+    INFOS( "Load(): " << filename << " not found!" );
+    return false;
+  }
+
+  TPythonDump pd; // prevent dump during loading
+
+  // DriverMED_R_SMESHDS_Mesh myReader;
+  // myReader.SetFile( meshfile.ToCString() );
+
+  // For PAL13473 ("Repetitive mesh") implementation.
+  // New dependencies between SMESH objects are established:
+  // now hypotheses can refer to meshes, shapes and other hypotheses.
+  // To keep data consistent, the following order of data restoration
+  // imposed:
+  // 1. Create hypotheses
+  // 2. Create all meshes
+  // 3. Load hypotheses' data
+  // 4. All the rest
+
+  list< pair< SMESH_Hypothesis_i*, string > >    hypDataList;
+  list< pair< SMESH_Mesh_i*,       HDFgroup* > > meshGroupList;
+
+  // get total number of top-level groups
+  int aNbGroups = aFile->nInternalObjects();
+  if ( aNbGroups > 0 ) {
+    // --> in first turn we should read&create hypotheses
+    if ( aFile->ExistInternalObject( "Hypotheses" ) ) {
+      // open hypotheses root HDF group
+      aTopGroup = new HDFgroup( "Hypotheses", aFile );
+      aTopGroup->OpenOnDisk();
+
+      // get number of hypotheses
+      int aNbObjects = aTopGroup->nInternalObjects();
+      for ( int j = 0; j < aNbObjects; j++ ) {
+        // try to identify hypothesis
+        char hypGrpName[ HDF_NAME_MAX_LEN+1 ];
+        aTopGroup->InternalObjectIndentify( j, hypGrpName );
+
+        if ( string( hypGrpName ).substr( 0, 10 ) == string( "Hypothesis" ) ) {
+          // open hypothesis group
+          aGroup = new HDFgroup( hypGrpName, aTopGroup );
+          aGroup->OpenOnDisk();
+
+          // --> get hypothesis id
+          int    id = atoi( string( hypGrpName ).substr( 10 ).c_str() );
+          string hypname;
+          string libname;
+          string hypdata;
+
+          // get number of datasets
+          int aNbSubObjects = aGroup->nInternalObjects();
+          for ( int k = 0; k < aNbSubObjects; k++ ) {
+            // identify dataset
+            char name_of_subgroup[ HDF_NAME_MAX_LEN+1 ];
+            aGroup->InternalObjectIndentify( k, name_of_subgroup );
+            // --> get hypothesis name
+            if ( strcmp( name_of_subgroup, "Name"  ) == 0 ) {
+              aDataset = new HDFdataset( name_of_subgroup, aGroup );
+              aDataset->OpenOnDisk();
+              size = aDataset->GetSize();
+              char* hypname_str = new char[ size ];
+              aDataset->ReadFromDisk( hypname_str );
+              hypname = string( hypname_str );
+              delete [] hypname_str;
+              aDataset->CloseOnDisk();
+            }
+            // --> get hypothesis plugin library name
+            if ( strcmp( name_of_subgroup, "LibName"  ) == 0 ) {
+              aDataset = new HDFdataset( name_of_subgroup, aGroup );
+              aDataset->OpenOnDisk();
+              size = aDataset->GetSize();
+              char* libname_str = new char[ size ];
+              aDataset->ReadFromDisk( libname_str );
+              if(MYDEBUG) SCRUTE( libname_str );
+              libname = string( libname_str );
+              delete [] libname_str;
+              aDataset->CloseOnDisk();
+            }
+            // --> get hypothesis data
+            if ( strcmp( name_of_subgroup, "Data"  ) == 0 ) {
+              aDataset = new HDFdataset( name_of_subgroup, aGroup );
+              aDataset->OpenOnDisk();
+              size = aDataset->GetSize();
+              char* hypdata_str = new char[ size ];
+              aDataset->ReadFromDisk( hypdata_str );
+              hypdata = string( hypdata_str );
+              delete [] hypdata_str;
+              aDataset->CloseOnDisk();
+            }
+          }
+          // close hypothesis HDF group
+          aGroup->CloseOnDisk();
+
+          // --> restore hypothesis from data
+          if ( id > 0 && !hypname.empty()/* && !hypdata.empty()*/ ) { // VSR : persistent data can be empty
+            if(MYDEBUG) MESSAGE("VSR - load hypothesis : id = " << id <<
+                                ", name = " << hypname.c_str() << ", persistent string = " << hypdata.c_str());
+            SMESH::SMESH_Hypothesis_var myHyp;
+
+            try { // protect persistence mechanism against exceptions
+              myHyp = this->createHypothesis( hypname.c_str(), libname.c_str() );
+            }
+            catch (...) {
+              INFOS( "Exception during hypothesis creation" );
+            }
+
+            SMESH_Hypothesis_i* myImpl = dynamic_cast<SMESH_Hypothesis_i*>( GetServant( myHyp ).in() );
+            if ( myImpl ) {
+              // myImpl->LoadFrom( hypdata.c_str() );
+              hypDataList.push_back( make_pair( myImpl, hypdata ));
+              CORBA::String_var iorString = GetORB()->object_to_string( myHyp );
+              int newId = myStudyContext->findId( iorString.in() );
+              myStudyContext->mapOldToNew( id, newId );
+            }
+            else
+              if(MYDEBUG) MESSAGE( "VSR - SMESH_Gen::Load - can't get servant" );
+          }
+        }
+      }
+      // close hypotheses root HDF group
+      aTopGroup->CloseOnDisk();
+      aTopGroup = 0;
+    }
+
+    // --> then we should read&create algorithms
+    if ( aFile->ExistInternalObject( "Algorithms" ) ) {
+      // open algorithms root HDF group
+      aTopGroup = new HDFgroup( "Algorithms", aFile );
+      aTopGroup->OpenOnDisk();
+
+      // get number of algorithms
+      int aNbObjects = aTopGroup->nInternalObjects();
+      for ( int j = 0; j < aNbObjects; j++ ) {
+        // try to identify algorithm
+        char hypGrpName[ HDF_NAME_MAX_LEN+1 ];
+        aTopGroup->InternalObjectIndentify( j, hypGrpName );
+
+        if ( string( hypGrpName ).substr( 0, 9 ) == string( "Algorithm" ) ) {
+          // open algorithm group
+          aGroup = new HDFgroup( hypGrpName, aTopGroup );
+          aGroup->OpenOnDisk();
+
+          // --> get algorithm id
+          int    id = atoi( string( hypGrpName ).substr( 9 ).c_str() );
+          string hypname;
+          string libname;
+          string hypdata;
+
+          // get number of datasets
+          int aNbSubObjects = aGroup->nInternalObjects();
+          for ( int k = 0; k < aNbSubObjects; k++ ) {
+            // identify dataset
+            char name_of_subgroup[ HDF_NAME_MAX_LEN+1 ];
+            aGroup->InternalObjectIndentify( k, name_of_subgroup );
+            // --> get algorithm name
+            if ( strcmp( name_of_subgroup, "Name"  ) == 0 ) {
+              aDataset = new HDFdataset( name_of_subgroup, aGroup );
+              aDataset->OpenOnDisk();
+              size = aDataset->GetSize();
+              char* hypname_str = new char[ size ];
+              aDataset->ReadFromDisk( hypname_str );
+              hypname = string( hypname_str );
+              delete [] hypname_str;
+              aDataset->CloseOnDisk();
+            }
+            // --> get algorithm plugin library name
+            if ( strcmp( name_of_subgroup, "LibName"  ) == 0 ) {
+              aDataset = new HDFdataset( name_of_subgroup, aGroup );
+              aDataset->OpenOnDisk();
+              size = aDataset->GetSize();
+              char* libname_str = new char[ size ];
+              aDataset->ReadFromDisk( libname_str );
+              if(MYDEBUG) SCRUTE( libname_str );
+              libname = string( libname_str );
+              delete [] libname_str;
+              aDataset->CloseOnDisk();
+            }
+            // --> get algorithm data
+            if ( strcmp( name_of_subgroup, "Data"  ) == 0 ) {
+              aDataset = new HDFdataset( name_of_subgroup, aGroup );
+              aDataset->OpenOnDisk();
+              size = aDataset->GetSize();
+              char* hypdata_str = new char[ size ];
+              aDataset->ReadFromDisk( hypdata_str );
+              if(MYDEBUG) SCRUTE( hypdata_str );
+              hypdata = string( hypdata_str );
+              delete [] hypdata_str;
+              aDataset->CloseOnDisk();
+            }
+          }
+          // close algorithm HDF group
+          aGroup->CloseOnDisk();
+
+          // --> restore algorithm from data
+          if ( id > 0 && !hypname.empty()/* && !hypdata.empty()*/ ) { // VSR : persistent data can be empty
+            if(MYDEBUG) MESSAGE("VSR - load algo : id = " << id <<
+                                ", name = " << hypname.c_str() << ", persistent string = " << hypdata.c_str());
+            SMESH::SMESH_Hypothesis_var myHyp;
+
+            try { // protect persistence mechanism against exceptions
+              myHyp = this->createHypothesis( hypname.c_str(), libname.c_str() );
+            }
+            catch (...) {
+              INFOS( "Exception during hypothesis creation" );
+            }
+
+            SMESH_Hypothesis_i* myImpl = dynamic_cast<SMESH_Hypothesis_i*>( GetServant( myHyp ).in() );
+            if ( myImpl ) {
+              //myImpl->LoadFrom( hypdata.c_str() );
+              hypDataList.push_back( make_pair( myImpl, hypdata ));
+              CORBA::String_var iorString = GetORB()->object_to_string( myHyp );
+              int newId = myStudyContext->findId( iorString.in() );
+              myStudyContext->mapOldToNew( id, newId );
+            }
+            else
+              if(MYDEBUG) MESSAGE( "VSR - SMESH_Gen::Load - can't get servant" );
+          }
+        }
+      }
+      // close algorithms root HDF group
+      aTopGroup->CloseOnDisk();
+      aTopGroup = 0;
+    }
+
+    // --> the rest groups should be meshes
+    for ( int i = 0; i < aNbGroups; i++ ) {
+      // identify next group
+      char meshName[ HDF_NAME_MAX_LEN+1 ];
+      aFile->InternalObjectIndentify( i, meshName );
+
+      if ( string( meshName ).substr( 0, 4 ) == string( "Mesh" ) ) {
+        // --> get mesh id
+        int id = atoi( string( meshName ).substr( 4 ).c_str() );
+        if ( id <= 0 )
+          continue;
+
+        // open mesh HDF group
+        aTopGroup = new HDFgroup( meshName, aFile );
+        aTopGroup->OpenOnDisk();
+
+        // get number of child HDF objects
+        int aNbObjects = aTopGroup->nInternalObjects();
+        if ( aNbObjects > 0 ) {
+          // create mesh
+          if(MYDEBUG) MESSAGE( "VSR - load mesh : id = " << id );
+          SMESH::SMESH_Mesh_var myNewMesh = this->createMesh();
+          SMESH_Mesh_i* myNewMeshImpl = dynamic_cast<SMESH_Mesh_i*>( GetServant( myNewMesh ).in() );
+          if ( !myNewMeshImpl )
+            continue;
+          meshGroupList.push_back( make_pair( myNewMeshImpl, aTopGroup ));
+
+          CORBA::String_var iorString = GetORB()->object_to_string( myNewMesh );
+          int newId = myStudyContext->findId( iorString.in() );
+          myStudyContext->mapOldToNew( id, newId );
+
+          // ouv : NPAL12872
+          // try to read and set auto color flag
+          char aMeshAutoColorName[ 30 ];
+          sprintf( aMeshAutoColorName, "AutoColorMesh %d", id);
+          if( aTopGroup->ExistInternalObject( aMeshAutoColorName ) )
+          {
+            aDataset = new HDFdataset( aMeshAutoColorName, aTopGroup );
+            aDataset->OpenOnDisk();
+            size = aDataset->GetSize();
+            int* anAutoColor = new int[ size ];
+            aDataset->ReadFromDisk( anAutoColor );
+            aDataset->CloseOnDisk();
+            myNewMeshImpl->GetImpl().SetAutoColor( (bool)anAutoColor[0] );
+            delete [] anAutoColor;
+          }
+
+          // try to read and set reference to shape
+          GEOM::GEOM_Object_var aShapeObject;
+          if ( aTopGroup->ExistInternalObject( "Ref on shape" ) ) {
+            // load mesh "Ref on shape" - it's an entry to SObject
+            aDataset = new HDFdataset( "Ref on shape", aTopGroup );
+            aDataset->OpenOnDisk();
+            size = aDataset->GetSize();
+            char* refFromFile = new char[ size ];
+            aDataset->ReadFromDisk( refFromFile );
+            aDataset->CloseOnDisk();
+            if ( strlen( refFromFile ) > 0 ) {
+              SALOMEDS::SObject_wrap shapeSO = myCurrentStudy->FindObjectID( refFromFile );
+
+              // Make sure GEOM data are loaded first
+              //loadGeomData( shapeSO->GetFatherComponent() );
+
+              CORBA::Object_var shapeObject = SObjectToObject( shapeSO );
+              if ( !CORBA::is_nil( shapeObject ) ) {
+                aShapeObject = GEOM::GEOM_Object::_narrow( shapeObject );
+                if ( !aShapeObject->_is_nil() )
+                  myNewMeshImpl->SetShape( aShapeObject );
+              }
+            }
+            delete [] refFromFile;
+          }
+
+          // issue 20918. Restore Persistent Id of SMESHDS_Mesh
+          if( aTopGroup->ExistInternalObject( "meshPersistentId" ) )
+          {
+            aDataset = new HDFdataset( "meshPersistentId", aTopGroup );
+            aDataset->OpenOnDisk();
+            size = aDataset->GetSize();
+            int* meshPersistentId = new int[ size ];
+            aDataset->ReadFromDisk( meshPersistentId );
+            aDataset->CloseOnDisk();
+            myNewMeshImpl->GetImpl().GetMeshDS()->SetPersistentId( *meshPersistentId );
+            delete [] meshPersistentId;
+          }
+        }
+      }
+    } // reading MESHes
+
+    // As all object that can be referred by hypothesis are created,
+    // we can restore hypothesis data
 
-  for (int shapeType = TopAbs_COMPOUND; shapeType < TopAbs_SHAPE; shapeType++)
+    list< pair< SMESH_Hypothesis_i*, string > >::iterator hyp_data;
+    for ( hyp_data = hypDataList.begin(); hyp_data != hypDataList.end(); ++hyp_data )
     {
-      fic << "shape type : " << SMESH_shapeTypeNames[shapeType];
+      SMESH_Hypothesis_i* hyp  = hyp_data->first;
+      string &            data = hyp_data->second;
+      hyp->LoadFrom( data.c_str() );
+    }
 
-      GEOM::GEOM_Gen::ListOfGeomShapes_var subShapes
-        = geom->SubShapeAll(myShape,shapeType); 
-      int nbSubShapes = subShapes->length();
-      int nbLocal = myTopo->_myShapes[shapeType].Extent();
-      fic << " - number of elements: " << nbSubShapes << endl;
-      ASSERT(nbSubShapes == nbLocal);
+    // Restore the rest mesh data
 
-      for (int i=0; i< nbSubShapes; i++)
-        {
-          GEOM::GEOM_Shape_var aSubShape = subShapes[i];
-          string idShape = SMESH_topo::GetShapeLocalId(aSubShape);
-          fic << "  " <<  idShape;
-          SCRUTE(idShape);
-          TopoDS_Shape aLocShape  = _ShapeReader->GetShape(geom,aSubShape);
-          for (int j=1; j <= nbLocal; j++)
-            if (aLocShape.IsSame(myTopo->_myShapes[shapeType].FindKey(j)))
+    list< pair< SMESH_Mesh_i*, HDFgroup* > >::iterator meshi_group;
+    for ( meshi_group = meshGroupList.begin(); meshi_group != meshGroupList.end(); ++meshi_group )
+    {
+      aTopGroup                   = meshi_group->second;
+      SMESH_Mesh_i* myNewMeshImpl = meshi_group->first;
+      //::SMESH_Mesh& myLocMesh     = myNewMeshImpl->GetImpl();
+      //SMESHDS_Mesh* mySMESHDSMesh = myLocMesh.GetMeshDS();
+
+      GEOM::GEOM_Object_var aShapeObject = myNewMeshImpl->GetShapeToMesh();
+      bool hasData = false;
+
+      // get mesh old id
+      CORBA::String_var iorString = GetORB()->object_to_string( myNewMeshImpl->_this() );
+      int newId = myStudyContext->findId( iorString.in() );
+      int id = myStudyContext->getOldId( newId );
+
+      // try to find mesh data dataset
+      if ( aTopGroup->ExistInternalObject( "Has data" ) ) {
+        // load mesh "has data" flag
+        aDataset = new HDFdataset( "Has data", aTopGroup );
+        aDataset->OpenOnDisk();
+        size = aDataset->GetSize();
+        char* strHasData = new char[ size ];
+        aDataset->ReadFromDisk( strHasData );
+        aDataset->CloseOnDisk();
+        if ( strcmp( strHasData, "1") == 0 ) {
+          // read mesh data from MED file
+          // myReader.SetMesh( mySMESHDSMesh );
+          // myReader.SetMeshId( id );
+          // myReader.Perform();
+          hasData = true;
+        }
+        delete [] strHasData;
+      }
+
+      // Try to get applied ALGORITHMS (mesh is not cleared by algo addition because
+      // nodes and elements are not yet put into sub-meshes)
+      if ( aTopGroup->ExistInternalObject( "Applied Algorithms" ) ) {
+        aGroup = new HDFgroup( "Applied Algorithms", aTopGroup );
+        aGroup->OpenOnDisk();
+        // get number of applied algorithms
+        int aNbSubObjects = aGroup->nInternalObjects();
+        if(MYDEBUG) MESSAGE( "VSR - number of applied algos " << aNbSubObjects );
+        for ( int j = 0; j < aNbSubObjects; j++ ) {
+          char name_dataset[ HDF_NAME_MAX_LEN+1 ];
+          aGroup->InternalObjectIndentify( j, name_dataset );
+          // check if it is an algorithm
+          if ( string( name_dataset ).substr( 0, 4 ) == string( "Algo" ) ) {
+            aDataset = new HDFdataset( name_dataset, aGroup );
+            aDataset->OpenOnDisk();
+            size = aDataset->GetSize();
+            char* refFromFile = new char[ size ];
+            aDataset->ReadFromDisk( refFromFile );
+            aDataset->CloseOnDisk();
+            // san - it is impossible to recover applied algorithms using their entries within Load() method
+            //SALOMEDS::SObject_wrap hypSO = myCurrentStudy->FindObjectID( refFromFile );
+            //CORBA::Object_var hypObject = SObjectToObject( hypSO );
+            int id = atoi( refFromFile );
+            delete [] refFromFile;
+            string anIOR = myStudyContext->getIORbyOldId( id );
+            if ( !anIOR.empty() ) {
+              CORBA::Object_var hypObject = GetORB()->string_to_object( anIOR.c_str() );
+              if ( !CORBA::is_nil( hypObject ) ) {
+                SMESH::SMESH_Hypothesis_var anHyp = SMESH::SMESH_Hypothesis::_narrow( hypObject );
+                if ( !anHyp->_is_nil() && (!aShapeObject->_is_nil()
+                                           || !myNewMeshImpl->HasShapeToMesh()) )
+                  myNewMeshImpl->addHypothesis( aShapeObject, anHyp );
+              }
+            }
+          }
+        }
+        aGroup->CloseOnDisk();
+      }
+
+      // try to get applied hypotheses
+      if ( aTopGroup->ExistInternalObject( "Applied Hypotheses" ) ) {
+        aGroup = new HDFgroup( "Applied Hypotheses", aTopGroup );
+        aGroup->OpenOnDisk();
+        // get number of applied hypotheses
+        int aNbSubObjects = aGroup->nInternalObjects();
+        for ( int j = 0; j < aNbSubObjects; j++ ) {
+          char name_dataset[ HDF_NAME_MAX_LEN+1 ];
+          aGroup->InternalObjectIndentify( j, name_dataset );
+          // check if it is a hypothesis
+          if ( string( name_dataset ).substr( 0, 3 ) == string( "Hyp" ) ) {
+            aDataset = new HDFdataset( name_dataset, aGroup );
+            aDataset->OpenOnDisk();
+            size = aDataset->GetSize();
+            char* refFromFile = new char[ size ];
+            aDataset->ReadFromDisk( refFromFile );
+            aDataset->CloseOnDisk();
+            // san - it is impossible to recover applied hypotheses using their entries within Load() method
+            //SALOMEDS::SObject_wrap hypSO = myCurrentStudy->FindObjectID( refFromFile );
+            //CORBA::Object_var hypObject = SObjectToObject( hypSO );
+            int id = atoi( refFromFile );
+            delete [] refFromFile;
+            string anIOR = myStudyContext->getIORbyOldId( id );
+            if ( !anIOR.empty() ) {
+              CORBA::Object_var hypObject = GetORB()->string_to_object( anIOR.c_str() );
+              if ( !CORBA::is_nil( hypObject ) ) {
+                SMESH::SMESH_Hypothesis_var anHyp = SMESH::SMESH_Hypothesis::_narrow( hypObject );
+                if ( !anHyp->_is_nil() && (!aShapeObject->_is_nil()
+                                           || !myNewMeshImpl->HasShapeToMesh()) )
+                  myNewMeshImpl->addHypothesis( aShapeObject, anHyp );
+              }
+            }
+          }
+        }
+        aGroup->CloseOnDisk();
+      }
+
+      // --> try to find SUB-MESHES containers for each type of submesh
+      for ( int j = GetSubMeshOnVertexTag(); j <= GetSubMeshOnCompoundTag(); j++ ) {
+        char name_meshgroup[ 30 ];
+        if ( j == GetSubMeshOnVertexTag() )
+          strcpy( name_meshgroup, "SubMeshes On Vertex" );
+        else if ( j == GetSubMeshOnEdgeTag() )
+          strcpy( name_meshgroup, "SubMeshes On Edge" );
+        else if ( j == GetSubMeshOnWireTag() )
+          strcpy( name_meshgroup, "SubMeshes On Wire" );
+        else if ( j == GetSubMeshOnFaceTag() )
+          strcpy( name_meshgroup, "SubMeshes On Face" );
+        else if ( j == GetSubMeshOnShellTag() )
+          strcpy( name_meshgroup, "SubMeshes On Shell" );
+        else if ( j == GetSubMeshOnSolidTag() )
+          strcpy( name_meshgroup, "SubMeshes On Solid" );
+        else if ( j == GetSubMeshOnCompoundTag() )
+          strcpy( name_meshgroup, "SubMeshes On Compound" );
+
+        // try to get submeshes container HDF group
+        if ( aTopGroup->ExistInternalObject( name_meshgroup ) ) {
+          // open submeshes containers HDF group
+          aGroup = new HDFgroup( name_meshgroup, aTopGroup );
+          aGroup->OpenOnDisk();
+
+          // get number of submeshes
+          int aNbSubMeshes = aGroup->nInternalObjects();
+          for ( int k = 0; k < aNbSubMeshes; k++ ) {
+            // identify submesh
+            char name_submeshgroup[ HDF_NAME_MAX_LEN+1 ];
+            aGroup->InternalObjectIndentify( k, name_submeshgroup );
+            if ( string( name_submeshgroup ).substr( 0, 7 ) == string( "SubMesh" )  ) {
+              // --> get submesh id
+              int subid = atoi( string( name_submeshgroup ).substr( 7 ).c_str() );
+              if ( subid <= 0 )
+                continue;
+              // open submesh HDF group
+              aSubGroup = new HDFgroup( name_submeshgroup, aGroup );
+              aSubGroup->OpenOnDisk();
+
+              // try to read and set reference to subshape
+              GEOM::GEOM_Object_var aSubShapeObject;
+              SMESH::SMESH_subMesh_var aSubMesh;
+
+              if ( aSubGroup->ExistInternalObject( "Ref on shape" ) ) {
+                // load submesh "Ref on shape" - it's an entry to SObject
+                aDataset = new HDFdataset( "Ref on shape", aSubGroup );
+                aDataset->OpenOnDisk();
+                size = aDataset->GetSize();
+                char* refFromFile = new char[ size ];
+                aDataset->ReadFromDisk( refFromFile );
+                aDataset->CloseOnDisk();
+                if ( strlen( refFromFile ) > 0 ) {
+                  SALOMEDS::SObject_wrap subShapeSO = myCurrentStudy->FindObjectID( refFromFile );
+                  CORBA::Object_var subShapeObject = SObjectToObject( subShapeSO );
+                  if ( !CORBA::is_nil( subShapeObject ) ) {
+                    aSubShapeObject = GEOM::GEOM_Object::_narrow( subShapeObject );
+                    if ( !aSubShapeObject->_is_nil() )
+                      aSubMesh = SMESH::SMESH_subMesh::_duplicate
+                        ( myNewMeshImpl->createSubMesh( aSubShapeObject ) );
+                    if ( aSubMesh->_is_nil() )
+                      continue;
+                    string iorSubString = GetORB()->object_to_string( aSubMesh );
+                    int newSubId = myStudyContext->findId( iorSubString );
+                    myStudyContext->mapOldToNew( subid, newSubId );
+                  }
+                }
+              }
+
+              if ( aSubMesh->_is_nil() )
+                continue;
+
+              // try to get applied algorithms
+              if ( aSubGroup->ExistInternalObject( "Applied Algorithms" ) ) {
+                // open "applied algorithms" HDF group
+                aSubSubGroup = new HDFgroup( "Applied Algorithms", aSubGroup );
+                aSubSubGroup->OpenOnDisk();
+                // get number of applied algorithms
+                int aNbSubObjects = aSubSubGroup->nInternalObjects();
+                for ( int l = 0; l < aNbSubObjects; l++ ) {
+                  char name_dataset[ HDF_NAME_MAX_LEN+1 ];
+                  aSubSubGroup->InternalObjectIndentify( l, name_dataset );
+                  // check if it is an algorithm
+                  if ( string( name_dataset ).substr( 0, 4 ) == string( "Algo" ) ) {
+                    aDataset = new HDFdataset( name_dataset, aSubSubGroup );
+                    aDataset->OpenOnDisk();
+                    size = aDataset->GetSize();
+                    char* refFromFile = new char[ size ];
+                    aDataset->ReadFromDisk( refFromFile );
+                    aDataset->CloseOnDisk();
+
+                    int id = atoi( refFromFile );
+                    string anIOR = myStudyContext->getIORbyOldId( id );
+                    if ( !anIOR.empty() ) {
+                      CORBA::Object_var hypObject = GetORB()->string_to_object( anIOR.c_str() );
+                      if ( !CORBA::is_nil( hypObject ) ) {
+                        SMESH::SMESH_Hypothesis_var anHyp = SMESH::SMESH_Hypothesis::_narrow( hypObject );
+                        if ( !anHyp->_is_nil() && !aShapeObject->_is_nil() )
+                          myNewMeshImpl->addHypothesis( aSubShapeObject, anHyp );
+                      }
+                    }
+                  }
+                }
+                // close "applied algorithms" HDF group
+                aSubSubGroup->CloseOnDisk();
+              }
+
+              // try to get applied hypotheses
+              if ( aSubGroup->ExistInternalObject( "Applied Hypotheses" ) ) {
+                // open "applied hypotheses" HDF group
+                aSubSubGroup = new HDFgroup( "Applied Hypotheses", aSubGroup );
+                aSubSubGroup->OpenOnDisk();
+                // get number of applied hypotheses
+                int aNbSubObjects = aSubSubGroup->nInternalObjects();
+                for ( int l = 0; l < aNbSubObjects; l++ ) {
+                  char name_dataset[ HDF_NAME_MAX_LEN+1 ];
+                  aSubSubGroup->InternalObjectIndentify( l, name_dataset );
+                  // check if it is a hypothesis
+                  if ( string( name_dataset ).substr( 0, 3 ) == string( "Hyp" ) ) {
+                    aDataset = new HDFdataset( name_dataset, aSubSubGroup );
+                    aDataset->OpenOnDisk();
+                    size = aDataset->GetSize();
+                    char* refFromFile = new char[ size ];
+                    aDataset->ReadFromDisk( refFromFile );
+                    aDataset->CloseOnDisk();
+
+                    int id = atoi( refFromFile );
+                    string anIOR = myStudyContext->getIORbyOldId( id );
+                    if ( !anIOR.empty() ) {
+                      CORBA::Object_var hypObject = GetORB()->string_to_object( anIOR.c_str() );
+                      if ( !CORBA::is_nil( hypObject ) ) {
+                        SMESH::SMESH_Hypothesis_var anHyp = SMESH::SMESH_Hypothesis::_narrow( hypObject );
+                        if ( !anHyp->_is_nil() && !aShapeObject->_is_nil() )
+                          myNewMeshImpl->addHypothesis( aSubShapeObject, anHyp );
+                      }
+                    }
+                  }
+                }
+                // close "APPLIED HYPOTHESES" hdf group
+                aSubSubGroup->CloseOnDisk();
+              }
+
+              // close SUB-MESH hdf group
+              aSubGroup->CloseOnDisk();
+            }
+          }
+          // close SUB-MESHES containers hdf group
+          aGroup->CloseOnDisk();
+        }
+      }
+
+      // try to get GROUPS
+      for ( int ii = GetNodeGroupsTag(); ii <= GetBallElementsGroupsTag(); ii++ ) {
+        char name_group[ 30 ];
+        if ( ii == GetNodeGroupsTag() )
+          strcpy( name_group, "Groups of Nodes" );
+        else if ( ii == GetEdgeGroupsTag() )
+          strcpy( name_group, "Groups of Edges" );
+        else if ( ii == GetFaceGroupsTag() )
+          strcpy( name_group, "Groups of Faces" );
+        else if ( ii == GetVolumeGroupsTag() )
+          strcpy( name_group, "Groups of Volumes" );
+        else if ( ii == Get0DElementsGroupsTag() )
+          strcpy( name_group, "Groups of 0D Elements" );
+        else if ( ii == GetBallElementsGroupsTag() )
+          strcpy( name_group, "Groups of Balls" );
+
+        if ( aTopGroup->ExistInternalObject( name_group ) ) {
+          aGroup = new HDFgroup( name_group, aTopGroup );
+          aGroup->OpenOnDisk();
+          // get number of groups
+          int aNbSubObjects = aGroup->nInternalObjects();
+          for ( int j = 0; j < aNbSubObjects; j++ ) {
+            char name_dataset[ HDF_NAME_MAX_LEN+1 ];
+            aGroup->InternalObjectIndentify( j, name_dataset );
+            // check if it is an group
+            if ( string( name_dataset ).substr( 0, 5 ) == string( "Group" ) ) {
+              // --> get group id
+              int subid = atoi( string( name_dataset ).substr( 5 ).c_str() );
+              if ( subid <= 0 )
+                continue;
+              aDataset = new HDFdataset( name_dataset, aGroup );
+              aDataset->OpenOnDisk();
+
+              // Retrieve actual group name
+              size = aDataset->GetSize();
+              char* nameFromFile = new char[ size ];
+              aDataset->ReadFromDisk( nameFromFile );
+              aDataset->CloseOnDisk();
+
+              // Try to find a shape reference
+              TopoDS_Shape aShape;
+              char aRefName[ 30 ];
+              sprintf( aRefName, "Ref on shape %d", subid);
+              if ( aGroup->ExistInternalObject( aRefName ) ) {
+                // load mesh "Ref on shape" - it's an entry to SObject
+                aDataset = new HDFdataset( aRefName, aGroup );
+                aDataset->OpenOnDisk();
+                size = aDataset->GetSize();
+                char* refFromFile = new char[ size ];
+                aDataset->ReadFromDisk( refFromFile );
+                aDataset->CloseOnDisk();
+                if ( strlen( refFromFile ) > 0 ) {
+                  SALOMEDS::SObject_wrap shapeSO = myCurrentStudy->FindObjectID( refFromFile );
+                  CORBA::Object_var shapeObject = SObjectToObject( shapeSO );
+                  if ( !CORBA::is_nil( shapeObject ) ) {
+                    aShapeObject = GEOM::GEOM_Object::_narrow( shapeObject );
+                    if ( !aShapeObject->_is_nil() )
+                      aShape = GeomObjectToShape( aShapeObject );
+                  }
+                }
+              }
+              // Try to read a filter of SMESH_GroupOnFilter
+              SMESH::Filter_var filter;
+              SMESH_PredicatePtr predicate;
+              std::string hdfGrpName = "Filter " + SMESH_Comment(subid);
+              if ( aGroup->ExistInternalObject( hdfGrpName.c_str() ))
               {
-                MESSAGE("  --- trouve = " << j);
-                myTopo->_mapIndShapes[shapeType][idShape] = j;
-                fic << "  --- trouve = " << j;
-                break;
+                aDataset = new HDFdataset( hdfGrpName.c_str(), aGroup );
+                aDataset->OpenOnDisk();
+                size = aDataset->GetSize();
+                char* persistStr = new char[ size ];
+                aDataset->ReadFromDisk( persistStr );
+                aDataset->CloseOnDisk();
+                if ( strlen( persistStr ) > 0 ) {
+                  filter = SMESH_GroupOnFilter_i::StringToFilter( persistStr );
+                  predicate = SMESH_GroupOnFilter_i::GetPredicate( filter );
+                }
+              }
+
+              // Create group servant
+              SMESH::ElementType type = (SMESH::ElementType)(ii - GetNodeGroupsTag() + 1);
+              SMESH::SMESH_GroupBase_var aNewGroup = SMESH::SMESH_GroupBase::_duplicate
+                ( myNewMeshImpl->createGroup( type, nameFromFile, aShape, predicate ) );
+              // Obtain a SMESHDS_Group object
+              if ( aNewGroup->_is_nil() )
+                continue;
+
+              string iorSubString = GetORB()->object_to_string( aNewGroup );
+              int        newSubId = myStudyContext->findId( iorSubString );
+              myStudyContext->mapOldToNew( subid, newSubId );
+
+              SMESH_GroupBase_i* aGroupImpl = SMESH::DownCast< SMESH_GroupBase_i*>( aNewGroup );
+              if ( !aGroupImpl )
+                continue;
+
+              if ( SMESH_GroupOnFilter_i* aFilterGroup =
+                   dynamic_cast< SMESH_GroupOnFilter_i*>( aGroupImpl ))
+              {
+                aFilterGroup->SetFilter( filter );
+                filter->UnRegister();
+              }
+              SMESHDS_GroupBase* aGroupBaseDS = aGroupImpl->GetGroupDS();
+              if ( !aGroupBaseDS )
+                continue;
+
+              aGroupBaseDS->SetStoreName( name_dataset );
+
+              // ouv : NPAL12872
+              // Read color of the group
+              char aGroupColorName[ 30 ];
+              sprintf( aGroupColorName, "ColorGroup %d", subid);
+              if ( aGroup->ExistInternalObject( aGroupColorName ) )
+              {
+                aDataset = new HDFdataset( aGroupColorName, aGroup );
+                aDataset->OpenOnDisk();
+                size = aDataset->GetSize();
+                double* anRGB = new double[ size ];
+                aDataset->ReadFromDisk( anRGB );
+                aDataset->CloseOnDisk();
+                Quantity_Color aColor( anRGB[0], anRGB[1], anRGB[2], Quantity_TOC_RGB );
+                aGroupBaseDS->SetColor( aColor );
               }
-          fic << endl;
+
+              // Fill group with contents from MED file
+              // SMESHDS_Group* aGrp = dynamic_cast<SMESHDS_Group*>( aGroupBaseDS );
+              // if ( aGrp )
+              //   myReader.GetGroup( aGrp );
+            }
+          }
+          aGroup->CloseOnDisk();
         }
+      } // reading GROUPs
+
+      // instead of reading mesh data, we read only brief information of all
+      // objects: mesh, groups, sub-meshes (issue 0021208 )
+      if ( hasData )
+      {
+        SMESH_PreMeshInfo::LoadFromFile( myNewMeshImpl, id,
+                                         meshfile.ToCString(), filename.ToCString(),
+                                         !isMultiFile );
+      }
+
+      // read Sub-Mesh ORDER if any
+      if( aTopGroup->ExistInternalObject( "Mesh Order" ) ) {
+        aDataset = new HDFdataset( "Mesh Order", aTopGroup );
+        aDataset->OpenOnDisk();
+        size = aDataset->GetSize();
+        int* smIDs = new int[ size ];
+        aDataset->ReadFromDisk( smIDs );
+        aDataset->CloseOnDisk();
+        TListOfListOfInt anOrderIds;
+        anOrderIds.push_back( TListOfInt() );
+        for ( int i = 0; i < size; i++ )
+          if ( smIDs[ i ] < 0 ) // is separator
+            anOrderIds.push_back( TListOfInt() );
+          else
+            anOrderIds.back().push_back(smIDs[ i ]);
+
+        myNewMeshImpl->GetImpl().SetMeshOrder( anOrderIds );
+      }
+    } // loop on meshes
+
+    // update hyps needing full mesh data restored (issue 20918)
+    for ( hyp_data = hypDataList.begin(); hyp_data != hypDataList.end(); ++hyp_data )
+    {
+      SMESH_Hypothesis_i* hyp  = hyp_data->first;
+      hyp->UpdateAsMeshesRestored();
+    }
+
+    // notify algos on completed restoration to set sub-mesh event listeners
+    for ( meshi_group = meshGroupList.begin(); meshi_group != meshGroupList.end(); ++meshi_group )
+    {
+      SMESH_Mesh_i* myNewMeshImpl = meshi_group->first;
+      ::SMESH_Mesh& myLocMesh     = myNewMeshImpl->GetImpl();
+
+      TopoDS_Shape myLocShape;
+      if(myLocMesh.HasShapeToMesh())
+        myLocShape = myLocMesh.GetShapeToMesh();
+      else
+        myLocShape = SMESH_Mesh::PseudoShape();
+
+      myLocMesh.GetSubMesh(myLocShape)->
+        ComputeStateEngine (SMESH_subMesh::SUBMESH_RESTORED);
+    }
+
+    // close mesh group
+    if(aTopGroup)
+      aTopGroup->CloseOnDisk();
+  }
+  // close HDF file
+  aFile->CloseOnDisk();
+  delete aFile;
+
+  // Remove temporary files created from the stream
+  if ( !isMultiFile )
+  {
+    SMESH_File meshFile( meshfile.ToCString() );
+    if ( !meshFile ) // no meshfile exists
+    {
+      SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.ToCString(), aFileSeq.in(), true );
+    }
+    else
+    {
+      Engines::Container_var container = GetContainerRef();
+      if ( Engines_Container_i* container_i = SMESH::DownCast<Engines_Container_i*>( container ))
+      {
+        container_i->registerTemporaryFile( filename.ToCString() );
+        container_i->registerTemporaryFile( meshfile.ToCString() );
+        container_i->registerTemporaryFile( tmpDir.ToCString() );
+      }
+    }
+  }
+  pd << ""; // prevent optimizing pd out
+
+  // creation of tree nodes for all data objects in the study
+  // to support tree representation customization and drag-n-drop:
+  SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = theComponent->GetStudy()->GetUseCaseBuilder();
+  if ( !useCaseBuilder->IsUseCaseNode( theComponent ) ) {
+    useCaseBuilder->SetRootCurrent();
+    useCaseBuilder->Append( theComponent ); // component object is added as the top level item
+    SALOMEDS::ChildIterator_wrap it = theComponent->GetStudy()->NewChildIterator( theComponent ); 
+    for (it->InitEx(true); it->More(); it->Next()) {
+      useCaseBuilder->AppendTo( it->Value()->GetFather(), it->Value() );
     }
-  fic.close();
+  }
 
-  return myTopo;
+  INFOS( "SMESH_Gen_i::Load completed" );
+  return true;
 }
-      
+
 //=============================================================================
-/*! 
- * C factory, accessible with dlsym, after dlopen  
+/*!
+ *  SMESH_Gen_i::LoadASCII
+ *
+ *  Load SMESH module's data in ASCII format
  */
 //=============================================================================
 
-extern "C"
+bool SMESH_Gen_i::LoadASCII( SALOMEDS::SComponent_ptr theComponent,
+                             const SALOMEDS::TMPFile& theStream,
+                             const char*              theURL,
+                             bool                     isMultiFile ) {
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::LoadASCII" );
+  return Load( theComponent, theStream, theURL, isMultiFile );
+
+  //before call main ::Load method it's need for decipher text format to
+  //binary ( "|xx" => x' )
+  int size = theStream.length();
+  if ( int((size / 3 )*3) != size ) //error size of buffer
+    return false;
+
+  int real_size = int(size / 3);
+
+  _CORBA_Octet* buffer = new _CORBA_Octet[real_size];
+  char tmp[3];
+  tmp[2]='\0';
+  int c = -1;
+  for ( int i = 0; i < real_size; i++ )
+  {
+    memcpy( &(tmp[0]), &(theStream[i*3+1]), 2 );
+    sscanf( tmp, "%x", &c );
+    sprintf( (char*)&(buffer[i]), "%c", (char)c );
+  }
+
+  SALOMEDS::TMPFile_var aRealStreamFile = new SALOMEDS::TMPFile(real_size, real_size, buffer, 1);
+
+  return Load( theComponent, *(aRealStreamFile._retn()), theURL, isMultiFile );
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::Close
+ *
+ *  Clears study-connected data when it is closed
+ */
+//=============================================================================
+
+void SMESH_Gen_i::Close( SALOMEDS::SComponent_ptr theComponent )
+{
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Close" );
+
+  // set correct current study
+  SALOMEDS::Study_var study = theComponent->GetStudy();
+  if ( study->StudyId() != GetCurrentStudyID())
+    setCurrentStudy( study, /*IsBeingClosed=*/true );
+
+  // Clear study contexts data
+  int studyId = GetCurrentStudyID();
+  if ( myStudyContextMap.find( studyId ) != myStudyContextMap.end() ) {
+    delete myStudyContextMap[ studyId ];
+    myStudyContextMap.erase( studyId );
+  }
+
+  // remove the tmp files meshes are loaded from
+  SMESH_PreMeshInfo::RemoveStudyFiles_TMP_METHOD( theComponent );
+
+  myCurrentStudy = SALOMEDS::Study::_nil();
+  return;
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::ComponentDataType
+ *
+ *  Get component data type
+ */
+//=============================================================================
+
+char* SMESH_Gen_i::ComponentDataType()
 {
-  PortableServer::ObjectId * SMESHEngine_factory(
-                               CORBA::ORB_ptr orb,
-                               PortableServer::POA_ptr poa, 
-                               PortableServer::ObjectId * contId,
-                               const char *instanceName, 
-                               const char *interfaceName)
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::ComponentDataType" );
+  return CORBA::string_dup( "SMESH" );
+}
+
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::IORToLocalPersistentID
+ *
+ *  Transform data from transient form to persistent
+ */
+//=============================================================================
+
+char* SMESH_Gen_i::IORToLocalPersistentID( SALOMEDS::SObject_ptr /*theSObject*/,
+                                           const char*           IORString,
+                                           CORBA::Boolean        /*isMultiFile*/,
+                                           CORBA::Boolean        /*isASCII*/ )
+{
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::IORToLocalPersistentID" );
+  StudyContext* myStudyContext = GetCurrentStudyContext();
+
+  if ( myStudyContext && strcmp( IORString, "" ) != 0 ) {
+    int anId = myStudyContext->findId( IORString );
+    if ( anId ) {
+      if(MYDEBUG) MESSAGE( "VSR " << anId )
+      char strId[ 20 ];
+      sprintf( strId, "%d", anId );
+      return  CORBA::string_dup( strId );
+    }
+  }
+  return CORBA::string_dup( "" );
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::LocalPersistentIDToIOR
+ *
+ *  Transform data from persistent form to transient
+ */
+//=============================================================================
+
+char* SMESH_Gen_i::LocalPersistentIDToIOR( SALOMEDS::SObject_ptr /*theSObject*/,
+                                           const char*           aLocalPersistentID,
+                                           CORBA::Boolean        /*isMultiFile*/,
+                                           CORBA::Boolean        /*isASCII*/ )
+{
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::LocalPersistentIDToIOR(): id = " << aLocalPersistentID );
+  StudyContext* myStudyContext = GetCurrentStudyContext();
+
+  if ( myStudyContext && strcmp( aLocalPersistentID, "" ) != 0 ) {
+    int anId = atoi( aLocalPersistentID );
+    return CORBA::string_dup( myStudyContext->getIORbyOldId( anId ).c_str() );
+  }
+  return CORBA::string_dup( "" );
+}
+
+//=======================================================================
+//function : RegisterObject
+//purpose  :
+//=======================================================================
+
+int SMESH_Gen_i::RegisterObject(CORBA::Object_ptr theObject)
+{
+  StudyContext* myStudyContext = GetCurrentStudyContext();
+  if ( myStudyContext && !CORBA::is_nil( theObject )) {
+    CORBA::String_var iorString = GetORB()->object_to_string( theObject );
+    return myStudyContext->addObject( string( iorString.in() ) );
+  }
+  return 0;
+}
+
+//================================================================================
+/*!
+ * \brief Return id of registered object
+  * \param theObject - the Object
+  * \retval int - Object id
+ */
+//================================================================================
+
+CORBA::Long SMESH_Gen_i::GetObjectId(CORBA::Object_ptr theObject)
+{
+  StudyContext* myStudyContext = GetCurrentStudyContext();
+  if ( myStudyContext && !CORBA::is_nil( theObject )) {
+    string iorString = GetORB()->object_to_string( theObject );
+    return myStudyContext->findId( iorString );
+  }
+  return 0;
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::SetName
+ *
+ *  Set a new object name
+ */
+//=============================================================================
+void SMESH_Gen_i::SetName(const char* theIOR,
+                          const char* theName)
+{
+  if ( theIOR && strcmp( theIOR, "" ) ) {
+    CORBA::Object_var anObject = GetORB()->string_to_object( theIOR );
+    SALOMEDS::SObject_wrap aSO = ObjectToSObject( myCurrentStudy, anObject );
+    if ( !aSO->_is_nil() ) {
+      SetName( aSO, theName );
+    }
+  }
+}
+
+int SMESH_Gen_i::GetCurrentStudyID()
+{
+  return myCurrentStudy->_is_nil() || myCurrentStudy->_non_existent() ? -1 : myCurrentStudy->StudyId();
+}
+
+// Version information
+char* SMESH_Gen_i::getVersion()
+{
+#if SMESH_DEVELOPMENT
+  return CORBA::string_dup(SMESH_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(SMESH_VERSION_STR);
+#endif
+}
+
+//=================================================================================
+// function : Move()
+// purpose  : Moves objects to the specified position. 
+//            Is used in the drag-n-drop functionality.
+//=================================================================================
+void SMESH_Gen_i::Move( const SMESH::sobject_list& what,
+                        SALOMEDS::SObject_ptr where,
+                        CORBA::Long row )
+{
+  if ( CORBA::is_nil( where ) ) return;
+
+  SALOMEDS::Study_var study = where->GetStudy();
+  SALOMEDS::StudyBuilder_var studyBuilder = study->NewBuilder();
+  SALOMEDS::UseCaseBuilder_var useCaseBuilder = study->GetUseCaseBuilder();
+  SALOMEDS::SComponent_var father = where->GetFatherComponent();
+  std::string dataType = father->ComponentDataType();
+  if ( dataType != "SMESH" ) return; // not a SMESH component
+  
+  SALOMEDS::SObject_var objAfter;
+  if ( row >= 0 && useCaseBuilder->HasChildren( where ) ) {
+    // insert at given row -> find insertion position
+    SALOMEDS::UseCaseIterator_var useCaseIt = useCaseBuilder->GetUseCaseIterator( where );
+    int i;
+    for ( i = 0; i < row && useCaseIt->More(); i++, useCaseIt->Next() );
+    if ( i == row && useCaseIt->More() ) {
+      objAfter = useCaseIt->Value();
+    }
+  }
+  
+  for ( int i = 0; i < what.length(); i++ ) {
+    SALOMEDS::SObject_var sobj = what[i];
+    if ( CORBA::is_nil( sobj ) ) continue; // skip bad object
+    // insert the object to the use case tree
+    if ( !CORBA::is_nil( objAfter ) )
+      useCaseBuilder->InsertBefore( sobj, objAfter ); // insert at given row
+    else
+      useCaseBuilder->AppendTo( where, sobj );        // append to the end of list
+  }
+}
+
+//=============================================================================
+/*!
+ *  SMESHEngine_factory
+ *
+ *  C factory, accessible with dlsym, after dlopen
+ */
+//=============================================================================
+
+extern "C"
+{ SMESH_I_EXPORT
+  PortableServer::ObjectId* SMESHEngine_factory( CORBA::ORB_ptr            orb,
+                                                 PortableServer::POA_ptr   poa,
+                                                 PortableServer::ObjectId* contId,
+                                                 const char*               instanceName,
+                                                 const char*               interfaceName )
   {
-    MESSAGE("PortableServer::ObjectId * SMESHEngine_factory()");
-    SCRUTE(interfaceName);
-    SMESH_Gen_i * mySMESH_Gen 
-      = new SMESH_Gen_i(orb, poa, contId, instanceName, interfaceName);
-    return mySMESH_Gen->getId() ;
+    if(MYDEBUG) MESSAGE( "PortableServer::ObjectId* SMESHEngine_factory()" );
+    if(MYDEBUG) SCRUTE(interfaceName);
+    SMESH_Gen_i* aSMESHGen = new SMESH_Gen_i(orb, poa, contId, instanceName, interfaceName);
+    return aSMESHGen->getId() ;
   }
 }