Salome HOME
Color Number (Color Group) parameter is returned for compatibility
[modules/smesh.git] / src / SMESH_I / SMESH_Gen_i.cxx
index 511cddd735eb272cfc78fe786644654bf74466b2..7d57ff91627cee4cfd92c22b0a7a1f9d54ce3a66 100644 (file)
@@ -17,7 +17,7 @@
 //  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 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -26,7 +26,6 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
@@ -41,24 +40,66 @@ 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 <OSD.hxx>
+
+#include "Utils_CorbaException.hxx"
 
+#include "utilities.h"
 #include <fstream>
 #include <stdio.h>
 
+#ifdef WNT
+ #include <windows.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 <HDFOI.hxx>
+
 #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 "SMESHDriver.h"
-
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include "SMESH_Hypothesis_i.hxx"
+#include "SMESH_Algo_i.hxx"
+#include "SMESH_Group_i.hxx"
+#include "SMESH_PythonDump.hxx"
+
+#include "SMESHDS_Document.hxx"
+#include "SMESHDS_Group.hxx"
+#include "SMESHDS_GroupOnGeom.hxx"
+#include "SMESH_Mesh.hxx"
+#include "SMESH_Hypothesis.hxx"
+#include "SMESH_Group.hxx"
+#include "SMESH_MeshEditor.hxx"
+
+#include "SMDS_EdgePosition.hxx"
+#include "SMDS_FacePosition.hxx"
+#include "SMDS_VertexPosition.hxx"
+#include "SMDS_SpacePosition.hxx"
+#include "SMDS_PolyhedralVolumeOfNodes.hxx"
+
+#include CORBA_SERVER_HEADER(SMESH_Group)
+#include CORBA_SERVER_HEADER(SMESH_Filter)
+
+#include "DriverMED_W_SMESHDS_Mesh.h"
+#include "DriverMED_R_SMESHDS_Mesh.h"
 
 #include "SALOMEDS_Tool.hxx"
 #include "SALOME_NamingService.hxx"
@@ -66,1922 +107,3622 @@ using namespace std;
 #include "Utils_SINGLETON.hxx"
 #include "OpUtil.hxx"
 
-//#include <TopAbs_ShapeEnum.hxx>
+#include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
 
 #include "GEOM_Client.hxx"
+#include "Utils_ExceptHandlers.hxx"
 
 #include <map>
 
-#define NUM_TMP_FILES 4
+using namespace std;
+using SMESH::TPythonDump;
 
-// Tags definition 
-long Tag_HypothesisRoot = 1;
-long Tag_AlgorithmsRoot = 2;
+#define NUM_TMP_FILES 2
 
-long Tag_RefOnShape = 1;
-long Tag_RefOnAppliedHypothesis = 2;
-long Tag_RefOnAppliedAlgorithms = 3;
+#ifdef _DEBUG_
+static int MYDEBUG = 0;
+#else
+static int MYDEBUG = 0;
+#endif
 
-long Tag_SubMeshOnVertex = 4;
-long Tag_SubMeshOnEdge = 5;
-long Tag_SubMeshOnFace = 6;
-long Tag_SubMeshOnSolid = 7;
-long Tag_SubMeshOnCompound = 8;
+// 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;
 
 //=============================================================================
 /*!
- *  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_var anAttr;
+  CORBA::Object_var anObj;
+  if ( !theSObject->_is_nil() ) {
+    try {
+      if( theSObject->FindAttribute( anAttr, "AttributeIOR" ) ) {
+       SALOMEDS::AttributeIOR_var anIOR  = SALOMEDS::AttributeIOR::_narrow( 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
  */
-//=============================================================================
-
-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);
-       }
+//=============================================================================     
+SALOME_LifeCycleCORBA*  SMESH_Gen_i::GetLCC() {
+  if ( myLCC == NULL ) {
+    myLCC = new SALOME_LifeCycleCORBA( GetNS() );
+  }
+  return myLCC;
+}
 
-       // 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
+ */
+//=============================================================================     
+GEOM::GEOM_Gen_ptr 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::Component_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
  */
 //=============================================================================
 
-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)
+SMESH_Gen_i::SMESH_Gen_i()
 {
-       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];
+  INFOS( "SMESH_Gen_i::SMESH_Gen_i : default constructor" );
+}
 
-               // create a new mesh object servant, store it in a map in study context
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::SMESH_Gen_i 
+ *
+ *  Standard constructor, used with Container
+ */
+//=============================================================================
 
-               meshServant = new SMESH_Mesh_i(this, geom, studyId, _localId);
-               myStudyContext->mapMesh_i[_localId] = meshServant;
-               _localId++;
+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::SMESH_Gen_i : standard constructor" );
+
+  myOrb = CORBA::ORB::_duplicate(orb);
+  myPoa = PortableServer::POA::_duplicate(poa);
+  
+  _thisObj = this ;
+  _id = myPoa->activate_object( _thisObj );
+  
+  myIsEmbeddedMode = false;
+  myShapeReader = NULL;  // shape reader
+  mySMESHGen = this;
+
+  // set it in standalone mode only
+  //OSD::SetSignal( true );
+}
 
-               // create a new mesh object
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::~SMESH_Gen_i
+ *
+ *  Destructor
+ */
+//=============================================================================
 
-               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);
-       }
+SMESH_Gen_i::~SMESH_Gen_i()
+{
+  INFOS( "SMESH_Gen_i::~SMESH_Gen_i" );
+
+  // delete hypothesis creators
+  map<string, GenericHypothesisCreator_i*>::iterator itHyp;
+  for (itHyp = myHypCreatorMap.begin(); itHyp != myHypCreatorMap.end(); itHyp++)
+  {
+    delete (*itHyp).second;
+  }
+  myHypCreatorMap.clear();
+
+  // 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
+ */
+//=============================================================================
+SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName,
+                                                          const char* theLibName)
+     throw (SALOME::SALOME_Exception)
+{
+  /* 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
+      }
+  }
+  
+
+
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "Create Hypothesis <" << theHypName << "> from " << aPlatformLibName/*theLibName*/);
+
+  // create a new hypothesis object servant
+  SMESH_Hypothesis_i* myHypothesis_i = 0;
+  SMESH::SMESH_Hypothesis_var hypothesis_i;
+
+  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
+      }
+
+      // 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);
+      }
+
+      // 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")));
+      }
+
+      // map hypothesis creator to a hypothesis name
+      myHypCreatorMap[string(theHypName)] = aCreator;
+    }
+
+    // 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);
+  }
+
+  if ( aPlatformLibName )
+    delete[] aPlatformLibName;
+
+  if (!myHypothesis_i)
+    return hypothesis_i._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 );  
+
+  return hypothesis_i._retn();
+}
+  
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::createMesh
+ *
+ *  Create empty mesh on shape
+ */
+//=============================================================================
+SMESH::SMESH_Mesh_ptr SMESH_Gen_i::createMesh()
+     throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::createMesh" );
+
+  // Get or create the GEOM_Client instance
+  try {
+    // 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
+    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);
+    return mesh._retn();
+  }
+  catch (SALOME_Exception& S_ex) {
+    THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM );
+  }
+  return SMESH::SMESH_Mesh::_nil();
+}
 
-       // activate the CORBA servant of Mesh
+//=============================================================================
+/*!
+ *  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;
+}
 
-       SMESH::SMESH_Mesh_var mesh
-               = SMESH::SMESH_Mesh::_narrow(meshServant->_this());
+//=============================================================================
+/*!
+ *  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;
+}
 
-       meshServant->SetIor(mesh);
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::SetEmbeddedMode
+ *
+ *  Set current mode
+ */
+//=============================================================================
 
-       return SMESH::SMESH_Mesh::_duplicate(mesh);
+void SMESH_Gen_i::SetEmbeddedMode( CORBA::Boolean theMode )
+{
+  myIsEmbeddedMode = theMode;
+
+  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 );
+    }
+    // else OSD::SetSignal() is called in GUI
+  }
 }
 
 //=============================================================================
 /*!
- *  
+ *  SMESH_Gen_i::IsEmbeddedMode
+ *
+ *  Get current mode
  */
 //=============================================================================
 
-CORBA::Boolean SMESH_Gen_i::IsReadyToCompute(SMESH::SMESH_Mesh_ptr aMesh,
-       GEOM::GEOM_Shape_ptr aShape) throw(SALOME::SALOME_Exception)
+CORBA::Boolean SMESH_Gen_i::IsEmbeddedMode()
 {
-       MESSAGE("SMESH_Gen_i::IsReadyToCompute");
-       return true;
+  return myIsEmbeddedMode;
 }
 
 //=============================================================================
 /*!
- *  
+ *  SMESH_Gen_i::SetCurrentStudy
+ *
+ *  Set current study
  */
 //=============================================================================
 
-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)
+void SMESH_Gen_i::SetCurrentStudy( SALOMEDS::Study_ptr theStudy )
 {
-       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);
+  //if(MYDEBUG)
+  //MESSAGE( "SMESH_Gen_i::SetCurrentStudy" );
+  myCurrentStudy = SALOMEDS::Study::_duplicate( theStudy );
+  // create study context, if it doesn't exist and set current study
+  int studyId = GetCurrentStudyID();
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::SetCurrentStudy: study Id = " << studyId );
+  if ( myStudyContextMap.find( studyId ) == myStudyContextMap.end() ) {
+    myStudyContextMap[ studyId ] = new StudyContext;      
+  }
+
+  // myCurrentStudy may be nil
+  if ( !CORBA::is_nil( myCurrentStudy ) ) {
+    SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder(); 
+    if( !myCurrentStudy->FindComponent( "GEOM" )->_is_nil() )
+      aStudyBuilder->LoadWith( myCurrentStudy->FindComponent( "GEOM" ), GetGeomEngine() );
+
+  // set current study for geom engine
+  //if ( !CORBA::is_nil( GetGeomEngine() ) )
+  //  GetGeomEngine()->GetCurrentStudy( myCurrentStudy->StudyId() );
+  }
+}
 
-       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);
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::GetCurrentStudy
+ *
+ *  Get current study
+ */
+//=============================================================================
 
-       try
-       {
-               if (!_ShapeReader)
-                       _ShapeReader = new GEOM_Client();
-               ASSERT(_ShapeReader);
-               TopoDS_Shape myMainShape = _ShapeReader->GetShape(geom, myShape);
-               TopTools_IndexedMapOfShape myIndexToShape;
-               TopExp::MapShapes(myMainShape, myIndexToShape);
-
-               for (unsigned 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)
-       {
-               THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM);
-       }
+SALOMEDS::Study_ptr SMESH_Gen_i::GetCurrentStudy()
+{
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetCurrentStudy: study Id = " << GetCurrentStudyID() );
+  return SALOMEDS::Study::_duplicate( myCurrentStudy );
+}
 
-       return shapesId._retn();
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::GetCurrentStudyContext 
+ *
+ *  Get current study context
+ */
+//=============================================================================
+StudyContext* SMESH_Gen_i::GetCurrentStudyContext()
+{
+  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
  */
 //=============================================================================
 
-CORBA::Boolean SMESH_Gen_i::Compute(SMESH::SMESH_Mesh_ptr aMesh,
-       GEOM::GEOM_Shape_ptr aShape) throw(SALOME::SALOME_Exception)
+SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::CreateHypothesis( const char* theHypName,
+                                                           const char* theLibName )
+     throw ( SALOME::SALOME_Exception )
 {
-       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);
+  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_var aSO = PublishHypothesis( myCurrentStudy, hyp );
+    if ( !aSO->_is_nil() ) {
+      // Update Python script
+      TPythonDump() << aSO << " = " << this << ".CreateHypothesis('"
+                    << theHypName << "', '" << theLibName << "')";
+    }
+  }
+
+  return hyp._retn();
+}
 
-       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);
+//================================================================================
+/*!
+ * \brief Return hypothesis of given type holding parameter values of the existing mesh
+  * \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)
+    throw ( SALOME::SALOME_Exception )
+{
+  Unexpect aCatch(SALOME_SalomeException);
+  if ( CORBA::is_nil( theMesh ) )
+    THROW_SALOME_CORBA_EXCEPTION( "bad Mesh reference", SALOME::BAD_PARAM );
+  if ( CORBA::is_nil( theGeom ) )
+    THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM );
+
+  // -----------------------------------------------
+  // 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 ( !meshServant || shape.IsNull() )
+    return SMESH::SMESH_Hypothesis::_nil();
+  ::SMESH_Mesh& mesh = meshServant->GetImpl();
+
+  if ( mesh.NbNodes() == 0 ) // empty mesh
+    return SMESH::SMESH_Hypothesis::_nil();
+
+  // 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();
+
+  // look for a hypothesis of theHypType used to mesh the shape
+  if ( myGen.GetShapeDim( shape ) == hyp->GetDim() )
+  {
+    // check local shape
+    SMESH::ListOfHypothesis_var aHypList = theMesh->GetHypothesisList( theGeom );
+    int nbLocalHyps = aHypList->length();
+    for ( int i = 0; i < nbLocalHyps; i++ )
+      if ( strcmp( theHypType, aHypList[i]->GetName() ) == 0 ) // FOUND local!
+        return SMESH::SMESH_Hypothesis::_duplicate( aHypList[i] );
+    // 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 some how parameter values
+  if ( hyp->SetParametersByMesh( &mesh, shape ))
+    return SMESH::SMESH_Hypothesis::_duplicate( tmpHyp );
+    
+  return SMESH::SMESH_Hypothesis::_nil();
+}
 
-       bool ret = false;
-       try
-       {
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::CreateMesh
+ *
+ *  Create empty mesh on a shape and publish it in the study
+ */
+//=============================================================================
 
-               // get study context from studyId given by CORBA mesh object
+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_var aSO = PublishMesh( myCurrentStudy, mesh.in() );
+    aStudyBuilder->CommitCommand();
+    if ( !aSO->_is_nil() ) {
+      // Update Python script
+      TPythonDump() << aSO << " = " << this << ".CreateMesh(" << theShapeObject << ")";
+    }
+  }
+
+  return mesh._retn();
+}
 
-               int studyId = myMesh->GetStudyId();
-               ASSERT(_mapStudyContext_i.find(studyId) != _mapStudyContext_i.end());
-               StudyContext_iStruct *myStudyContext = _mapStudyContext_i[studyId];
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::CreateEmptyMesh
+ *
+ *  Create empty mesh
+ */
+//=============================================================================
 
-               // get local Mesh_i object with Id and study context 
+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_var aSO = PublishMesh( myCurrentStudy, mesh.in() );
+    aStudyBuilder->CommitCommand();
+    if ( !aSO->_is_nil() ) {
+      // Update Python script
+      TPythonDump() << aSO << " = " << this << ".CreateEmptyMesh()";
+    }
+  }
+
+  return mesh._retn();
+}
 
-               int meshId = myMesh->GetId();
-               ASSERT(myStudyContext->mapMesh_i.find(meshId) !=
-                       myStudyContext->mapMesh_i.end());
-               SMESH_Mesh_i *meshServant = myStudyContext->mapMesh_i[meshId];
-               ASSERT(meshServant);
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::CreateMeshFromUNV
+ *
+ *  Create mesh and import data from UNV file
+ */
+//=============================================================================
 
-               // get local TopoDS_Shape
+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_var aSO = PublishMesh( myCurrentStudy, aMesh.in(), aFileName.c_str() );
+    aStudyBuilder->CommitCommand();
+    if ( !aSO->_is_nil() ) {
+      // Update Python script
+      TPythonDump() << aSO << " = smeshgen.CreateMeshesFromUNV('" << theFileName << "')";
+    }
+  }
+
+  SMESH_Mesh_i* aServant = dynamic_cast<SMESH_Mesh_i*>( GetServant( aMesh ).in() );
+  ASSERT( aServant );
+  aServant->ImportUNVFile( theFileName );
+
+  // Dump creation of groups
+  aServant->GetGroups();
+
+  return aMesh._retn();
+}
 
-               GEOM::GEOM_Gen_var geom = meshServant->GetGeomEngine();
-               TopoDS_Shape myLocShape = _ShapeReader->GetShape(geom, myShape);
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::CreateMeshFromMED
+ *
+ *  Create mesh and import data from MED file
+ */
+//=============================================================================
 
-               // implementation compute
+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" );
+
+  // 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 << "([";
+  //TCollection_AsciiString aStr ("([");
+
+  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) aStr += ", ";
+      if (i > 0) aPythonDump << ", ";
+
+      // create mesh
+      SMESH::SMESH_Mesh_var mesh = createMesh();
+      
+      // publish mesh in the study
+      SALOMEDS::SObject_var aSO;
+      if ( CanPublishInStudy( mesh ) )
+        aSO = PublishMesh( myCurrentStudy, mesh.in(), (*it).c_str() );
+      if ( !aSO->_is_nil() ) {
+        // Python Dump
+        aPythonDump << aSO;
+        //aStr += aSO->GetID();
+      } else {
+        // Python Dump
+        aPythonDump << "mesh_" << i;
+//         aStr += "mesh_";
+//         aStr += TCollection_AsciiString(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 );
+    }
+    aStudyBuilder->CommitCommand();
+  }
+
+  // Update Python script
+  aPythonDump << "], status) = " << this << ".CreateMeshesFromMED('" << theFileName << "')";
+  }
+  // Dump creation of groups
+  for ( int i = 0; i < aResult->length(); ++i )
+    aResult[ i ]->GetGroups();
+
+  return aResult._retn();
+}
 
-               ::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);
-       }
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::CreateMeshFromSTL
+ *
+ *  Create mesh and import data from STL file
+ */
+//=============================================================================
 
-       return ret;
+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;
+  // publish mesh in the study
+  if ( CanPublishInStudy( aMesh ) ) {
+    SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+    aStudyBuilder->NewCommand();  // There is a transaction
+    SALOMEDS::SObject_var aSO = PublishInStudy
+      ( myCurrentStudy, SALOMEDS::SObject::_nil(), aMesh.in(), aFileName.c_str() );
+    aStudyBuilder->CommitCommand();
+    if ( !aSO->_is_nil() ) {
+      // Update Python script
+      TPythonDump() << aSO << " = " << this << ".CreateMeshesFromSTL('" << theFileName << "')";
+    }
+  }
+
+  SMESH_Mesh_i* aServant = dynamic_cast<SMESH_Mesh_i*>( GetServant( aMesh ).in() );
+  ASSERT( aServant );
+  aServant->ImportSTLFile( theFileName );
+  return aMesh._retn();
 }
 
 //=============================================================================
 /*!
- *  
+ *  SMESH_Gen_i::IsReadyToCompute
+ *
+ *  Returns true if mesh contains enough data to be computed
  */
 //=============================================================================
 
-SALOMEDS::TMPFile * SMESH_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
-       const char *theURL, bool isMultiFile)
+CORBA::Boolean SMESH_Gen_i::IsReadyToCompute( SMESH::SMESH_Mesh_ptr theMesh,
+                                              GEOM::GEOM_Object_ptr theShapeObject )
+  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();
-
-       // Create a sequence of files processed
-       SALOMEDS::ListOfFileNames_var aFileSeq = new SALOMEDS::ListOfFileNames;
-       aFileSeq->length(NUM_TMP_FILES);
-
-       TCollection_AsciiString aStudyName("");
-
-       if (isMultiFile)
-               aStudyName =
-                       (SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL()));
-
-       // 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;
-
-       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);
-       SCRUTE(Tag_HypothesisRoot);
-       SCRUTE(Tag_AlgorithmsRoot);
-       for (; itBig->More(); itBig->Next())
-       {
-               SALOMEDS::SObject_var gotBranch = itBig->Value();
-               SCRUTE(gotBranch->Name());
-               SCRUTE(gotBranch->Tag());
-               SCRUTE(gotBranch->GetID());
-
-//************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()));
-                                       SCRUTE(myHyp->GetName());
-                                       fprintf(destFile, "%li\n", myHyp->GetId());
-                                       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);
-                                       }
-                               }
-                       }
-                       fclose(destFile);
+  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;
+}
 
-//writes the file name in the hdf file
-                       longueur = hypofile.Length() + 1;
-                       name_group = "Hypothesis";
-                       //SCRUTE(name_group);
+//================================================================================
+/*!
+ * \brief  Find SObject for an algo
+ */
+//================================================================================
 
-                       size[0] = longueur;
-                       hdf_group[1] = new HDFgroup(name_group, hdf_file);
-                       hdf_group[1]->CreateOnDisk();
+SALOMEDS::SObject_ptr SMESH_Gen_i::GetAlgoSO(const ::SMESH_Algo* algo)
+{
+  if ( algo ) {
+    if ( !myCurrentStudy->_is_nil() ) {
+      // find algo in the study
+      SALOMEDS::SComponent_var father = SALOMEDS::SComponent::_narrow
+        ( myCurrentStudy->FindComponent( ComponentDataType() ) );
+      if ( !father->_is_nil() ) {
+        SALOMEDS::ChildIterator_var itBig = myCurrentStudy->NewChildIterator( father );
+        for ( ; itBig->More(); itBig->Next() ) {
+          SALOMEDS::SObject_var gotBranch = itBig->Value();
+          if ( gotBranch->Tag() == GetAlgorithmsRootTag() ) {
+            SALOMEDS::ChildIterator_var algoIt = myCurrentStudy->NewChildIterator( gotBranch );
+            for ( ; algoIt->More(); algoIt->Next() ) {
+              SALOMEDS::SObject_var 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();
+}
 
-                       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++;
+//================================================================================
+/*!
+ * \brief Return errors of mesh computation
+ */
+//================================================================================
 
-                       hdf_group[1]->CloseOnDisk();
-                       MESSAGE("End of Hypothesis Save");
+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_var algoSO = GetAlgoSO( error->myAlgo );
+          if ( !algoSO->_is_nil() )
+            errStruct.algoName   = algoSO->GetName();
+          else
+            errStruct.algoName   = error->myAlgo->GetName();
+        }
+      }
+      error_array->length( nbErr );
+    }
+  }
+  catch ( SALOME_Exception& S_ex ) {
+    INFOS( "catch exception "<< S_ex.what() );
+  }
+
+  return error_array._retn();
+}
 
-               }
-//************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()));
-                                       SCRUTE(anIOR->Value());
-                                       SCRUTE(myAlgo->_is_nil());
-                                       fprintf(destFile, "%i\n", myAlgo->GetId());
-                                       fprintf(destFile, "%s\n", myAlgo->GetName());
-                               }
-                       }
+//================================================================================
+/*!
+ * \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
+ */
+//================================================================================
 
-                       fclose(destFile);
+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_var algoSO = GetAlgoSO( error->_algo );
+        if ( !algoSO->_is_nil() )
+          errStruct.algoName   = algoSO->GetName();
+      }
+    }
+  }
+  catch ( SALOME_Exception& S_ex ) {
+    INFOS( "catch exception "<< S_ex.what() );
+  }
+  return error_array._retn();
+}
 
-//writes the file name in the hdf file
-                       longueur = algofile.Length() + 1;
-                       name_group = "Algorithms";
-                       //SCRUTE(name_group);
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::GetSubShapesId
+ *
+ *  Get sub-shapes unique ID's list
+ */
+//=============================================================================
 
-                       size[0] = longueur;
-                       hdf_group[2] = new HDFgroup(name_group, hdf_file);
-                       hdf_group[2]->CreateOnDisk();
+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" );
 
-                       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++;
+  SMESH::long_array_var shapesId = new SMESH::long_array;
+  set<int> setId;
 
-                       hdf_group[2]->CloseOnDisk();
-                       MESSAGE("End of Algos Save");
+  if ( CORBA::is_nil( theMainShapeObject ) )
+    THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference",
+                                  SALOME::BAD_PARAM );
 
-               }
-//************branch 3 : meshes
-               else if (gotBranch->Tag() >= 3)
-               {                                               //meshes = tag > 3
+  try
+    {
+      TopoDS_Shape myMainShape = GeomObjectToShape(theMainShapeObject);
+      TopTools_IndexedMapOfShape myIndexToShape;      
+      TopExp::MapShapes(myMainShape,myIndexToShape);
 
-                       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   
-                                       Mesh_Writer *myWriter = SMESHDriver::GetMeshWriter("MED");
-                                       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 %ld",
-                                                               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");
+      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);
+    }
 
-       MESSAGE("hdf_file->CloseOnDisk()");
-       hdf_file->CloseOnDisk();
-
-       MESSAGE("delete hdf_file");
-       delete hdf_file;
-       hdf_file = 0;
-
-       // Convert temporary files to stream
-       MESSAGE("Convert temporary files to stream");
-       aStreamFile =
-               SALOMEDS_Tool::PutFilesToStream(tmpDir.ToCString(), aFileSeq.in(),
-               isMultiFile);
-
-       // Remove temporary files and directory
-       MESSAGE("Remove temporary files and directory");
-       if (!isMultiFile)
-               SALOMEDS_Tool::RemoveTemporaryFiles(tmpDir.ToCString(), aFileSeq.in(),
-                       true);
-
-       MESSAGE("End SMESH_Gen_i::Save");
-
-       return aStreamFile._retn();
+  return shapesId._retn();
 }
 
-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();
-}
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::Compute
+ *
+ *  Compute mesh on a shape
+ */
+//=============================================================================
 
-void SMESH_Gen_i::loadHypothesis(char * name, HDFfile * hdf_file,
-       char * hypofile, int studyId)
+CORBA::Boolean SMESH_Gen_i::Compute( SMESH::SMESH_Mesh_ptr theMesh,
+                                     GEOM::GEOM_Object_ptr theShapeObject )
+     throw ( SALOME::SALOME_Exception )
 {
-       char name_of_group[HDF_NAME_MAX_LEN + 1];
-       char objectId[10];
-       double length, maxElementsArea, maxElementsVolume;
-       int numberOfSegments;
-
-       HDFgroup * hdfGroup = new HDFgroup(name, hdf_file);
-       hdfGroup->OpenOnDisk();
-
-       hdfGroup->InternalObjectIndentify(0, name_of_group);
-       HDFdataset * dataset = new HDFdataset(name_of_group, hdfGroup);
-       dataset->OpenOnDisk();
-       char *name_of_file = new char[dataset->GetSize()];
-       dataset->ReadFromDisk(name_of_file);
-       SCRUTE(name_of_file);
-       dataset->CloseOnDisk();
-       hdfGroup->CloseOnDisk();
-       delete[]name_of_file;
-       
-       ifstream loadedFile(hypofile);
-       while (!loadedFile.eof())
-       {
-               int hypothesisID;
-               string hypothesisName;
-               loadedFile >> hypothesisID;
-               loadedFile >> hypothesisName;
-               if(hypothesisName.length()==0) break;
-               SMESH_Hypothesis_i * corbaHyp =
-                       _hypothesisFactory_i.Create(hypothesisName.c_str(), studyId, &_impl);
-               SMESH_Hypothesis * localHyp = corbaHyp->getImpl();
-               localHyp->SetID(hypothesisID);
-               localHyp->LoadFrom(loadedFile);
-               
-               SMESH::SMESH_Hypothesis_var varHyp = corbaHyp->_this();
-               string iorString = _orb->object_to_string(varHyp);
-               sprintf(objectId, "%ld", varHyp->GetId());
-               _SMESHCorbaObj[string("Hypo_") + string(objectId)] =
-                       iorString;
-       }
-       MESSAGE("End of Hypos Load");
+  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() );
+    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();
+      return myGen.Compute( myLocMesh, myLocShape);
+    }
+  }
+  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;
 }
 
-void SMESH_Gen_i::loadAlgorithms(char * name, HDFfile * hdf_file,
-       char* algofile, int studyId)
+//================================================================================
+/*!
+ * \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
+ */
+//================================================================================
+
+GEOM::GEOM_Object_ptr
+SMESH_Gen_i::GetGeometryByMeshElement( SMESH::SMESH_Mesh_ptr  theMesh,
+                                       CORBA::Long            theElementID,
+                                       const char*            theGeomName)
+  throw ( SALOME::SALOME_Exception )
 {
-       char name_of_group[HDF_NAME_MAX_LEN + 1];
-       char objectId[10];
-       HDFgroup * hdfGroup = new HDFgroup(name, hdf_file);
-       hdfGroup->OpenOnDisk();
-
-       hdfGroup->InternalObjectIndentify(0, name_of_group);
-       HDFdataset * dataset =
-               new HDFdataset(name_of_group, hdfGroup);
-       dataset->OpenOnDisk();
-
-       char *name_of_file = new char[dataset->GetSize()];
-       dataset->ReadFromDisk(name_of_file);
-       dataset->CloseOnDisk();
-       hdfGroup->CloseOnDisk();        
-       delete[]name_of_file;
-
-       char * aLine = new char[100];
-       FILE * loadedFile = fopen(algofile, "r");
-       while (!feof(loadedFile))
-       {
-               int hypothesisID;
-               fscanf(loadedFile, "%i", &hypothesisID);
-               fscanf(loadedFile, "%s\n", aLine);
-               //SCRUTE(aLine);
-               if (strcmp(aLine, "") != 0)
-               {
-                       SMESH_Hypothesis_i * corbaHyp =
-                               _hypothesisFactory_i.Create(aLine, studyId, &_impl);
-                       SMESH_Hypothesis * localHyp = corbaHyp->getImpl();
-                       localHyp->SetID(hypothesisID);
-                       
-                       SMESH::SMESH_Hypothesis_var myHyp = corbaHyp->_this();
-                       
-                       SMESH::SMESH_Algo_var myAlgo =
-                               SMESH::SMESH_Algo::_narrow(myHyp);
-                       string iorString = _orb->object_to_string(myAlgo);
-                       sprintf(objectId, "%ld", myAlgo->GetId());
-                       _SMESHCorbaObj[string("Hypo_") + string(objectId)] =
-                               iorString;
-               }
-       }
-       fclose(loadedFile);
-       delete[]aLine;
-       aLine = 0;
-       MESSAGE("End of Algos Load");
+  Unexpect aCatch(SALOME_SalomeException);
+  GEOM::GEOM_Object_var 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_var 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_var mainSO = ObjectToSObject( myCurrentStudy, mainShape );
+        SALOMEDS::ChildIterator_var it;
+        if ( !mainSO->_is_nil() )
+          it = myCurrentStudy->NewChildIterator( mainSO );
+        if ( !it->_is_nil() ) {
+          for ( it->InitEx(true); SObj->_is_nil() && it->More(); it->Next() ) {
+            GEOM::GEOM_Object_var subGeom =
+              GEOM::GEOM_Object::_narrow( SObjectToObject( it->Value() ));
+            if ( !subGeom->_is_nil() ) {
+              GEOM::ListOfLong_var subList = subGeom->GetSubShapeIndices();
+              if ( subList->length() == 1 && list[0] == subList[0] ) {
+                SObj = it->Value();
+                geom = subGeom;
+              }
+            }
+          }
+        }
+      }
+    }
+    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();
+  }
+  return GEOM::GEOM_Object::_nil();
 }
 
-/**
- * @param hdfGroupMeshId The group where to read the hypothesis
- * @param _found ???
- * @param Study The study where to create the hypothesis
- * @param myNewMesh The mesh on which the hypothesis is applied
- * @param aShape The shape with which this mesh is linked
+//================================================================================
+/*!
+ * \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 geom object
  */
-void SMESH_Gen_i::loadAppliedHypothesis(HDFgroup * hdfGroupMeshId, 
-       bool _found, SALOMEDS::Study_var Study, SMESH::SMESH_Mesh_var myNewMesh, 
-       GEOM::GEOM_Shape_var aShape)
-{
-       HDFgroup * hdf_subgroup = new HDFgroup("Applied Hypothesis", hdfGroupMeshId);
-       hdf_subgroup->OpenOnDisk();
-       int nb_datasets = hdf_subgroup->nInternalObjects();
-       char name_dataset[10];
-       
-       for (int j = 0; j < nb_datasets; j++)
-       {
-               sprintf(name_dataset, "Hyp %d", j);
-               HDFdataset * hdf_dataset = new HDFdataset(name_dataset, hdf_subgroup);
-               hdf_dataset->OpenOnDisk();
-
-               char *refFromFile = new char[hdf_dataset->GetSize()];
-               hdf_dataset->ReadFromDisk(refFromFile);
-               hdf_dataset->CloseOnDisk();
-               delete hdf_dataset;
+//================================================================================
 
-               if (_found)
-               {
-                       SALOMEDS::SObject_var HypSO =
-                               Study->FindObjectID(refFromFile);
-                       if (!CORBA::is_nil(HypSO))
-                       {
-                               SALOMEDS::GenericAttribute_var anAttr;
-                               HypSO->FindAttribute(anAttr, "AttributeIOR");
-                               SALOMEDS::AttributeIOR_var 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->CloseOnDisk();
+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_var mainSO = ObjectToSObject( myCurrentStudy, mainShape );
+          SALOMEDS::ChildIterator_var it;
+          if ( !mainSO->_is_nil() )
+            it = myCurrentStudy->NewChildIterator( mainSO );
+          if ( !it->_is_nil() ) {
+            for ( it->InitEx(true); it->More(); it->Next() ) {
+              GEOM::GEOM_Object_var subGeom =
+                GEOM::GEOM_Object::_narrow( SObjectToObject( it->Value() ));
+              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_var op =
+            geomGen->GetIShapesOperations( GetCurrentStudyID() );
+          if ( !op->_is_nil() )
+            geom = op->GetSubShape( mainShape, shapeID );
+        }
+        if ( !geom->_is_nil() ) {
+          GeomObjectToShape( geom ); // let geom client remember the found shape
+         return geom._retn();
+        }
+      }
+    }
+  }
+  return GEOM::GEOM_Object::_nil();
 }
 
-/**
- * @param hdfGroupMeshId The group where to read the hypothesis
- * @param _found ???
- * @param Study The study where to create the hypothesis
- * @param myNewMesh The mesh on which the hypothesis is applied
- * @param aShape The shape with which this mesh is linked
+//================================================================================
+/*!
+ *  SMESH_Gen_i::Concatenate
+ *
+ *  Concatenate the given meshes into one mesh
  */
-void SMESH_Gen_i::loadAppliedAlgorithms(HDFgroup * hdfGroupMeshId, 
-       bool _found, SALOMEDS::Study_var Study, SMESH::SMESH_Mesh_var myNewMesh, 
-       GEOM::GEOM_Shape_var aShape)
-{
-       HDFgroup * hdf_subgroup = new HDFgroup("Applied Algorithms", hdfGroupMeshId);
-       hdf_subgroup->OpenOnDisk();
-
-       int nb_datasets = hdf_subgroup->nInternalObjects();
-       SCRUTE(nb_datasets);
-       char name_dataset[10];
-       
-       for (int j = 0; j < nb_datasets; j++)
-       {
-               sprintf(name_dataset, "Algo %d", j);
-               HDFdataset * dataset =
-                       new HDFdataset(name_dataset, hdf_subgroup);
-               dataset->OpenOnDisk();
+//================================================================================
 
-               char *refFromFile = new char[dataset->GetSize()];
-               dataset->ReadFromDisk(refFromFile);
-               dataset->CloseOnDisk();
+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 )
+{
+  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 aPythonDump; // prevent dump of called methods
+
+  // create mesh
+  SMESH::SMESH_Mesh_var aNewMesh = CreateEmptyMesh();
+  
+  if ( !aNewMesh->_is_nil() ) {
+    SMESH_Mesh_i* aNewImpl = dynamic_cast<SMESH_Mesh_i*>( GetServant( aNewMesh ).in() );
+    if ( aNewImpl ) {
+      ::SMESH_Mesh& aLocMesh = aNewImpl->GetImpl();
+      SMESHDS_Mesh* 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();
+           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;
+
+           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()) );
+               }
+               else
+                 aNewNode = aNewMeshDS->FindNode( nodesMap.find(aNode->GetID())->second );
+               aNodesArray[k] = aNewNode;
+             }//nodes loop
 
-               if (_found)
+             // creates a corresponding element on existent nodes in new mesh
+             if ( anElem->IsPoly() && anElemType == SMDSAbs_Volume )
                {
-                       SALOMEDS::SObject_var AlgoSO =
-                               Study->FindObjectID(refFromFile);
-                       if (!CORBA::is_nil(AlgoSO))
-                       {
-                               SALOMEDS::GenericAttribute_var anAttr;
-                               AlgoSO->FindAttribute(anAttr, "AttributeIOR");
-                               SALOMEDS::AttributeIOR_var 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);
-                                                                                       
-                                       if (!CORBA::is_nil(anAlgo))
-                                       {
-                                               myNewMesh->AddHypothesis(aShape, anAlgo);       //essayer avec _SMESHCorbaObj
-                                               MESSAGE("Algorithms added ...");
-                                       }
-                               }
-                       }
+                 const SMDS_PolyhedralVolumeOfNodes* aVolume =
+                   dynamic_cast<const SMDS_PolyhedralVolumeOfNodes*> (anElem);
+                 if ( aVolume ) {
+                   aNewElem = aNewMeshDS->AddPolyhedralVolume(aNodesArray, 
+                                                              aVolume->GetQuanities());
+                   elemsMap.insert(make_pair(anElem->GetID(), aNewElem->GetID()));
+                 }
+               }
+             else {
+               
+               aNewElem = aNewEditor.AddElement(aNodesArray,
+                                                anElemType,
+                                                anElem->IsPoly());
+               elemsMap.insert(make_pair(anElem->GetID(), aNewElem->GetID()));
+             } 
+           }//elems loop
+           
+           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;
+           for (int i = 0; i < aListOfGroups->length(); i++) {
+             aGroup = aListOfGroups[i];
+             aListOfNewGroups.clear();
+             SMESH::ElementType aGroupType = aGroup->GetType();
+             CORBA::String_var 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
+         }
        }
-       hdf_subgroup->CloseOnDisk();
+      }//meshes loop
+
+      if (theMergeNodesAndElements) {
+       // merge nodes
+       set<const SMDS_MeshNode*> 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 << ".Concatenate(";
+  aPythonDump << "[";
+  for ( int i = 0; i < theMeshesArray.length(); i++) {
+    if (i > 0) aPythonDump << ", ";
+    aPythonDump << theMeshesArray[i];
+  }
+  aPythonDump << "], ";
+  aPythonDump << theUniteIdenticalGroups << ", "
+              << theMergeNodesAndElements << ", "
+              << theMergeTolerance << ")";
+
+  return aNewMesh._retn();
 }
 
-/**
- * @param hdfGroupMeshId The group where to read the hypothesis
- * @param msgname ???
- * @param Study The study where to create the hypothesis
- * @param myNewMesh The mesh on which the hypothesis is applied
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::Save
+ *
+ *  Save SMESH module's data
  */
-void SMESH_Gen_i::loadSubMeshes(HDFgroup * hdfGroupMeshId, char * msgname,
-       SALOMEDS::Study_var Study, SMESH::SMESH_Mesh_var myNewMesh)
+//=============================================================================
+SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
+                                      const char*              theURL,
+                                      bool                     isMultiFile )
 {
-       MESSAGE("SMESH_Gen_i::loadSubMeshes");
-       HDFgroup * hdf_subgroupmyLevel1Tag = new HDFgroup(msgname, hdfGroupMeshId);
-       hdf_subgroupmyLevel1Tag->OpenOnDisk();
-
-       int nb_submeshes = hdf_subgroupmyLevel1Tag->nInternalObjects();
-       char name_meshgroup[30];
-       //SCRUTE(nb_submeshes);
-
-       for (int j = 0; j < nb_submeshes; j++)
-       {
-               //cmpt_sm++;
-               //myTag = 10 + cmpt_sm;
-               hdf_subgroupmyLevel1Tag->InternalObjectIndentify(j, name_meshgroup);                            
-
-               HDFgroup * hdf_subgroupmyTag = new HDFgroup(name_meshgroup, 
-                       hdf_subgroupmyLevel1Tag);
-               hdf_subgroupmyTag->OpenOnDisk();
-               int subMeshId = atoi((string(name_meshgroup).substr(8, 18)).c_str());
-
-               MESSAGE("Ref on shape");
-               //********** ref on shape               
-               HDFdataset * hdf_dataset =
-                       new HDFdataset("Ref on shape", hdf_subgroupmyTag);
-               hdf_dataset->OpenOnDisk();
-
-               char *refFromFile = new char[hdf_dataset->GetSize()];
-               hdf_dataset->ReadFromDisk(refFromFile);
-               hdf_dataset->CloseOnDisk();
-
-               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))
-               {
-                       SALOMEDS::GenericAttribute_var anAttr;
-                       GSO->FindAttribute(anAttr, "AttributeIOR");
-                       SALOMEDS::AttributeIOR_var 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);
-                               char objectId[10];
-                               sprintf(objectId, "%d", subMeshId);
-                               _SMESHCorbaObj[string("SubMesh_") + string(objectId)] =
-                                        iorString;
-                               _found3 = true;
-                       }
-               }
-
-               int nb_subgroup = hdf_subgroupmyTag->nInternalObjects();
-               SCRUTE(nb_subgroup);
-               char sgname[HDF_NAME_MAX_LEN + 1];
-               for (int k = 0; k < nb_subgroup; k++)
-               {
-                       hdf_subgroupmyTag->InternalObjectIndentify(k, sgname);
-                       if (strcmp(sgname, "Ref on shape") == 0)
-                       {
-                               //nothing
-                       }
-                       else if (strcmp(sgname, "Applied Hypothesis") == 0)
+  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() );
+
+  // Write data
+  // ---> create HDF file
+  aFile = new HDFfile( filename.ToCString() );
+  aFile->CreateOnDisk();
+
+  // --> iterator for top-level objects
+  SALOMEDS::ChildIterator_var itBig = myCurrentStudy->NewChildIterator( theComponent );
+  for ( ; itBig->More(); itBig->Next() ) {
+    SALOMEDS::SObject_var 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_var it = myCurrentStudy->NewChildIterator( gotBranch );
+      for ( ; it->More(); it->Next() ) {
+        SALOMEDS::SObject_var 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
+              if( libname_len > 3 )
+                libname.resize( libname_len - 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_var it = myCurrentStudy->NewChildIterator( gotBranch );
+      for ( ; it->More(); it->Next() ) {
+        SALOMEDS::SObject_var 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
+              if( libname_len > 3 )
+                libname.resize( libname_len - 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();
+
+            // write reference on a shape if exists
+            SALOMEDS::SObject_var myRef;
+            bool shapeRefFound = false;
+            bool found = gotBranch->FindSubObject( GetRefOnShapeTag(), myRef );
+            if ( found ) {
+              SALOMEDS::SObject_var myShape;
+              bool ok = myRef->ReferencedObject( myShape );
+              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_var myHypBranch;
+            found = gotBranch->FindSubObject( GetRefOnAppliedHypothesisTag(), myHypBranch );
+            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_var it = myCurrentStudy->NewChildIterator( myHypBranch );
+              int hypNb = 0;
+              for ( ; it->More(); it->Next() ) {
+                SALOMEDS::SObject_var mySObject = it->Value();
+                SALOMEDS::SObject_var myRefOnHyp;
+                bool ok = mySObject->ReferencedObject( myRefOnHyp );
+                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_var myAlgoBranch;
+            found = gotBranch->FindSubObject( GetRefOnAppliedAlgorithmsTag(), myAlgoBranch );
+            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_var it = myCurrentStudy->NewChildIterator( myAlgoBranch );
+              int algoNb = 0;
+              for ( ; it->More(); it->Next() ) {
+                SALOMEDS::SObject_var mySObject = it->Value();
+                SALOMEDS::SObject_var myRefOnAlgo;
+                bool ok = mySObject->ReferencedObject( myRefOnAlgo );
+                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_var mySubmeshBranch;
+              found = gotBranch->FindSubObject( i, mySubmeshBranch );
+
+              if ( found ) // check if there is shape reference in submeshes
+              {
+                bool hasShapeRef = false;
+                SALOMEDS::ChildIterator_var itSM =
+                  myCurrentStudy->NewChildIterator( mySubmeshBranch );
+                for ( ; itSM->More(); itSM->Next() ) {
+                  SALOMEDS::SObject_var mySubRef, myShape, mySObject = itSM->Value();
+                  if ( mySObject->FindSubObject( GetRefOnShapeTag(), mySubRef ))
+                    mySubRef->ReferencedObject( myShape );
+                  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_var itSM = myCurrentStudy->NewChildIterator( mySubmeshBranch );
+                for ( ; itSM->More(); itSM->Next() ) {
+                  SALOMEDS::SObject_var 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_var mySubRef, myShape;
+                    if ( mySObject->FindSubObject( GetRefOnShapeTag(), mySubRef ))
+                      mySubRef->ReferencedObject( myShape );
+                    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_var mySubHypBranch;
+                    found = mySObject->FindSubObject( GetRefOnAppliedHypothesisTag(), mySubHypBranch );
+                    if ( found ) {
+                      aSubSubGroup = new HDFgroup( "Applied Hypotheses", aSubGroup );
+                      aSubSubGroup->CreateOnDisk();
+
+                      SALOMEDS::ChildIterator_var it = myCurrentStudy->NewChildIterator( mySubHypBranch );
+                      int hypNb = 0;
+                      for ( ; it->More(); it->Next() ) {
+                        SALOMEDS::SObject_var mySubSObject = it->Value();
+                        SALOMEDS::SObject_var myRefOnHyp;
+                        bool ok = mySubSObject->ReferencedObject( myRefOnHyp );
+                        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_var mySubAlgoBranch;
+                    found = mySObject->FindSubObject( GetRefOnAppliedAlgorithmsTag(), mySubAlgoBranch );
+                    if ( found ) {
+                      aSubSubGroup = new HDFgroup( "Applied Algorithms", aSubGroup );
+                      aSubSubGroup->CreateOnDisk();
+
+                      SALOMEDS::ChildIterator_var it = myCurrentStudy->NewChildIterator( mySubAlgoBranch );
+                      int algoNb = 0;
+                      for ( ; it->More(); it->Next() ) {
+                        SALOMEDS::SObject_var mySubSObject = it->Value();
+                        SALOMEDS::SObject_var myRefOnAlgo;
+                        bool ok = mySubSObject->ReferencedObject( myRefOnAlgo );
+                        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();
+
+           // groups root sub-branch
+           SALOMEDS::SObject_var myGroupsBranch;
+           for ( int i = GetNodeGroupsTag(); i <= GetVolumeGroupsTag(); i++ ) {
+             found = gotBranch->FindSubObject( i, myGroupsBranch );
+             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" );
+
+               aGroup = new HDFgroup( name_group, aTopGroup );
+               aGroup->CreateOnDisk();
+
+               SALOMEDS::ChildIterator_var it = myCurrentStudy->NewChildIterator( myGroupsBranch );
+               for ( ; it->More(); it->Next() ) {
+                 SALOMEDS::SObject_var 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;
+                   
+                   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
+                   char grpName[ 30 ];
+                   sprintf( grpName, "Group %d", anId );
+                   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();
+
+                   // Store the group contents into MED file
+                   if ( myLocMesh.GetGroup( myGroupImpl->GetLocalID() ) ) {
+                     
+                     if(MYDEBUG) MESSAGE( "VSR - SMESH_Gen_i::Save(): saving group with StoreName = "
+                                         << grpName << " to MED file" );
+                     SMESHDS_GroupBase* aGrpBaseDS =
+                       myLocMesh.GetGroup( myGroupImpl->GetLocalID() )->GetGroupDS();
+                     aGrpBaseDS->SetStoreName( grpName );
+
+                     // 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_var mySubRef, myShape;
+                       if (mySObject->FindSubObject( GetRefOnShapeTag(), mySubRef ) &&
+                           mySubRef->ReferencedObject( myShape ) &&
+                           !CORBA::is_nil( myShape->GetObject() ))
                        {
-                               //********** ref on applied hypothesis
-                               MESSAGE("Applied Hypothesis");
-                               strcpy(name_meshgroup, "Applied Hypothesis");
-                               //cmpt_sm++;
-                               HDFgroup * hdf_subgroup10cmpt_sm = new HDFgroup(name_meshgroup,
-                                       hdf_subgroupmyTag);
-                                       
-                               hdf_subgroup10cmpt_sm->OpenOnDisk();
-                               int nb_datasets = hdf_subgroup10cmpt_sm->nInternalObjects();
-                               // SCRUTE(nb_datasets);
-
-                               char name_dataset[30];
-                               for (int l = 0; l < nb_datasets; l++)
-                               {
-                                       sprintf(name_dataset, "Hyp %d", l);
-                                       HDFdataset * hdf_datasetcmpt_ds =
-                                               new HDFdataset(name_dataset, hdf_subgroup10cmpt_sm);
-                                       hdf_datasetcmpt_ds->OpenOnDisk();
-                                       int size = hdf_datasetcmpt_ds->GetSize();
-
-                                       char *refFromFile = new char[size];
-                                       hdf_datasetcmpt_ds->ReadFromDisk(refFromFile);
-                                       hdf_datasetcmpt_ds->CloseOnDisk();
-                                       //cmpt_ds++;
-
-                                       if (_found3)
-                                       {
-                                               SALOMEDS::SObject_var HypSO =
-                                                       Study->FindObjectID(refFromFile);
-                                               if (!CORBA::is_nil(HypSO))
-                                               {
-                                                       SALOMEDS::GenericAttribute_var anAttr;
-                                                       SALOMEDS::AttributeIOR_var anIOR;
-                                                       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 ...");
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
+                         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 if (strcmp(sgname, "Applied Algorithms") == 0)
+                       else // shape ref is invalid:
                        {
-                               //********** ref on applied algorithms
-                               MESSAGE("Applied Algorithms");
-                               strcpy(name_meshgroup, "Applied Algorithms");
-                               //cmpt_sm++;
-                               HDFgroup * hdf_subgroup10cmpt_sm = new HDFgroup(name_meshgroup,
-                                       hdf_subgroupmyTag);
-                               hdf_subgroup10cmpt_sm->OpenOnDisk();
-                               int nb_datasets = hdf_subgroup10cmpt_sm->nInternalObjects();
-                               SCRUTE(nb_datasets);
-
-                               char name_dataset[30];
-                               for (int l = 0; l < nb_datasets; l++)
-                               {
-                                       sprintf(name_dataset, "Algo %d", l);
-                                       HDFdataset * hdf_datasetcmpt_ds = new HDFdataset(
-                                               name_dataset, hdf_subgroup10cmpt_sm);
-                                       hdf_datasetcmpt_ds->OpenOnDisk();
-                                       int size = hdf_datasetcmpt_ds->GetSize();
-
-                                       char *refFromFile = new char[size];
-                                       hdf_datasetcmpt_ds->ReadFromDisk(refFromFile);
-                                       hdf_datasetcmpt_ds->CloseOnDisk();
-                                       delete hdf_datasetcmpt_ds;
-                                       //cmpt_ds++;
-
-                                       if (_found3)
-                                       {
-                                               SALOMEDS::SObject_var AlgoSO =
-                                                       Study->FindObjectID(refFromFile);
-                                               if (!CORBA::is_nil(AlgoSO))
-                                               {
-                                                       SALOMEDS::GenericAttribute_var anAttr;
-                                                       SALOMEDS::AttributeIOR_var anIOR;
-                                                       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 ...");
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
+                         // save a group on geometry as ordinary group
+                         myWriter.AddGroup( aGeomGrp );
                        }
+                     }
+                   }
+                 }
                }
-               hdf_subgroupmyTag->CloseOnDisk();
-       }
-       hdf_subgroupmyLevel1Tag->CloseOnDisk();
-}
-
-GEOM::GEOM_Gen_var SMESH_Gen_i::getGeomEngine()
-{
-       MESSAGE("SMESH_Gen_i::getGeomEngine");
-       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);
-       return myGeomEngine;    
-}
-
-GEOM::GEOM_Shape_var SMESH_Gen_i::getShape(SALOMEDS::Study_var Study, char * refFromFile)
-{
-       MESSAGE("SMESH_Gen_i::getShape("<<Study<<","<<refFromFile<<")");
-       SCRUTE(CORBA::is_nil(Study));
-       SALOMEDS::SObject_var CSO = Study->FindObjectID(refFromFile);
-       GEOM::GEOM_Shape_var aShape;
-
-       if (!CORBA::is_nil(CSO))
-       {
-               SALOMEDS::GenericAttribute_var anAttr;
-               CSO->FindAttribute(anAttr, "AttributeIOR");
-               if (!CORBA::is_nil(CSO))
-               {
-                       MESSAGE("The shape was not loaded. Try to load it.");
-                       SALOMEDS::Driver_var driver = SALOMEDS::Driver::_narrow(getGeomEngine());
-                       SALOMEDS::SComponent_var SCO = SALOMEDS::SComponent::_narrow(Study->FindObject("Geometry"));
-                       SALOMEDS::StudyBuilder_var B = Study->NewBuilder();     
-                       B->LoadWith(SCO,driver);
-                       CSO->FindAttribute(anAttr, "AttributeIOR");
-               }
-
-               SALOMEDS::AttributeIOR_var anIOR =
-                       SALOMEDS::AttributeIOR::_narrow(anAttr);
+               aGroup->CloseOnDisk();
+             }
+           } // loop on groups 
+           
+           if ( strcmp( strHasData.c_str(), "1" ) == 0 )
+           {
+             // Flush current mesh information into MED file
+             myWriter.Perform();
+             
+             // 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();
                
-               char *ShapeIOR = anIOR->Value();
-               aShape =
-                       GEOM::GEOM_Shape::_narrow(_orb->string_to_object(ShapeIOR));
-       }
-       return aShape;
-}
-
-void SMESH_Gen_i::loadMesh(char * name, HDFfile * hdf_file,
-       char* meshfile, SALOMEDS::Study_var Study)
-{
-       MESSAGE("in mesh load");
-       char msgname[HDF_NAME_MAX_LEN + 1];     
-       char objectId[10];
-       char name_of_group[HDF_NAME_MAX_LEN + 1];
-       
-       int myMeshId =
-               atoi((string(name).substr(5, 5)).c_str());
-       SCRUTE(myMeshId);
-
-       HDFgroup * hdfGroupMeshId = new HDFgroup(name, hdf_file);
-       hdfGroupMeshId->OpenOnDisk();
-
-       int nb_meshsubgroup = hdfGroupMeshId->nInternalObjects();
-       SCRUTE(nb_meshsubgroup);
-
-       //********** Loading of the file name where the data are stored
-       MESSAGE("Mesh data file");
-       strcpy(name_of_group, "Mesh data");
-       HDFdataset * dataset =
-               new HDFdataset(name_of_group, hdfGroupMeshId);
-       dataset->OpenOnDisk();
-
-       char *datafilename = new char[dataset->GetSize()];
-       dataset->ReadFromDisk(datafilename);
-       dataset->CloseOnDisk(); 
-       MESSAGE("datafilename="<<datafilename<<" but this is ignored. We will read from "<<meshfile);
-       datafilename=meshfile;
-
-       //********** Loading of the reference on the shape
-       //********** and mesh initialization
-       MESSAGE("Ref on shape");
-       strcpy(name_of_group, "Ref on shape");
-       dataset =
-               new HDFdataset(name_of_group, hdfGroupMeshId);
-       dataset->OpenOnDisk();
-       
-       char *refFromFile = new char[dataset->GetSize()];
-       dataset->ReadFromDisk(refFromFile);
-       dataset->CloseOnDisk(); 
-
-       bool _found = false;
-       SCRUTE(refFromFile);
-       SMESH::SMESH_Mesh_var myNewMesh;
-       GEOM::GEOM_Shape_var aShape=getShape(Study, refFromFile);
-
-       if (!CORBA::is_nil(aShape))
-       {
-               _found = true;
-               myNewMesh = this->Init(getGeomEngine(), Study->StudyId(), aShape);
-               string iorString = _orb->object_to_string(myNewMesh);
-               sprintf(objectId, "%ld", myNewMesh->GetId());
-               _SMESHCorbaObj[string("Mesh_") + string(objectId)] = iorString;
-
+               // each element belongs to one or none submesh,
+               // so for each node/element, we store a submesh ID
                
-               //********** 
-               //********** Loading of mesh data
-               if (strcmp(datafilename, "No data") != 0)
-               {                       
-                       StudyContext_iStruct *myStudyContext =
-                               _mapStudyContext_i[Study->StudyId()];
-                       int meshId = myNewMesh->GetId();
-                       SMESH_Mesh_i *meshServant =
-                               myStudyContext->mapMesh_i[meshId];
-                       ::SMESH_Mesh & myLocMesh = meshServant->GetImpl();
-                       SMESHDS_Mesh *mySMESHDSMesh = myLocMesh.GetMeshDS();
-
-                       Mesh_Reader *myReader = SMESHDriver::GetMeshReader("MED");
-                       myReader->SetMesh(mySMESHDSMesh);
-                       myReader->SetMeshId(myMeshId);
-                       myReader->SetFile(datafilename);
-                       myReader->Read();
-                       mySMESHDSMesh->logFullUpdate();
-                       MESSAGE("Loaded a mesh with " << mySMESHDSMesh->NbNodes() <<" nodes");
-               }
-       }
-       //********** 
-       //}
-       //else if (strcmp(msgname,"Applied Hypothesis")==0) {
-       for (int ii = 0; ii < nb_meshsubgroup; ii++)
-       {
-               hdfGroupMeshId->InternalObjectIndentify(ii, msgname);
-               if (strcmp(msgname, "Mesh data") == 0)
+               // 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++ )
                {
-                       //nothing
+                 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 ));
                }
-               else if (strcmp(msgname, "Ref on shape") == 0)
-               {
-                       //nothing
+               
+               // 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 ));
                }
-               else if (strcmp(msgname, "Applied Hypothesis") == 0)
-               {
-                       loadAppliedHypothesis(hdfGroupMeshId, _found, Study, myNewMesh,
-                               aShape);
+               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 ));
                }
-               else if (strcmp(msgname, "Applied Algorithms") == 0)
+               
+               // Store submesh IDs
+               for ( int isNode = 0; isNode < 2; ++isNode )
                {
-                       loadAppliedAlgorithms(hdfGroupMeshId, _found, Study, myNewMesh,
-                               aShape);
+                 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;
                }
-               else if (string(msgname).substr(0, 9) == string("SubMeshes"))
+                
+               // 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++ )
                {
-                       loadSubMeshes(hdfGroupMeshId, msgname, Study, myNewMesh);
+                 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;
+                 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.get() );
+                       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.get() );
+                       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();
+         }
        }
-       hdfGroupMeshId->CloseOnDisk();
-       MESSAGE("End of Meshes Load");
+      }
+    }
+  }
+  
+  // 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();
 }
 
-/**
- * Load the part of the study related to SMESH.
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::SaveASCII
+ *
+ *  Save SMESH module's data in ASCII format
  */
-bool SMESH_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
-       const SALOMEDS::TMPFile & theStream, const char *theURL, bool isMultiFile)
-{
-       MESSAGE("SMESH_Gen_i::Load");   
-       // 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);
-
-       TCollection_AsciiString aStudyName("");
-       if (isMultiFile)
-               aStudyName =
-                       (SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL()));
-
-       // Set names of temporary files
-       TCollection_AsciiString filename =
-               tmpDir + aStudyName + TCollection_AsciiString("_SMESH.hdf");
-       TCollection_AsciiString hypofile =
-               tmpDir + aStudyName + TCollection_AsciiString("_SMESH_Hypo.txt");
-       TCollection_AsciiString algofile =
-               tmpDir + aStudyName + TCollection_AsciiString("_SMESH_Algo.txt");
-       TCollection_AsciiString meshfile =
-               tmpDir + aStudyName + TCollection_AsciiString("_SMESH_Mesh.med");
-
-       SALOMEDS::Study_var Study = theComponent->GetStudy();
-       int studyId = Study->StudyId();
-       SCRUTE(studyId);
-
-       SALOMEDS::AttributeName_var aName;
-       
-       SALOMEDS::SComponent_var fathergeom = Study->FindComponent("GEOM");
-       SALOMEDS::SComponent_var myGeomSComp =
-               SALOMEDS::SComponent::_narrow(fathergeom);
-       SCRUTE(fathergeom);
-
-       char name[HDF_NAME_MAX_LEN + 1];
-       map < int, HDFgroup * > hdf_subgroup;   
-
-
-       //************* HDF file opening
-       HDFfile *hdf_file = new HDFfile(filename.ToCString());
-       try
-       {
-               hdf_file->OpenOnDisk(HDF_RDONLY);
-       }
-       catch(HDFexception)
-       {
-               MESSAGE("Load(): " << filename << " not found!");
-               return false;
-       }
-
-       //****************************
+//=============================================================================
 
-       int nb_group = hdf_file->nInternalObjects();
-       SCRUTE(nb_group);
-       for (int i = 0; i < nb_group; i++)
-       {
-               hdf_file->InternalObjectIndentify(i, name);
-               if (strcmp(name, "Hypothesis") == 0)
-                       loadHypothesis(name, hdf_file, hypofile.ToCString(), studyId);
-               else if (strcmp(name, "Algorithms") == 0)
-                       loadAlgorithms(name, hdf_file, algofile.ToCString(), studyId);
-               else if (string(name).substr(0, 4) == string("Mesh"))
-                       loadMesh(name, hdf_file, meshfile.ToCString(), Study);
-       }
+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", (char*)(aStreamFile[i]) );
+
+  buffer[size * 3] = '\0';
+
+  SALOMEDS::TMPFile_var anAsciiStreamFile = new SALOMEDS::TMPFile(size*3, size*3, buffer, 1);
+  
+  return anAsciiStreamFile._retn();
+}
 
-       MESSAGE("End of SMESH_Gen::Load");
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::loadGeomData
+ *
+ *  Load GEOM module data
+ */
+//=============================================================================
 
-       hdf_file->CloseOnDisk();
+void SMESH_Gen_i::loadGeomData( SALOMEDS::SComponent_ptr theCompRoot )
+{
+  if ( theCompRoot->_is_nil() )
+    return;
 
-       // Remove temporary files created from the stream
-       if (isMultiFile)
-               SALOMEDS_Tool::RemoveTemporaryFiles(tmpDir.ToCString(), aFileSeq.in(),
-                       true);
+  SALOMEDS::Study_var aStudy = SALOMEDS::Study::_narrow( theCompRoot->GetStudy() );
+  if ( aStudy->_is_nil() )
+    return;
 
-       return true;
+  SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); 
+  aStudyBuilder->LoadWith( theCompRoot, GetGeomEngine() );
 }
+//=============================================================================
+/*!
+ * \brief Creates SMDS_Position according to shape type
+ */
+//=============================================================================
 
-bool SMESH_Gen_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent,
-       const SALOMEDS::TMPFile & theStream, const char *theURL, bool isMultiFile)
-{
-       return Load(theComponent, theStream, theURL, isMultiFile);
-}
+class PositionCreator {
+public:
+  SMDS_PositionPtr MakePosition(const TopAbs_ShapeEnum type) {
+    return (this->*myFuncTable[ type ])();
+  }
+  PositionCreator() {
+    myFuncTable.resize( (size_t) TopAbs_SHAPE, & PositionCreator::defaultPosition );
+    myFuncTable[ TopAbs_FACE ] = & PositionCreator::facePosition;
+    myFuncTable[ TopAbs_EDGE ] = & PositionCreator::edgePosition;
+    myFuncTable[ TopAbs_VERTEX ] = & PositionCreator::vertexPosition;
+  }
+private:
+  SMDS_PositionPtr edgePosition()    const { return SMDS_PositionPtr( new SMDS_EdgePosition  ); }
+  SMDS_PositionPtr facePosition()    const { return SMDS_PositionPtr( new SMDS_FacePosition  ); }
+  SMDS_PositionPtr vertexPosition()  const { return SMDS_PositionPtr( new SMDS_VertexPosition); }
+  SMDS_PositionPtr defaultPosition() const { return SMDS_SpacePosition::originSpacePosition();  }
+  typedef SMDS_PositionPtr (PositionCreator:: * FmakePos)() const;
+  vector<FmakePos> myFuncTable;
+};
 
 //=============================================================================
 /*!
- *  
+ *  SMESH_Gen_i::Load
+ *
+ *  Load SMESH module's data
  */
 //=============================================================================
 
-void SMESH_Gen_i::Close(SALOMEDS::SComponent_ptr theComponent)
+bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
+                       const SALOMEDS::TMPFile& theStream,
+                       const char*              theURL,
+                       bool                     isMultiFile )
 {
-       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, "%ld", 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, "%ld", 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, "%ld", mySubMesh->GetId());
-//            cout<<"********** delete SubMesh "<<objectId<<endl;
-                                                       _SMESHCorbaObj.erase(string("SubMesh_") +
-                                                               string(objectId));
-                                                       CORBA::release(mySubMesh);
-                                               }
-                                       }
-                               }
-                       }
-               }
-       }
+  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();
+
+  // 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( filename.ToCString() );
+  try {
+    aFile->OpenOnDisk( HDF_RDONLY );
+  }
+  catch ( HDFexception ) {
+    INFOS( "Load(): " << filename << " not found!" );
+    return false;
+  }
+
+  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 ));
+             string iorString = GetORB()->object_to_string( myHyp );
+             int newId = myStudyContext->findId( iorString );
+             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 ));
+             string iorString = GetORB()->object_to_string( myHyp );
+             int newId = myStudyContext->findId( iorString );
+             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 ));
+
+         string iorString = GetORB()->object_to_string( myNewMesh );
+         int newId = myStudyContext->findId( iorString );
+         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->SetAutoColor( (bool)anAutoColor[0] );
+         }
+
+          // 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_var 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 );
+              }
+            }
+          }
+
+        }
+      }
+    }
+
+    // As all object that can be referred by hypothesis are created,
+    // we can restore hypothesis data
+
+    list< pair< SMESH_Hypothesis_i*, string > >::iterator hyp_data;
+    for ( hyp_data = hypDataList.begin(); hyp_data != hypDataList.end(); ++hyp_data )
+    {
+      SMESH_Hypothesis_i* hyp  = hyp_data->first;
+      string &            data = hyp_data->second;
+      hyp->LoadFrom( data.c_str() );
+    }
+
+    // Restore the rest mesh data
+
+    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
+      string iorString = GetORB()->object_to_string( myNewMeshImpl->_this() );
+      int newId = myStudyContext->findId( iorString );
+      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;
+        }
+      }
+
+      // try to get applied algorithms
+      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_var hypSO = myCurrentStudy->FindObjectID( refFromFile );
+            //CORBA::Object_var hypObject = SObjectToObject( hypSO );
+            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->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_var hypSO = myCurrentStudy->FindObjectID( refFromFile );
+            //CORBA::Object_var hypObject = SObjectToObject( hypSO );
+            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->HasShapeToMesh()) )
+                  myNewMeshImpl->addHypothesis( aShapeObject, anHyp );
+              }
+            }
+          }
+        }
+        aGroup->CloseOnDisk();
+      }
+
+      // --> try to find submeshes 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_var 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;
+
+              // VSR: Get submesh data from MED convertor
+              //                  int anInternalSubmeshId = aSubMesh->GetId(); // this is not a persistent ID, it's an internal one computed from sub-shape
+              //                  if (myNewMeshImpl->_mapSubMesh.find(anInternalSubmeshId) != myNewMeshImpl->_mapSubMesh.end()) {
+              //                    if(MYDEBUG) MESSAGE("VSR - SMESH_Gen_i::Load(): loading from MED file submesh with ID = " <<
+              //                            subid << " for subshape # " << anInternalSubmeshId);
+              //                    SMESHDS_SubMesh* aSubMeshDS =
+              //                      myNewMeshImpl->_mapSubMesh[anInternalSubmeshId]->CreateSubMeshDS();
+              //                    if ( !aSubMeshDS ) {
+              //                      if(MYDEBUG) MESSAGE("VSR - SMESH_Gen_i::Load(): FAILED to create a submesh for subshape # " <<
+              //                              anInternalSubmeshId << " in current mesh!");
+              //                    }
+              //                    else
+              //                      myReader.GetSubMesh( aSubMeshDS, subid );
+              //                  }
+
+              // 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();
+
+                    //SALOMEDS::SObject_var hypSO = myCurrentStudy->FindObjectID( refFromFile );
+                    //CORBA::Object_var hypObject = SObjectToObject( hypSO );
+                    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();
+
+                    //SALOMEDS::SObject_var hypSO = myCurrentStudy->FindObjectID( refFromFile );
+                    //CORBA::Object_var hypObject = SObjectToObject( hypSO );
+                    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 submesh HDF group
+              aSubGroup->CloseOnDisk();
+            }
+          }
+          // close submeshes containers HDF group
+          aGroup->CloseOnDisk();
+        }
+      }
+
+      if(hasData) {
+
+        // Read sub-meshes from MED
+        // -------------------------
+        if(MYDEBUG) MESSAGE("Create all sub-meshes");
+        bool submeshesInFamilies = ( ! aTopGroup->ExistInternalObject( "Submeshes" ));
+        if ( submeshesInFamilies )
+        {
+          // old way working before fix of PAL 12992
+          myReader.CreateAllSubMeshes();
+        }
+        else
+        {
+          // open a group
+          aGroup = new HDFgroup( "Submeshes", aTopGroup ); 
+          aGroup->OpenOnDisk();
+
+          int maxID = mySMESHDSMesh->MaxShapeIndex();
+          vector< SMESHDS_SubMesh * > subMeshes( maxID + 1, (SMESHDS_SubMesh*) 0 );
+          vector< TopAbs_ShapeEnum  > smType   ( maxID + 1, TopAbs_SHAPE ); 
+
+          PositionCreator aPositionCreator;
+
+          SMDS_NodeIteratorPtr nIt = mySMESHDSMesh->nodesIterator();
+          SMDS_ElemIteratorPtr eIt = mySMESHDSMesh->elementsIterator();
+          for ( int isNode = 0; isNode < 2; ++isNode )
+          {
+            string aDSName( isNode ? "Node Submeshes" : "Element Submeshes");
+            if ( aGroup->ExistInternalObject( (char*) aDSName.c_str() ))
+            {
+              aDataset = new HDFdataset( (char*) aDSName.c_str(), aGroup );
+              aDataset->OpenOnDisk();
+              // read submesh IDs for all elements sorted by ID
+              int nbElems = aDataset->GetSize();
+              int* smIDs = new int [ nbElems ];
+              aDataset->ReadFromDisk( smIDs );
+              aDataset->CloseOnDisk();
+
+              // get elements sorted by ID
+              TIDSortedElemSet elemSet;
+              if ( isNode )
+                while ( nIt->more() ) elemSet.insert( nIt->next() );
+              else
+                while ( eIt->more() ) elemSet.insert( eIt->next() );
+              ASSERT( elemSet.size() == nbElems );
+
+              // add elements to submeshes
+              TIDSortedElemSet::iterator iE = elemSet.begin();
+              for ( int i = 0; i < nbElems; ++i, ++iE )
+              {
+                int smID = smIDs[ i ];
+                if ( smID == 0 ) continue;
+                ASSERT( smID <= maxID );
+                const SMDS_MeshElement* elem = *iE;
+                // get or create submesh
+                SMESHDS_SubMesh* & sm = subMeshes[ smID ];
+                if ( ! sm ) {
+                  sm = mySMESHDSMesh->NewSubMesh( smID );
+                  smType[ smID ] = mySMESHDSMesh->IndexToShape( smID ).ShapeType();
+                }
+                // add
+                if ( isNode ) {
+                  SMDS_PositionPtr pos = aPositionCreator.MakePosition( smType[ smID ]);
+                  pos->SetShapeId( smID );
+                  SMDS_MeshNode* node = const_cast<SMDS_MeshNode*>( static_cast<const SMDS_MeshNode*>( elem ));
+                  node->SetPosition( pos );
+                  sm->AddNode( node );
+                } else {
+                  sm->AddElement( elem );
+                }
+              }
+              delete [] smIDs;
+            }
+          }
+        } // end reading submeshes
+
+        // Read node positions on sub-shapes (SMDS_Position)
+
+        if ( aTopGroup->ExistInternalObject( "Node Positions" ))
+        {
+          // There are 5 datasets to read:
+          // "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
+          char* aEid_DSName = "Nodes on Edges";
+          char* aEu_DSName  = "Edge positions";
+          char* aFu_DSName  = "Face U positions";
+          //char* aFid_DSName = "Nodes on Faces";
+          //char* aFv_DSName  = "Face V positions";
+
+          // data to retrieve
+          int nbEids = 0, nbFids = 0;
+          int *aEids = 0, *aFids  = 0;
+          double *aEpos = 0, *aFupos = 0, *aFvpos = 0;
+
+          // open a group
+          aGroup = new HDFgroup( "Node Positions", aTopGroup ); 
+          aGroup->OpenOnDisk();
+
+          // loop on 5 data sets
+          int aNbObjects = aGroup->nInternalObjects();
+          for ( int i = 0; i < aNbObjects; i++ )
+          {
+            // identify dataset
+            char aDSName[ HDF_NAME_MAX_LEN+1 ];
+            aGroup->InternalObjectIndentify( i, aDSName );
+            // read data
+            aDataset = new HDFdataset( aDSName, aGroup );
+            aDataset->OpenOnDisk();
+            if ( aDataset->GetType() == HDF_FLOAT64 ) // Positions
+            {
+              double* pos = new double [ aDataset->GetSize() ];
+              aDataset->ReadFromDisk( pos );
+              // which one?
+              if ( strncmp( aDSName, aEu_DSName, strlen( aEu_DSName )) == 0 )
+                aEpos = pos;
+              else if ( strncmp( aDSName, aFu_DSName, strlen( aFu_DSName )) == 0 )
+                aFupos = pos;
+              else
+                aFvpos = pos;
+            }
+            else // NODE IDS
+            {
+              int aSize = aDataset->GetSize();
+
+              // for reading files, created from 18.07.2005 till 10.10.2005
+              if (aDataset->GetType() == HDF_STRING)
+                aSize /= sizeof(int);
+
+              int* ids = new int [aSize];
+              aDataset->ReadFromDisk( ids );
+              // on face or nodes?
+              if ( strncmp( aDSName, aEid_DSName, strlen( aEid_DSName )) == 0 ) {
+                aEids = ids;
+                nbEids = aSize;
+              }
+              else {
+                aFids = ids;
+                nbFids = aSize;
+              }
+            }
+            aDataset->CloseOnDisk();
+          } // loop on 5 datasets
+
+          // Set node positions on edges or faces
+          for ( int onFace = 0; onFace < 2; onFace++ )
+          {
+            int nbNodes = ( onFace ? nbFids : nbEids );
+            if ( nbNodes == 0 ) continue;
+            int* aNodeIDs = ( onFace ? aFids : aEids );
+            double* aUPos = ( onFace ? aFupos : aEpos );
+            double* aVPos = ( onFace ? aFvpos : 0 );
+            // loop on node IDs
+            for ( int iNode = 0; iNode < nbNodes; iNode++ )
+            {
+              const SMDS_MeshNode* node = mySMESHDSMesh->FindNode( aNodeIDs[ iNode ]);
+              ASSERT( node );
+              SMDS_PositionPtr aPos = node->GetPosition();
+              ASSERT( aPos )
+                if ( onFace ) {
+                  ASSERT( aPos->GetTypeOfPosition() == SMDS_TOP_FACE );
+                  SMDS_FacePosition* fPos = const_cast<SMDS_FacePosition*>
+                    ( static_cast<const SMDS_FacePosition*>( aPos.get() ));
+                  fPos->SetUParameter( aUPos[ iNode ]);
+                  fPos->SetVParameter( aVPos[ iNode ]);
+                }
+                else {
+                  ASSERT( aPos->GetTypeOfPosition() == SMDS_TOP_EDGE );
+                  SMDS_EdgePosition* fPos = const_cast<SMDS_EdgePosition*>
+                    ( static_cast<const SMDS_EdgePosition*>( aPos.get() ));
+                  fPos->SetUParameter( aUPos[ iNode ]);
+                }
+            }
+          }
+          if ( aEids ) delete [] aEids;
+          if ( aFids ) delete [] aFids;
+          if ( aEpos ) delete [] aEpos;
+          if ( aFupos ) delete [] aFupos;
+          if ( aFvpos ) delete [] aFvpos;
+
+          aGroup->CloseOnDisk();
+
+        } // if ( aTopGroup->ExistInternalObject( "Node Positions" ) )
+      } // if ( hasData )
+
+      // Recompute State (as computed sub-meshes are restored from MED)
+      if ( !aShapeObject->_is_nil() || !myNewMeshImpl->HasShapeToMesh()) {
+        MESSAGE("Compute State Engine ...");
+        TopoDS_Shape myLocShape;
+        if(myNewMeshImpl->HasShapeToMesh())
+          myLocShape = GeomObjectToShape( aShapeObject );
+        else
+          myLocShape = SMESH_Mesh::PseudoShape();
+        
+        myNewMeshImpl->GetImpl().GetSubMesh(myLocShape)->ComputeStateEngine
+          (SMESH_subMesh::SUBMESH_RESTORED);
+        MESSAGE("Compute State Engine finished");
+      }
+
+      // try to get groups
+      for ( int ii = GetNodeGroupsTag(); ii <= GetVolumeGroupsTag(); 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" );
+
+        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_var 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 );
+                  }
+                }
+              }
+              // 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 ) );
+              // 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 =
+                dynamic_cast<SMESH_GroupBase_i*>( GetServant( aNewGroup ).in() );
+              if ( !aGroupImpl )
+                continue;
+
+              SMESH_Group* aLocalGroup  = myLocMesh.GetGroup( aGroupImpl->GetLocalID() );
+              if ( !aLocalGroup )
+                continue;
+
+              SMESHDS_GroupBase* aGroupBaseDS = aLocalGroup->GetGroupDS();
+              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 );
+             }
+
+              // Fill group with contents from MED file
+              SMESHDS_Group* aGrp = dynamic_cast<SMESHDS_Group*>( aGroupBaseDS );
+              if ( aGrp )
+                myReader.GetGroup( aGrp );
+            }
+          }
+          aGroup->CloseOnDisk();
+        }
+      }
+    }
+    // close mesh group
+    if(aTopGroup)
+      aTopGroup->CloseOnDisk();   
+  }
+  // close HDF file
+  aFile->CloseOnDisk();
+  delete aFile;
+
+  // Remove temporary files created from the stream
+  if ( !isMultiFile ) 
+    SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.ToCString(), aFileSeq.in(), true );
+
+  INFOS( "SMESH_Gen_i::Load completed" );
+  return true;
 }
 
 //=============================================================================
 /*!
- *  
+ *  SMESH_Gen_i::LoadASCII
+ *
+ *  Load SMESH module's data in ASCII format
  */
 //=============================================================================
 
-char *SMESH_Gen_i::ComponentDataType()
-{
-       MESSAGE("SMESH_Gen_i::ComponentDataType");
-       return strdup("SMESH");
+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
  */
 //=============================================================================
 
-char *SMESH_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject,
-       const char *IORString, CORBA::Boolean isMultiFile, CORBA::Boolean isASCII)
+void SMESH_Gen_i::Close( SALOMEDS::SComponent_ptr theComponent )
 {
-       MESSAGE("SMESH_Gen_i::IORToLocalPersistentID");
-
-       char objectId[10];
-
-       SMESH::SMESH_Algo_var myAlgo =
-               SMESH::SMESH_Algo::_narrow(_orb->string_to_object(IORString));
-       if (!CORBA::is_nil(myAlgo))
-       {
-               string prefix = "Hypo_";
-               sprintf(objectId, "%ld", 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, "%ld", myHypo->GetId());
-                       string lpID = prefix + string(objectId);
-                       return CORBA::string_dup(lpID.c_str());
-               }
-               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, "%ld", 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, "%ld", mySubMesh->GetId());
-                                       string lpID = prefix + string(objectId);
-                                       return CORBA::string_dup(lpID.c_str());
-                               }
-                               else
-                                       return (strdup("no object"));
-                       }
-               }
-       }
+  if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Close" );
+
+  // Clear study contexts data
+  int studyId = GetCurrentStudyID();
+  if ( myStudyContextMap.find( studyId ) != myStudyContextMap.end() ) {
+    delete myStudyContextMap[ studyId ];
+    myStudyContextMap.erase( studyId );
+  }
+
+  // delete SMESH_Mesh's
+  StudyContextStruct* context = myGen.GetStudyContext( studyId );
+  map< int, SMESH_Mesh* >::iterator i_mesh = context->mapMesh.begin();
+  for ( ; i_mesh != context->mapMesh.end(); ++i_mesh )
+    delete i_mesh->second;
+  // delete SMESHDS_Mesh's
+  // it's too long on big meshes
+//   if ( context->myDocument ) {
+//     delete context->myDocument;
+//     context->myDocument = 0;
+//   }
+  
+  return;
 }
 
 //=============================================================================
 /*!
- *  
+ *  SMESH_Gen_i::ComponentDataType
+ * 
+ *  Get component data type
  */
 //=============================================================================
 
-char *SMESH_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject,
-       const char *aLocalPersistentID,
-       CORBA::Boolean isMultiFile, CORBA::Boolean isASCII)
+char* SMESH_Gen_i::ComponentDataType()
 {
-       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(MYDEBUG) MESSAGE( "SMESH_Gen_i::ComponentDataType" );
+  return CORBA::string_dup( "SMESH" );
 }
 
+    
 //=============================================================================
 /*!
+ *  SMESH_Gen_i::IORToLocalPersistentID
  *  
+ *  Transform data from transient form to persistent
  */
 //=============================================================================
 
-SMESH_topo *SMESH_Gen_i::ExploreMainShape(GEOM::GEOM_Gen_ptr geomEngine,
-       CORBA::Long studyId, GEOM::GEOM_Shape_ptr aShape)
+char* SMESH_Gen_i::IORToLocalPersistentID( SALOMEDS::SObject_ptr /*theSObject*/,
+                                          const char*           IORString,
+                                          CORBA::Boolean        /*isMultiFile*/,
+                                          CORBA::Boolean        /*isASCII*/ )
 {
-       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())
-       {
-               const TopoDS_Shell & E = TopoDS::Shell(exp.Current());
-               int i = myTopo->_myShapes[TopAbs_SHELL].Add(E);
-               SCRUTE(i);
-       }
-       for (TopExp_Explorer exp(mainShape, TopAbs_FACE); exp.More(); exp.Next())
-       {
-               const TopoDS_Face & E = TopoDS::Face(exp.Current());
-               int i = myTopo->_myShapes[TopAbs_FACE].Add(E);
-               SCRUTE(i);
-       }
-       for (TopExp_Explorer exp(mainShape, TopAbs_WIRE); exp.More(); exp.Next())
-       {
-               const TopoDS_Wire & E = TopoDS::Wire(exp.Current());
-               int i = myTopo->_myShapes[TopAbs_WIRE].Add(E);
-               SCRUTE(i);
-       }
-       for (TopExp_Explorer exp(mainShape, TopAbs_EDGE); exp.More(); exp.Next())
-       {
-               const TopoDS_Edge & E = TopoDS::Edge(exp.Current());
-               int i = myTopo->_myShapes[TopAbs_EDGE].Add(E);
-               SCRUTE(i);
-       }
-       for (TopExp_Explorer exp(mainShape, TopAbs_VERTEX); exp.More(); exp.Next())
-       {
-               const TopoDS_Vertex & E = TopoDS::Vertex(exp.Current());
-               int i = myTopo->_myShapes[TopAbs_VERTEX].Add(E);
-               SCRUTE(i);
-       }
-
-       // explore subShapes of distant CORBA object,
-       // associate distant CORBA subShape references
-       // with local reference to local TopoDS subShape
-
-       string filenode = "toposhape.txt";
-       ofstream fic(filenode.c_str());
-
-       for (int shapeType = TopAbs_COMPOUND; shapeType < TopAbs_SHAPE; shapeType++)
-       {
-               fic << "shape type : " << SMESH_shapeTypeNames[shapeType];
-
-               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);
-
-               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)))
-                               {
-                                       MESSAGE("  --- trouve = " << j);
-                                       myTopo->_mapIndShapes[shapeType][idShape] = j;
-                                       fic << "  --- trouve = " << j;
-                                       break;
-                               }
-                       fic << endl;
-               }
-       }
-       fic.close();
-
-       return myTopo;
+  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( "" );
 }
 
-/**
- * Import a mesh from a file
- * @param fileName file name to be imported
- * @param fileType Currently it could be either "DAT", "UNV" or "MED".
+//=============================================================================
+/*!
+ *  SMESH_Gen_i::LocalPersistentIDToIOR
+ *
+ *  Transform data from persistent form to transient
  */
-SMESH::SMESH_Mesh_ptr SMESH_Gen_i::Import(CORBA::Long studyId,
-       const char *fileName, const char *fileType)
+//=============================================================================
+
+char* SMESH_Gen_i::LocalPersistentIDToIOR( SALOMEDS::SObject_ptr /*theSObject*/,
+                                          const char*           aLocalPersistentID,
+                                          CORBA::Boolean        /*isMultiFile*/,
+                                          CORBA::Boolean        /*isASCII*/ )
 {
-       MESSAGE("SMESH_Gen_I::Import");
-       SMESH_Mesh_i *meshServant;
-       try
-       {
-               if (_mapStudyContext_i.find(studyId) == _mapStudyContext_i.end())
-               {
-                       _mapStudyContext_i[studyId] = new StudyContext_iStruct;
-               }
-               StudyContext_iStruct *myStudyContext = _mapStudyContext_i[studyId];
+  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( "" );
+}
 
-               // create a new mesh object servant, store it in a map in study context
-               meshServant = new SMESH_Mesh_i(this, NULL, studyId, _localId);
-               myStudyContext->mapMesh_i[_localId] = meshServant;
-               _localId++;
+//=======================================================================
+//function : RegisterObject
+//purpose  : 
+//=======================================================================
 
-               // create a new mesh object
-               meshServant->SetImpl(_impl.Import(studyId, fileName, fileType));
-       }
-       catch(SALOME_Exception & S_ex)
-       {
-               THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM);
-       }
-
-       // activate the CORBA servant of Mesh
+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;
+}
 
-       SMESH::SMESH_Mesh_var mesh
-               = SMESH::SMESH_Mesh::_narrow(meshServant->_this());
+//================================================================================
+/*!
+ * \brief Return id of registered object
+  * \param theObject - the Object
+  * \retval int - Object id
+ */
+//================================================================================
 
-       meshServant->SetIor(mesh);
-       return SMESH::SMESH_Mesh::_duplicate(mesh);
+int 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;
 }
 
 //=============================================================================
 /*! 
- * C factory, accessible with dlsym, after dlopen  
+ *  SMESHEngine_factory
+ *
+ *  C factory, accessible with dlsym, after dlopen  
  */
 //=============================================================================
 
 extern "C"
-{
-       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();
-       }
+{ SMESH_I_EXPORT
+  PortableServer::ObjectId* SMESHEngine_factory( CORBA::ORB_ptr            orb,
+                                                PortableServer::POA_ptr   poa, 
+                                                PortableServer::ObjectId* contId,
+                                                const char*               instanceName, 
+                                                const char*               interfaceName )
+  {
+    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() ;
+  }
 }