X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_CalculationCase.cxx;h=27b5294e20ee979189e9cc1616381ccf573b870c;hb=f7c005b67e48ec7bac99c566fb4f34215ec1a4b1;hp=f8d25eb746999b52c0aaa5e42442cedb827d18a9;hpb=651e5d37742752679433fa0c15460402ce2c72f4;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index f8d25eb7..27b5294e 100644
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -1,21 +1,43 @@
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "HYDROData_CalculationCase.h"
 
 #include "HYDROData_ArtificialObject.h"
-#include "HYDROData_Bathymetry.h"
+#include "HYDROData_IAltitudeObject.h"
 #include "HYDROData_Document.h"
-#include "HYDROData_EdgesGroup.h"
+#include "HYDROData_ShapesGroup.h"
 #include "HYDROData_Iterator.h"
 #include "HYDROData_NaturalObject.h"
 #include "HYDROData_PolylineXY.h"
-#include "HYDROData_SplitToZonesTool.h"
-#include "HYDROData_SplittedEdgesGroup.h"
+#include "HYDROData_SplittedShapesGroup.h"
 #include "HYDROData_Region.h"
 #include "HYDROData_Tool.h"
-#include "HYDROData_Zone.h"
+#include "HYDROData_GeomTool.h"
 
 #include <GEOMBase.h>
 
+#include <QSet>
+
 #include <TopoDS.hxx>
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Edge.hxx>
@@ -31,13 +53,20 @@
 #include <TopExp.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TDataStd_Integer.hxx>
 
-
+//#define  DEB_CALCULATION 1
+#ifdef DEB_CALCULATION
+#include <BRepTools.hxx>
+#include <TopLoc_Location.hxx>
+#endif 
 #define CALCULATION_REGIONS_PREF GetName() + "_Reg"
 #define CALCULATION_ZONES_PREF GetName() + "_Zone"
 #define CALCULATION_GROUPS_PREF GetName() + "_"
-
-#define PYTHON_CALCULATION_ID "KIND_CALCULATION"
+//#define DEB_CLASS2D 1
+#ifdef DEB_CLASS2D
+#include <BRepBuilderAPI_MakeVertex.hxx>
+#endif
 
 #define EXPORT_NAME "HYDRO_" + GetName()
 
@@ -68,12 +97,7 @@ void HYDROData_CalculationCase::SetName( const QString& theName )
       if ( aRegion.IsNull() )
         continue;
 
-      QString aRegionName = aRegion->GetName();
-      if ( aRegionName.startsWith( anOldCaseName ) )
-      {
-        aRegionName.replace( anOldCaseName, theName );
-        aRegion->SetName( aRegionName );
-      }
+      HYDROData_Tool::UpdateChildObjectName( anOldCaseName, theName, aRegion );
 
       HYDROData_SequenceOfObjects aZones = aRegion->GetZones();
       HYDROData_SequenceOfObjects::Iterator anIter( aZones );
@@ -84,31 +108,21 @@ void HYDROData_CalculationCase::SetName( const QString& theName )
         if ( aRegZone.IsNull() )
           continue;
 
-        QString aRegionZoneName = aRegZone->GetName();
-        if ( aRegionZoneName.startsWith( anOldCaseName ) )
-        {
-          aRegionZoneName.replace( anOldCaseName, theName );
-          aRegZone->SetName( aRegionZoneName );
-        }
+        HYDROData_Tool::UpdateChildObjectName( anOldCaseName, theName, aRegZone );
       }
     }
 
-    HYDROData_SequenceOfObjects aGroups = GetGeometryGroups();
+    HYDROData_SequenceOfObjects aGroups = GetSplittedGroups();
 
     anIter.Init( aGroups );
     for ( ; anIter.More(); anIter.Next() )
     {
-      Handle(HYDROData_SplittedEdgesGroup) aGroup =
-        Handle(HYDROData_SplittedEdgesGroup)::DownCast( anIter.Value() );
+      Handle(HYDROData_SplittedShapesGroup) aGroup =
+        Handle(HYDROData_SplittedShapesGroup)::DownCast( anIter.Value() );
       if ( aGroup.IsNull() )
         continue;
 
-      QString aGroupName = aGroup->GetName();
-      if ( aGroupName.startsWith( anOldCaseName ) )
-      {
-        aGroupName.replace( anOldCaseName, theName );
-        aGroup->SetName( aGroupName );
-      }
+      HYDROData_Tool::UpdateChildObjectName( anOldCaseName, theName, aGroup );
     }
   }
 
@@ -117,20 +131,14 @@ void HYDROData_CalculationCase::SetName( const QString& theName )
 
 QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
-  QStringList aResList;
+  QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  aResList.prepend( "# Calculation case" );
 
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
-  if ( aDocument.IsNull() )
-    return aResList;
-                             
-  QString aDocName = aDocument->GetDocPyName();
-  QString aCalculName = GetName();
-
-  aResList << QString( "%1 = %2.CreateObject( %3 );" )
-              .arg( aCalculName ).arg( aDocName ).arg( PYTHON_CALCULATION_ID );
-  aResList << QString( "%1.SetName( \"%2\" );" )
-              .arg( aCalculName ).arg( aCalculName );
-  aResList << QString( "" );
+  QString aCalculName = GetObjPyName();
+
+  AssignmentMode aMode = GetAssignmentMode();
+  QString aModeStr = aMode==MANUAL ? "HYDROData_CalculationCase.MANUAL" : "HYDROData_CalculationCase.AUTOMATIC";
+  aResList << QString( "%0.SetAssignmentMode( %1 )" ).arg( aCalculName ).arg( aModeStr );
 
   HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
   HYDROData_SequenceOfObjects::Iterator anIter( aGeomObjects );
@@ -138,31 +146,122 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
   {
     Handle(HYDROData_Object) aRefGeomObj =
       Handle(HYDROData_Object)::DownCast( anIter.Value() );
-    if ( !aRefGeomObj.IsNull() )
-      setPythonReferenceObject( theTreatedObjects, aResList, aRefGeomObj, "AddGeometryObject" );
+    setPythonReferenceObject( theTreatedObjects, aResList, aRefGeomObj, "AddGeometryObject" );
   }
   aResList << QString( "" );
 
-  aResList << QString( "%1.SplitGeometryObjects();" ).arg( aCalculName );
-  aResList << QString( "" );
+  QString aGroupName = HYDROData_Tool::GenerateNameForPython( theTreatedObjects, "case_geom_group" );
 
-  // Now we restore the regions and zones order
-  HYDROData_SequenceOfObjects aRegions = GetRegions();
-  anIter.Init( aRegions );
+  HYDROData_SequenceOfObjects aGeomGroups = GetGeometryGroups();
+  anIter.Init( aGeomGroups );
   for ( ; anIter.More(); anIter.Next() )
   {
-    Handle(HYDROData_Region) aRegion =
-      Handle(HYDROData_Region)::DownCast( anIter.Value() );
-    if ( aRegion.IsNull() )
+    Handle(HYDROData_ShapesGroup) aGeomGroup =
+      Handle(HYDROData_ShapesGroup)::DownCast( anIter.Value() );
+    if ( aGeomGroup.IsNull() )
+      continue;
+
+    Handle(HYDROData_Object) aFatherGeom =
+      Handle(HYDROData_Object)::DownCast( aGeomGroup->GetFatherObject() );
+    if ( aFatherGeom.IsNull() )
       continue;
 
-    QString aRegionName = aRegion->GetName();
-    // TODO
+    int aGroupId = aFatherGeom->GetGroupId( aGeomGroup );
+    aResList << QString( "%1 = %2.GetGroup( %3 );" )
+              .arg( aGroupName ).arg( aFatherGeom->GetObjPyName() ).arg( aGroupId );
+
+    aResList << QString( "%1.AddGeometryGroup( %2 );" ).arg( aCalculName ).arg( aGroupName );
   }
 
+  Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
+  setPythonReferenceObject( theTreatedObjects, aResList, aBoundaryPolyline, "SetBoundaryPolyline" );
+
+  if( aMode==AUTOMATIC )
+    DumpRulesToPython( aCalculName, aResList );
+
+  aResList << QString( "" );
+  aResList << "# Start the algorithm of the partition and assignment";
+  aResList << QString( "%1.Update();" ).arg( aCalculName );
+
+  if( aMode==MANUAL )
+  {
+    // Now we restore the regions and zones order
+    HYDROData_SequenceOfObjects aRegions = GetRegions();
+    anIter.Init( aRegions );
+    for ( ; anIter.More(); anIter.Next() )
+    {
+      Handle(HYDROData_Region) aRegion =
+        Handle(HYDROData_Region)::DownCast( anIter.Value() );
+      if ( aRegion.IsNull() )
+        continue;
+
+      theTreatedObjects.insert( aRegion->GetName(), aRegion );
+      QStringList aRegDump = aRegion->DumpToPython( theTreatedObjects );
+      aResList << aRegDump;
+    }
+  }
+
+  // Export calculation case
+  aResList << QString( "" );
+  aResList << "# Export of the calculation case";
+  QString aStudyName = "theStudy";
+  QString anEntryVar = aCalculName + "_entry";
+  aResList << QString( "%1 = %2.Export( %3._get_StudyId() )" ).arg( anEntryVar ).arg( aCalculName ).arg( aStudyName );
+
+  // Get geometry object and print debug information
+  aResList << "";
+  aResList << "# Get geometry shape and print debug information";
+  aResList << "import GEOM";
+  aResList << QString( "print \"Entry:\", %1" ).arg( anEntryVar );
+  QString aGeomShapeName = aCalculName + "_geom";
+  aResList << QString( "%1 = salome.IDToObject( str( %2 ) )" ).arg( aGeomShapeName ).arg( anEntryVar );
+  aResList << QString( "print \"Geom shape:\", %1" ).arg( aGeomShapeName );
+  aResList << QString( "print \"Geom shape name:\", %1.GetName()" ).arg( aGeomShapeName );
+
+  DumpSampleMeshing( aResList, aStudyName, aGeomShapeName, aCalculName+"_mesh" );
+
+  aResList << QString( "" );
   return aResList;
 }
 
+void HYDROData_CalculationCase::DumpSampleMeshing( QStringList& theResList,
+                                                   const QString& theStudyName,
+                                                   const QString& theGeomShapeName,
+                                                   const QString& theMeshName ) const
+{
+  theResList << "";
+  theResList << "# Meshing";
+  theResList << "import SMESH, SALOMEDS";
+  theResList << "from salome.smesh import smeshBuilder";
+  theResList << "from salome.geom import geomBuilder";
+
+  theResList << QString( "smesh = smeshBuilder.New( %1 )" ).arg( theStudyName );
+  theResList << QString( "%1 = smesh.Mesh( %2 )" ).arg( theMeshName ).arg( theGeomShapeName );
+  theResList << QString( "MEFISTO_2D = %1.Triangle( algo=smeshBuilder.MEFISTO )" ).arg( theMeshName );
+  theResList << "Max_Element_Area_1 = MEFISTO_2D.MaxElementArea( 10 )";
+  theResList << QString( "Regular_1D = %1.Segment()" ).arg( theMeshName );
+  theResList << "Max_Size_1 = Regular_1D.MaxSize(10)";
+  theResList << QString( "isDone = %1.Compute()" ).arg( theMeshName );
+
+  theResList << "";
+  theResList << "# Set names of Mesh objects";
+  theResList << "smesh.SetName( MEFISTO_2D.GetAlgorithm(), 'MEFISTO_2D' )";
+  theResList << "smesh.SetName( Regular_1D.GetAlgorithm(), 'Regular_1D' )";
+  theResList << "smesh.SetName( Max_Size_1, 'Max Size_1' )";
+  theResList << "smesh.SetName( Max_Element_Area_1, 'Max. Element Area_1' )";
+  theResList << QString( "smesh.SetName( %1.GetMesh(), '%1' )" ).arg( theMeshName );
+
+  theResList << "";
+  theResList << "# Greate SMESH groups";
+  theResList << QString( "geompy = geomBuilder.New( %1 )" ).arg( theStudyName );
+  theResList << QString( "geom_groups = geompy.GetGroups( %1 )" ).arg( theGeomShapeName );
+  theResList << QString( "for group in geom_groups:" );
+  theResList << QString( "    smesh_group = %1.GroupOnGeom(group, group.GetName(), SMESH.EDGE)" )
+                .arg( theMeshName );
+  theResList << QString( "    smesh.SetName(smesh_group, group.GetName())" );
+  theResList << QString( "    print \"SMESH group '%s': %s\" % (smesh_group.GetName(), smesh_group)" );
+}
+
 HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetAllReferenceObjects() const
 {
   HYDROData_SequenceOfObjects aResSeq = HYDROData_Entity::GetAllReferenceObjects();
@@ -180,6 +279,7 @@ HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetAllReferenceObjects()
 void HYDROData_CalculationCase::Update()
 {
   HYDROData_Entity::Update();
+  SetWarning();
 
   // At first we remove previously created objects
   RemoveRegions();
@@ -196,83 +296,165 @@ void HYDROData_CalculationCase::Update()
 
   HYDROData_SequenceOfObjects aGeomGroups = GetGeometryGroups();
 
-  HYDROData_SplitToZonesTool::SplitDataList aSplitedObjects =
+  HYDROData_SplitToZonesTool::SplitDataList aSplitObjects =
     HYDROData_SplitToZonesTool::Split( aGeomObjects, aGeomGroups, aBoundaryPolyline );
-  if ( aSplitedObjects.isEmpty() )
+  if ( aSplitObjects.isEmpty() )
     return;
 
-  QString aRegsPref = CALCULATION_REGIONS_PREF;
-  QString aZonesPref = CALCULATION_ZONES_PREF;
-
-  QMap<QString,Handle(HYDROData_SplittedEdgesGroup)> aSplittedEdgesGroupsMap;
+  HYDROData_SplitToZonesTool::SplitDataList aZonesList, anEdgesList;
 
-  // Create result regions for case, by default one zone for one region
-  HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitedObjects );
+  HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitObjects );
   while( anIter.hasNext() )
   {
     const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
-
     if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Zone )
-    {
-      // Create new region
-      Handle(HYDROData_Region) aRegion = addNewRegion();
+      aZonesList.append( aSplitData );
+    else if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Edge )
+      anEdgesList.append( aSplitData );
+  }
 
-      QString aRegionName = HYDROData_Tool::GenerateObjectName( aDocument, aRegsPref );
-      aRegion->SetName( aRegionName );
+  switch( GetAssignmentMode() )
+  {
+  case MANUAL:
+    CreateRegionsDef( aDocument, aZonesList );
+    break;
+  case AUTOMATIC:
+    CreateRegionsAuto( aDocument, aZonesList );
+    break;
+  }
+  CreateEdgeGroupsDef( aDocument, anEdgesList );
+}
 
-      // Add the zone for region
-      Handle(HYDROData_Zone) aRegionZone = aRegion->addNewZone();
+void HYDROData_CalculationCase::CreateRegionsDef( const Handle(HYDROData_Document)& theDoc,
+                                                  const HYDROData_SplitToZonesTool::SplitDataList& theZones )
+{
+  // Create result regions for case, by default one zone for one region
+  QString aRegsPref = CALCULATION_REGIONS_PREF;
+  QString aZonesPref = CALCULATION_ZONES_PREF;
 
-      QString aZoneName = HYDROData_Tool::GenerateObjectName( aDocument, aZonesPref );
-      aRegionZone->SetName( aZoneName );
+  HYDROData_SplitToZonesTool::SplitDataListIterator anIter( theZones );
+  while( anIter.hasNext() )
+  {
+    const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
+    // Create new region
+    Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegsPref );
 
-      aRegionZone->SetShape( aSplitData.Face() );
+    // Add the zone for region
+    Handle(HYDROData_Zone) aRegionZone = aRegion->addNewZone( theDoc, aZonesPref, aSplitData.Face(), aSplitData.ObjectNames );
+  }
+}
 
-      // Add the reference object for zone
-      for ( int i = 0, n = aSplitData.ObjectNames.length(); i < n; ++i )
-      {
-        const QString& anObjName = aSplitData.ObjectNames.at( i );
-        
-        Handle(HYDROData_Object) aRefObject = Handle(HYDROData_Object)::DownCast(
-          HYDROData_Tool::FindObjectByName( aDocument, anObjName ) );
-        if ( aRefObject.IsNull() )
-          continue;
+void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Document)& theDoc,
+                                                   const HYDROData_SplitToZonesTool::SplitDataList& theZones )
+{
+  QMap<QString, Handle(HYDROData_Region)> aRegionsMap; //object name to region
+  QMap<QString, QString> aRegionNameToObjNameMap;
+  QString aZonesPref = CALCULATION_ZONES_PREF;
+  HYDROData_PriorityQueue aPr( this );
 
-        aRegionZone->AddGeometryObject( aRefObject );
-      }
-    }
-    else if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Edge )
-    {
-      // Create new edges group
-      if ( aSplitData.ObjectNames.isEmpty() || 
-           aSplitData.Shape.IsNull() || aSplitData.Shape.ShapeType() != TopAbs_EDGE )
-        continue;
+  // 1. First we create a default region for each object included into the calculation case
+  HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
+  for( int i=aGeomObjects.Lower(), n=aGeomObjects.Upper(); i<=n; i++ )
+  {
+    Handle(HYDROData_Object) anObj = Handle(HYDROData_Object)::DownCast( aGeomObjects.Value( i ) );
+    if( anObj.IsNull() )
+      continue;
+    QString anObjName = anObj->GetName();
+    QString aRegName = anObjName + "_reg";
+    Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegName, false );
+    aRegionsMap.insert( anObjName, aRegion );
+    aRegionNameToObjNameMap.insert( aRegName, anObjName );
+  }
 
-      QString anObjName = aSplitData.ObjectNames.first();
-      if ( anObjName.isEmpty() )
-        continue;
+  // 2. Now for each zone it is necessary to determine the most priority object
+  //    and assign to zone to corresponding region
+  HYDROData_SplitToZonesTool::SplitDataListIterator anIter( theZones );
+  while( anIter.hasNext() )
+  {
+    const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
+    HYDROData_Zone::MergeAltitudesType aMergeType;
+    Handle(HYDROData_Object) aRegObj = aPr.GetMostPriorityObject( aSplitData.ObjectNames, aMergeType );
+    if( aRegObj.IsNull() )
+      continue;
+    Handle(HYDROData_Region) aRegion = aRegionsMap[aRegObj->GetName()];
+    if( aRegion.IsNull() )
+      continue;
+    Handle(HYDROData_Zone) aRegionZone = aRegion->addNewZone( theDoc, aZonesPref, aSplitData.Face(), aSplitData.ObjectNames );
 
-      Handle(HYDROData_SplittedEdgesGroup) aSplittedGroup;
-      if ( !aSplittedEdgesGroupsMap.contains( anObjName ) )
-      {
-        aSplittedGroup = addNewSplittedGroup();
+    if( aSplitData.ObjectNames.count() > 1 && aMergeType==HYDROData_Zone::Merge_UNKNOWN )
+    {
+      qDebug( "Error in algorithm: unresolved conflicts" );
+    }
 
-        QString aCalcGroupName = CALCULATION_GROUPS_PREF + anObjName;
-        aSplittedGroup->SetName( aCalcGroupName );
+    switch( aMergeType )
+    {
+    case HYDROData_Zone::Merge_ZMIN:
+    case HYDROData_Zone::Merge_ZMAX:
+      aRegionZone->SetMergeType( aMergeType );
+      break;
+    case HYDROData_Zone::Merge_Object:
+      aRegionZone->SetMergeType( aMergeType );
+      aRegionZone->RemoveMergeAltitude();
+      aRegionZone->SetMergeAltitude( aRegObj->GetAltitudeObject() );
+      break;
+    }
+  }
 
-        aSplittedEdgesGroupsMap.insert( anObjName, aSplittedGroup );
-      }
-      else
-      {
-        aSplittedGroup = aSplittedEdgesGroupsMap[ anObjName ];
-      }
+  QStringList anObjectsWithEmptyRegions;
+  QMap<QString, Handle(HYDROData_Region)>::const_iterator
+    anIt = aRegionsMap.begin(), aLast = aRegionsMap.end();
+  for( ; anIt!=aLast; anIt++ )
+  {
+    Handle(HYDROData_Region) aRegion = anIt.value();
+    if( aRegion->GetZones().IsEmpty() )
+    {
+      QString aRegName = aRegion->GetName();
+      QString anObjName = aRegionNameToObjNameMap[aRegName];
+      anObjectsWithEmptyRegions.append( anObjName );
+    }
+  }
+  
+  if( !anObjectsWithEmptyRegions.empty() )
+  {
+    QString aData = anObjectsWithEmptyRegions.join( ", " );
+    SetWarning( WARN_EMPTY_REGIONS, aData );
+  }
+}
 
-      if ( aSplittedGroup.IsNull() )
-        continue;
+void HYDROData_CalculationCase::CreateEdgeGroupsDef( const Handle(HYDROData_Document)& theDoc,
+                                                     const HYDROData_SplitToZonesTool::SplitDataList& theEdges )
+{
+  QMap<QString,Handle(HYDROData_SplittedShapesGroup)> aSplittedEdgesGroupsMap;
 
-      TopoDS_Edge anEdge = TopoDS::Edge( aSplitData.Shape );
-      aSplittedGroup->AddEdge( anEdge );
+  HYDROData_SplitToZonesTool::SplitDataListIterator anIter( theEdges );
+  while( anIter.hasNext() )
+  {
+    const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
+    // Create new edges group
+    if ( aSplitData.ObjectNames.isEmpty() || aSplitData.Shape.IsNull() )
+      continue;
+
+    QString anObjName = aSplitData.ObjectNames.first();
+    if ( anObjName.isEmpty() )
+      continue;
+#ifdef DEB_CALCULATION
+    QString aStr = aSplitData.ObjectNames.join(" "); 
+	  cout << " CCase: Names = "<<aStr.toStdString() << " size = " <<aSplitData.ObjectNames.size() <<endl; 
+#endif
+    Handle(HYDROData_SplittedShapesGroup) aSplittedGroup;
+    if ( !aSplittedEdgesGroupsMap.contains( anObjName ) )
+    {
+      aSplittedGroup = addNewSplittedGroup( CALCULATION_GROUPS_PREF + anObjName );
+      aSplittedEdgesGroupsMap.insert( anObjName, aSplittedGroup );
     }
+    else
+    {
+      aSplittedGroup = aSplittedEdgesGroupsMap[ anObjName ];
+    }
+    if ( aSplittedGroup.IsNull() )
+      continue;
+
+    aSplittedGroup->AddShape( aSplitData.Shape );
   }
 }
 
@@ -316,7 +498,7 @@ void HYDROData_CalculationCase::RemoveGeometryObjects()
   SetToUpdate( true );
 }
 
-bool HYDROData_CalculationCase::AddGeometryGroup( const Handle(HYDROData_EdgesGroup)& theGroup )
+bool HYDROData_CalculationCase::AddGeometryGroup( const Handle(HYDROData_ShapesGroup)& theGroup )
 {
   if ( theGroup.IsNull() )
     return false;
@@ -337,7 +519,7 @@ HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetGeometryGroups() const
   return GetReferenceObjects( DataTag_GeometryGroup );
 }
 
-void HYDROData_CalculationCase::RemoveGeometryGroup( const Handle(HYDROData_EdgesGroup)& theGroup )
+void HYDROData_CalculationCase::RemoveGeometryGroup( const Handle(HYDROData_ShapesGroup)& theGroup )
 {
   if ( theGroup.IsNull() )
     return;
@@ -384,20 +566,11 @@ void HYDROData_CalculationCase::RemoveBoundaryPolyline()
 
 Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(HYDROData_Zone)& theZone )
 {
-  Handle(HYDROData_Region) aNewRegion = addNewRegion();
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF );
   if ( aNewRegion.IsNull() )
     return aNewRegion;
 
-  // Generate new name for new region
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
-  if ( !aDocument.IsNull() )
-  {
-    QString aRegsPref = CALCULATION_REGIONS_PREF;
-
-    QString aNewRegionName = HYDROData_Tool::GenerateObjectName( aDocument, aRegsPref );
-    aNewRegion->SetName( aNewRegionName );
-  }
-
   aNewRegion->AddZone( theZone );
 
   return aNewRegion;
@@ -405,6 +578,8 @@ Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(H
 
 bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRegion )
 {
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+
   if ( theRegion.IsNull() )
     return false;
   
@@ -416,7 +591,7 @@ bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRe
     Handle(HYDROData_CalculationCase)::DownCast( theRegion->GetFatherObject() );
   if ( !aFatherCalc.IsNull() && aFatherCalc->Label() != myLab )
   {
-    Handle(HYDROData_Region) aNewRegion = addNewRegion();
+    Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF );
     theRegion->CopyTo( aNewRegion );
 
     aFatherCalc->RemoveRegion( theRegion );
@@ -499,147 +674,37 @@ void HYDROData_CalculationCase::RemoveSplittedGroups()
   myLab.FindChild( DataTag_SplittedGroups ).ForgetAllAttributes();
 }
 
-TopoDS_Shell HYDROData_CalculationCase::GetShell()
+double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) const
 {
-  TopoDS_Shell aShell;
-
-  TopTools_ListOfShape aFacesList;
-
-  // Make shell containing all region shapes
-  BRepBuilderAPI_Sewing aSewing( Precision::Confusion()*10.0 );
-
-  HYDROData_SequenceOfObjects aCaseRegions = GetRegions();
-  HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions );
-  for ( ; aRegionIter.More(); aRegionIter.Next() ) {
-    Handle(HYDROData_Region) aRegion =
-      Handle(HYDROData_Region)::DownCast( aRegionIter.Value() );
-    if( aRegion.IsNull() ) {
-      continue;
-    }
+  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
+  return GetAltitudeForPoint( thePoint, aZone );
+}
 
-    TopoDS_Shape aRegionShape = aRegion->GetShape();
-    if( !aRegionShape.IsNull() ) {
-      if ( aRegionShape.ShapeType() == TopAbs_FACE ) {
-        TopoDS_Face aFace = TopoDS::Face( aRegionShape );
-        if ( !aFace.IsNull() ) {
-          aFacesList.Append( aFace );
-          aSewing.Add( aFace );
-        }
-      } else {
-        TopExp_Explorer anExp( aRegionShape, TopAbs_FACE );
-        for ( ; anExp.More(); anExp.Next() ) {
-          TopoDS_Face aFace = TopoDS::Face( anExp.Current() );
-          if ( !aFace.IsNull() ) {
-            aFacesList.Append( aFace );
-            aSewing.Add( aFace );
-          }
-        }
-      }
-    }
-  } // regions iterator
-  
-  aSewing.Perform();
-  TopoDS_Shape aSewedShape = aSewing.SewedShape();
+double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&                    thePoint,
+                                                       const Handle(HYDROData_Region)& theRegion ) const
+{
+  double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
 
-  if ( !aSewedShape.IsNull() )
+  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
+  if ( !aZone.IsNull() )
   {
-    if ( aSewedShape.ShapeType() == TopAbs_FACE && aCaseRegions.Length() ==1 ) {
-      // create shell from one face
-      BRep_Builder aBuilder;
-      aBuilder.MakeShell( aShell );
-      aBuilder.Add( aShell, aSewedShape);
-    } else {
-      TopExp_Explorer anExpShells( aSewedShape, TopAbs_SHELL );
-      Standard_Integer aNbOfShells = 0;
-      for ( ; anExpShells.More(); anExpShells.Next() ) {
-        aShell = TopoDS::Shell( anExpShells.Current() );
-        aNbOfShells++;
-      }
-
-      if ( aNbOfShells != 1 ) {
-        aShell.Nullify();
-        BRep_Builder aBuilder;
-        aBuilder.MakeShell( aShell );
-
-        TopExp_Explorer anExpFaces( aSewedShape, TopAbs_FACE );
-        for ( ; anExpFaces.More(); anExpFaces.Next() ) {
-          TopoDS_Face aFace = TopoDS::Face( anExpFaces.Current() );
-          if ( !aFace.IsNull() ) {
-            aBuilder.Add( aShell, aFace );
-          }
-        }
-      }
-    }
+    Handle(HYDROData_Region) aRefRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
+    if ( IsEqual( aRefRegion, theRegion ) )
+      aResAltitude = GetAltitudeForPoint( thePoint, aZone );
   }
 
-  if ( !aShell.IsNull() ) {
-    TopTools_IndexedMapOfShape aMapOfFaces;
-    TopExp::MapShapes( aShell, TopAbs_FACE, aMapOfFaces );
-    if ( aMapOfFaces.Extent() != aFacesList.Extent() ) {
-      aShell.Nullify();
-      BRep_Builder aBuilder;
-      aBuilder.MakeShell( aShell );
-
-      TopTools_ListIteratorOfListOfShape anIter( aFacesList );
-      for ( ; anIter.More(); anIter.Next() ) {
-        TopoDS_Face aFace = TopoDS::Face( anIter.Value() );
-        aBuilder.Add( aShell, aFace );
-      }
-    }
-  }
-
-/* TODO: old version
-  // Make shell
-  BRep_Builder aBuilder;
-  aBuilder.MakeShell( aShell );
-
-  // Make shell containing all region shapes
-  HYDROData_SequenceOfObjects aCaseRegions = GetRegions();
-  HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions );
-  for ( ; aRegionIter.More(); aRegionIter.Next() ) {
-    Handle(HYDROData_Region) aRegion =
-      Handle(HYDROData_Region)::DownCast( aRegionIter.Value() );
-    if( aRegion.IsNull() ) {
-      continue;
-    }
-
-    TopoDS_Shape aRegionShape = aRegion->GetShape();
-
-    // Add shape (face or shell) corresponding to the region into the shell
-    if( !aRegionShape.IsNull() ) {
-      if ( aRegionShape.ShapeType() == TopAbs_FACE ) {
-        aBuilder.Add( aShell, aRegionShape );
-      } else {
-        TopExp_Explorer anExp( aRegionShape, TopAbs_FACE );
-        for( ; anExp.More(); anExp.Next() ) {
-          TopoDS_Face aFace = TopoDS::Face( anExp.Current() );
-          if( !aFace.IsNull() ) {
-            aBuilder.Add( aShell, aFace );
-          }
-        }
-      }
-    }
-  } // regions iterator
-*/
-
-  // Nullify shell if it is empty
-  if ( !aShell.IsNull() && !TopoDS_Iterator(aShell).More() ) {
-    aShell.Nullify();
-  }
-
-  return aShell;
+  return aResAltitude;
 }
 
-double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) const
+double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&                  thePoint,
+                                                       const Handle(HYDROData_Zone)& theZone ) const
 {
-  double aResAltitude = HYDROData_Bathymetry::GetInvalidAltitude();
-
-  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
-  if ( aZone.IsNull() )
+  double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
+  if ( theZone.IsNull() )
     return aResAltitude;
 
-  HYDROData_Zone::MergeBathymetriesType aZoneMergeType = aZone->GetMergeType();
-  if ( !aZone->IsMergingNeed() )
+  HYDROData_Zone::MergeAltitudesType aZoneMergeType = theZone->GetMergeType();
+  if ( !theZone->IsMergingNeed() )
   {
     aZoneMergeType = HYDROData_Zone::Merge_UNKNOWN;
   }
@@ -648,15 +713,24 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) c
     return aResAltitude;
   }
 
+  HYDROData_IInterpolator* aZoneInterpolator = theZone->GetInterpolator();
   if ( aZoneMergeType == HYDROData_Zone::Merge_Object )
   {
-    Handle(HYDROData_Bathymetry) aMergeBathymetry = aZone->GetMergeBathymetry();
-    if ( !aMergeBathymetry.IsNull() )
-      aResAltitude = aMergeBathymetry->GetAltitudeForPoint( thePoint );
+    Handle(HYDROData_IAltitudeObject) aMergeAltitude = theZone->GetMergeAltitude();
+    if ( !aMergeAltitude.IsNull() )
+    {
+      if ( aZoneInterpolator != NULL )
+      {
+        aZoneInterpolator->SetAltitudeObject( aMergeAltitude );
+        aResAltitude = aZoneInterpolator->GetAltitudeForPoint( thePoint );
+      }
+      else
+        aResAltitude = aMergeAltitude->GetAltitudeForPoint( thePoint );
+    }
   }
   else
   {
-    HYDROData_SequenceOfObjects aZoneObjects = aZone->GetGeometryObjects();
+    HYDROData_SequenceOfObjects aZoneObjects = theZone->GetGeometryObjects();
     HYDROData_SequenceOfObjects::Iterator anIter( aZoneObjects );
     for ( ; anIter.More(); anIter.Next() )
     {
@@ -665,12 +739,20 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) c
       if ( aZoneObj.IsNull() )
         continue;
 
-      Handle(HYDROData_Bathymetry) anObjBathymetry = aZoneObj->GetBathymetry();
-      if ( anObjBathymetry.IsNull() )
+      Handle(HYDROData_IAltitudeObject) anObjAltitude = aZoneObj->GetAltitudeObject();
+      if ( anObjAltitude.IsNull() )
         continue;
 
-      double aPointAltitude = anObjBathymetry->GetAltitudeForPoint( thePoint );
-      if ( ValuesEquals( aPointAltitude, HYDROData_Bathymetry::GetInvalidAltitude() ) )
+      double aPointAltitude = 0.0;
+      if ( aZoneInterpolator != NULL )
+      {
+        aZoneInterpolator->SetAltitudeObject( anObjAltitude );
+        aPointAltitude = aZoneInterpolator->GetAltitudeForPoint( thePoint );
+      }
+      else
+        aPointAltitude = anObjAltitude->GetAltitudeForPoint( thePoint );
+
+      if ( ValuesEquals( aPointAltitude, HYDROData_IAltitudeObject::GetInvalidAltitude() ) )
         continue;
 
       if ( aZoneMergeType == HYDROData_Zone::Merge_UNKNOWN )
@@ -680,7 +762,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) c
       }
       else if ( aZoneMergeType == HYDROData_Zone::Merge_ZMIN )
       {
-        if ( ValuesEquals( aResAltitude, HYDROData_Bathymetry::GetInvalidAltitude() ) ||
+        if ( ValuesEquals( aResAltitude, HYDROData_IAltitudeObject::GetInvalidAltitude() ) ||
              aResAltitude > aPointAltitude )
         {
           aResAltitude = aPointAltitude;
@@ -688,7 +770,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) c
       }
       else if ( aZoneMergeType == HYDROData_Zone::Merge_ZMAX )
       {
-        if ( ValuesEquals( aResAltitude, HYDROData_Bathymetry::GetInvalidAltitude() ) ||
+        if ( ValuesEquals( aResAltitude, HYDROData_IAltitudeObject::GetInvalidAltitude() ) ||
              aResAltitude < aPointAltitude )
         {
           aResAltitude = aPointAltitude;
@@ -700,6 +782,51 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) c
   return aResAltitude;
 }
 
+NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints( 
+  const NCollection_Sequence<gp_XY>& thePoints,
+  const Handle(HYDROData_Region)&    theRegion ) const
+{
+  NCollection_Sequence<double> aResSeq;
+
+  for ( int i = 1, n = thePoints.Length(); i <= n; ++i )
+  {
+    const gp_XY& thePnt = thePoints.Value( i );
+    
+    double anAltitude = GetAltitudeForPoint( thePnt, theRegion );
+    aResSeq.Append( anAltitude );
+  }
+
+  return aResSeq;
+}
+
+NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints( 
+  const NCollection_Sequence<gp_XY>& thePoints,
+  const Handle(HYDROData_Zone)&      theZone ) const
+{
+  NCollection_Sequence<double> aResSeq;
+
+  for ( int i = 1, n = thePoints.Length(); i <= n; ++i )
+  {
+    const gp_XY& thePnt = thePoints.Value( i );
+    
+    double anAltitude = GetAltitudeForPoint( thePnt, theZone );
+    aResSeq.Append( anAltitude );
+  }
+
+  return aResSeq;
+}
+
+Handle(HYDROData_Region) HYDROData_CalculationCase::GetRegionFromPoint( const gp_XY& thePoint ) const
+{
+  Handle(HYDROData_Region) aResRegion;
+
+  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
+  if ( !aZone.IsNull() )
+    aResRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
+
+  return aResRegion;
+}
+
 Handle(HYDROData_Zone) HYDROData_CalculationCase::GetZoneFromPoint( const gp_XY& thePoint ) const
 {
   Handle(HYDROData_Zone) aResZone;
@@ -743,83 +870,152 @@ HYDROData_CalculationCase::PointClassification HYDROData_CalculationCase::GetPoi
   TopoDS_Face aZoneFace = TopoDS::Face( theZone->GetShape() );
   if ( aZoneFace.IsNull() )
     return aRes;
-
-  BRepTopAdaptor_FClass2d aClassifier( aZoneFace, Precision::Confusion() );
-  TopAbs_State State = aClassifier.Perform( gp_Pnt2d(thePoint), Standard_False );
+#ifdef DEB_CLASS2D      
+	  TopoDS_Compound aCmp;
+      BRep_Builder aBB;
+      aBB.MakeCompound(aCmp);
+	  aBB.Add(aCmp, aZoneFace);
+	  gp_Pnt aPnt (thePoint.X(), thePoint.Y(), 0.);
+	  BRepBuilderAPI_MakeVertex aMk(aPnt);
+	  aBB.Add(aCmp, aMk.Vertex());
+	  BRepTools::Write(aCmp, "FCL2d.brep");
+#endif  
+  TopAbs_State State = HYDROData_Tool::ComputePointState(thePoint, aZoneFace);
   if (State == TopAbs_OUT)
-	aRes =  POINT_OUT;
+    aRes =  POINT_OUT;
   else if(State == TopAbs_IN)
     aRes =  POINT_IN;
   else if(State == TopAbs_ON)
-    aRes =  POINT_ON;	  
+    aRes =  POINT_ON;
   return aRes;
 }
 
-Handle(HYDROData_Region) HYDROData_CalculationCase::addNewRegion()
+Handle(HYDROData_Region) HYDROData_CalculationCase::addNewRegion( const Handle(HYDROData_Document)& theDoc,
+                                                                  const QString& thePrefixOrName,
+                                                                  bool isPrefix )
 {
   TDF_Label aNewLab = myLab.FindChild( DataTag_ChildRegion ).NewChild();
+  int aTag = aNewLab.Tag();
 
   Handle(HYDROData_Region) aNewRegion =
     Handle(HYDROData_Region)::DownCast( HYDROData_Iterator::CreateObject( aNewLab, KIND_REGION ) );
   AddRegion( aNewRegion );
 
+  QString aRegionName = isPrefix ? HYDROData_Tool::GenerateObjectName( theDoc, thePrefixOrName ) : thePrefixOrName;
+  aNewRegion->SetName( aRegionName );
+
   return aNewRegion;
 }
 
-Handle(HYDROData_SplittedEdgesGroup) HYDROData_CalculationCase::addNewSplittedGroup()
+Handle(HYDROData_SplittedShapesGroup) HYDROData_CalculationCase::addNewSplittedGroup( const QString& theName )
 {
   TDF_Label aNewLab = myLab.FindChild( DataTag_SplittedGroups ).NewChild();
 
-  Handle(HYDROData_SplittedEdgesGroup) aNewGroup =
-    Handle(HYDROData_SplittedEdgesGroup)::DownCast( 
+  Handle(HYDROData_SplittedShapesGroup) aNewGroup =
+    Handle(HYDROData_SplittedShapesGroup)::DownCast( 
       HYDROData_Iterator::CreateObject( aNewLab, KIND_SPLITTED_GROUP ) );
   AddReferenceObject( aNewGroup, DataTag_SplittedGroups );
 
+  aNewGroup->SetName( theName );
+
   return aNewGroup;
 }
 
-bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
-                                        SALOMEDS::Study_ptr theStudy )
+QString HYDROData_CalculationCase::Export( int theStudyId ) const
+{
+  GEOM::GEOM_Gen_var aGEOMEngine = HYDROData_GeomTool::GetGeomGen();
+  SALOMEDS::Study_var aDSStudy = HYDROData_GeomTool::GetStudyByID( theStudyId );
+  
+  QString aGeomObjEntry;
+  bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry );
+  return isOK ? aGeomObjEntry : QString();
+}
+
+bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var  theGeomEngine,
+                                        SALOMEDS::Study_ptr theStudy,
+                                        QString& theGeomObjEntry ) const
 {
+  HYDROData_ShapesGroup::SeqOfGroupsDefs aSeqOfGroupsDefs;
+
+  // Get groups definitions
+  HYDROData_SequenceOfObjects aSplittedGroups = GetSplittedGroups();
+
+  HYDROData_SequenceOfObjects::Iterator anIter( aSplittedGroups );
+  for ( ; anIter.More(); anIter.Next() )
+  {
+    // Get shapes group
+    Handle(HYDROData_ShapesGroup) aGroup =
+      Handle(HYDROData_ShapesGroup)::DownCast( anIter.Value() );
+    if ( aGroup.IsNull() )
+      continue;
+
+    HYDROData_ShapesGroup::GroupDefinition aGroupDef;
+
+    aGroupDef.Name = aGroup->GetName().toLatin1().constData();
+    aGroup->GetShapes( aGroupDef.Shapes );
+
+    aSeqOfGroupsDefs.Append( aGroupDef );
+  }
+  
   // Get faces
-  // TODO
   TopTools_ListOfShape aFaces;
+  HYDROData_SequenceOfObjects aCaseRegions = GetRegions();
+  HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions );
+  for ( ; aRegionIter.More(); aRegionIter.Next() )
+  {
+    Handle(HYDROData_Region) aRegion =
+      Handle(HYDROData_Region)::DownCast( aRegionIter.Value() );
+    if( aRegion.IsNull() )
+      continue;
 
-  // Get groups
-  // TODO
-  HYDROData_SequenceOfObjects aSplittedGroups;
+    TopoDS_Shape aRegionShape = aRegion->GetShape( &aSeqOfGroupsDefs );
+    aFaces.Append( aRegionShape );
+  }
 
-  return Export( theGeomEngine, theStudy, aFaces, aSplittedGroups );
+  return Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs, theGeomObjEntry );
 }
 
-bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
-                                        SALOMEDS::Study_ptr theStudy,
-                                        const TopTools_ListOfShape& theFaces,
-                                        const HYDROData_SequenceOfObjects& theSplittedGroups )
+bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var                            theGeomEngine,
+                                        SALOMEDS::Study_ptr                           theStudy,
+                                        const TopTools_ListOfShape&                   theFaces,
+                                        const HYDROData_ShapesGroup::SeqOfGroupsDefs& theGroupsDefs,
+                                        QString& theGeomObjEntry ) const
 {
-  // Make shell from the faces
-  TopoDS_Shell aShell;
-  TopTools_ListOfShape aFacesList;
-
-  BRepBuilderAPI_Sewing aSewing( Precision::Confusion()*10.0 );
-
+  // Sew faces
+  BRepBuilderAPI_Sewing aSewing( Precision::Confusion() * 10.0 );
+  aSewing.SetNonManifoldMode( Standard_False );
+#ifdef DEB_CALCULATION
+  TCollection_AsciiString aNam("Sh_");
+  int i=1;
+#endif
   TopTools_ListIteratorOfListOfShape aFaceIter( theFaces );
-  for ( ; aFaceIter.More(); aFaceIter.Next() ) {
+  for ( ; aFaceIter.More(); aFaceIter.Next() )
+  {
     TopoDS_Shape aShape = aFaceIter.Value();
-    if ( !aShape.IsNull() && (aShape.ShapeType() == TopAbs_FACE) ) {
-      TopoDS_Face aFace = TopoDS::Face( aShape );
-      if ( !aFace.IsNull() ) {
-        aFacesList.Append( aFace );
-        aSewing.Add( aFace );
-      }
-    } else {
+    if ( aShape.IsNull() )
+      continue;
+
+    if ( aShape.ShapeType() == TopAbs_FACE )
+    {
+      aSewing.Add( aShape );
+#ifdef DEB_CALCULATION
+      TCollection_AsciiString aName = aNam + ++i + ".brep";
+      BRepTools::Write(aShape ,aName.ToCString());
+#endif
+    }
+    else
+    {
+#ifdef DEB_CALCULATION
+      int j = 1;
+#endif
       TopExp_Explorer anExp( aShape, TopAbs_FACE );
-      for ( ; anExp.More(); anExp.Next() ) {
-        TopoDS_Face aFace = TopoDS::Face( anExp.Current() );
-        if ( !aFace.IsNull() ) {
-          aFacesList.Append( aFace );
-          aSewing.Add( aFace );
-        }
+      for (; anExp.More(); anExp.Next() ) {
+        aSewing.Add( anExp.Current() );
+#ifdef DEB_CALCULATION
+
+        TCollection_AsciiString aName = aNam + i + "_" + ++j + ".brep";
+        BRepTools::Write(anExp.Current() ,aName.ToCString());
+#endif
       }
     }
   } // faces iterator
@@ -827,77 +1023,107 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
   aSewing.Perform();
   TopoDS_Shape aSewedShape = aSewing.SewedShape();
 
-  if ( !aSewedShape.IsNull() ) {
-    if ( aSewedShape.ShapeType() == TopAbs_FACE && theFaces.Extent() ==1 ) {
-      // create shell from one face
-      BRep_Builder aBuilder;
-      aBuilder.MakeShell( aShell );
-      aBuilder.Add( aShell, aSewedShape);
-    } else {
-      TopExp_Explorer anExpShells( aSewedShape, TopAbs_SHELL );
-      Standard_Integer aNbOfShells = 0;
-      for ( ; anExpShells.More(); anExpShells.Next() ) {
-        aShell = TopoDS::Shell( anExpShells.Current() );
-        aNbOfShells++;
-      }
+  // If the sewed shape is empty - return false
+  if ( aSewedShape.IsNull() || !TopoDS_Iterator( aSewedShape ).More() )
+    return false;
+
+#ifdef DEB_CALCULATION
+  BRepTools::Write(aSewedShape ,"Sew.brep");
+#endif
+  // Publish the sewed shape
+  QString aName = EXPORT_NAME;
+  GEOM::GEOM_Object_ptr aMainShape = 
+    publishShapeInGEOM( theGeomEngine, theStudy, aSewedShape, aName, theGeomObjEntry );
+
+  if ( aMainShape->_is_nil() )  
+    return false;
+
+  if ( theGroupsDefs.IsEmpty() )
+    return true;
+
+  // Create groups
+  TopTools_IndexedMapOfShape aMapOfSubShapes;
+  TopExp::MapShapes( aSewedShape, aMapOfSubShapes );
+
+  NCollection_DataMap< TCollection_AsciiString, NCollection_Sequence<int> > aGroupsData;
 
-      if ( aNbOfShells != 1 ) {
-        aShell.Nullify();
-        BRep_Builder aBuilder;
-        aBuilder.MakeShell( aShell );
-
-        TopExp_Explorer anExpFaces( aSewedShape, TopAbs_FACE );
-        for ( ; anExpFaces.More(); anExpFaces.Next() ) {
-          TopoDS_Face aFace = TopoDS::Face( anExpFaces.Current() );
-          if ( !aFace.IsNull() ) {
-            aBuilder.Add( aShell, aFace );
-          }
+  for ( int aGrId = 1, nbGroups = theGroupsDefs.Length(); aGrId <= nbGroups; ++aGrId )
+  {
+    const HYDROData_ShapesGroup::GroupDefinition& aGroupDef = theGroupsDefs.Value( aGrId );
+
+    NCollection_Sequence<int> aGroupIndexes;
+    for( int i = 1, n = aGroupDef.Shapes.Length(); i <= n; i++ )
+    {
+      const TopoDS_Shape& aShape = aGroupDef.Shapes.Value( i );
+#ifdef DEB_CALCULATION
+      cout << "\nOld shape(" << i << ") = " << aShape.TShape() <<endl;
+#endif
+      
+      TopoDS_Shape aModifiedShape = aShape;
+      if ( aSewing.IsModified( aShape ) )
+        aModifiedShape = aSewing.Modified( aShape );
+      else if ( aSewing.IsModifiedSubShape( aShape ) )
+        aModifiedShape = aSewing.ModifiedSubShape( aShape );
+
+#ifdef DEB_CALCULATION
+      const TopLoc_Location& aL1 = aShape.Location();
+      const TopLoc_Location& aL2 = aModifiedShape.Location();
+      cout << "\nNew shape(" << i << ") = " << aModifiedShape.TShape() << " Location is Equal = " << aL1.IsEqual(aL2)<<endl;
+#endif
+
+      int anIndex = aMapOfSubShapes.FindIndex(aModifiedShape);
+      if ( anIndex > 0 ) {
+        aGroupIndexes.Append( anIndex );
+      } else {
+#ifdef DEB_CALCULATION    
+        TCollection_AsciiString aNam("Lost_");
+        if(!aMapOfSubShapes.Contains(aModifiedShape)) {
+        for ( int anIndex = 1; anIndex <= aMapOfSubShapes.Extent(); anIndex++ )
+        {
+           const TopoDS_Shape& aS = aMapOfSubShapes.FindKey( anIndex );
+           if ( aModifiedShape.IsPartner( aS ) )
+           {
+             cout <<"\nIndex in Map = " << anIndex << "TShape = " << aS.TShape() <<endl;
+             TCollection_AsciiString aName = aNam + i + "_" + anIndex + ".brep";
+             BRepTools::Write(aS ,aName.ToCString());
+            break;
+           }
+         }
         }
+#endif
       }
     }
+    if ( !aGroupIndexes.IsEmpty() )
+      aGroupsData.Bind( aGroupDef.Name, aGroupIndexes );
   }
+ 
+  if ( !aGroupsData.IsEmpty() )
+  {
+    GEOM::GEOM_IGroupOperations_var aGroupOp = 
+      theGeomEngine->GetIGroupOperations( theStudy->StudyId() );  
 
-  if ( !aShell.IsNull() ) {
-    TopTools_IndexedMapOfShape aMapOfFaces;
-    TopExp::MapShapes( aShell, TopAbs_FACE, aMapOfFaces );
-    if ( aMapOfFaces.Extent() != aFacesList.Extent() ) {
-      aShell.Nullify();
-      BRep_Builder aBuilder;
-      aBuilder.MakeShell( aShell );
-
-      TopTools_ListIteratorOfListOfShape anIter( aFacesList );
-      for ( ; anIter.More(); anIter.Next() ) {
-        TopoDS_Face aFace = TopoDS::Face( anIter.Value() );
-        aBuilder.Add( aShell, aFace );
-      }
-    }
-  }
+    NCollection_DataMap< TCollection_AsciiString, NCollection_Sequence<int> >::Iterator aMapIt( aGroupsData );
+    for ( ; aMapIt.More(); aMapIt.Next() )
+    {
+      const TCollection_AsciiString& aGroupName = aMapIt.Key(); 
+      const NCollection_Sequence<int>& aGroupIndexes = aMapIt.Value();
 
-  // If the shell is empty - return false
-  if ( aShell.IsNull() || !TopoDS_Iterator(aShell).More() ) {
-    return false;
-  }
+      GEOM::GEOM_Object_var aGeomGroup = aGroupOp->CreateGroup( aMainShape, TopAbs_EDGE );
+      if ( CORBA::is_nil( aGeomGroup ) || !aGroupOp->IsDone() )
+        continue;
 
-  // Publish the shell
-  QString aName = EXPORT_NAME;
-  GEOM::GEOM_Object_ptr aPublishedObj = 
-    publishShapeInGEOM( theGeomEngine, theStudy, aShell, aName );
+      GEOM::ListOfLong_var aGeomIndexes = new GEOM::ListOfLong;
+      aGeomIndexes->length( aGroupIndexes.Length() );
 
-  if ( aPublishedObj->_is_nil() ) {
-    return false;
-  }
+      for( int i = 1, n = aGroupIndexes.Length(); i <= n; i++ )
+        aGeomIndexes[ i - 1 ] = aGroupIndexes.Value( i );
 
-  // Create groups
-  GEOM::GEOM_IGroupOperations_var aGroupOp = 
-    theGeomEngine->GetIGroupOperations( theStudy->StudyId() );
-
-  GEOM::GEOM_Object_var aGroup = aGroupOp->CreateGroup( aPublishedObj, TopAbs_EDGE );
-  if ( !CORBA::is_nil(aGroup) && aGroupOp->IsDone() ) {
-    GEOM::ListOfLong_var anIndexes = new GEOM::ListOfLong;
-    aGroupOp->UnionIDs( aGroup, anIndexes );
-    if ( aGroupOp->IsDone() ) {
-      SALOMEDS::SObject_var aGroupSO = 
-        theGeomEngine->AddInStudy( theStudy, aGroup, qPrintable( aName ), aPublishedObj );
+      aGroupOp->UnionIDs( aGeomGroup, aGeomIndexes );
+      if ( aGroupOp->IsDone() )
+      {
+        SALOMEDS::SObject_var aGroupSO = 
+          theGeomEngine->AddInStudy( theStudy, aGeomGroup, aGroupName.ToCString(), aMainShape );
+      }
     }
   }
 
@@ -906,12 +1132,12 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
 
 GEOM::GEOM_Object_ptr HYDROData_CalculationCase::publishShapeInGEOM( 
   GEOM::GEOM_Gen_var theGeomEngine, SALOMEDS::Study_ptr theStudy,
-  const TopoDS_Shape& theShape, const QString& theName )
+  const TopoDS_Shape& theShape, const QString& theName,
+  QString& theGeomObjEntry ) const
 {
+  theGeomObjEntry = "";
   GEOM::GEOM_Object_var aGeomObj;
 
-  bool isNil = aGeomObj->_is_nil(); ///@MZN
-
   if ( theGeomEngine->_is_nil() || theStudy->_is_nil() ||
        theShape.IsNull() ) {
     return aGeomObj._retn();
@@ -935,15 +1161,94 @@ GEOM::GEOM_Object_ptr HYDROData_CalculationCase::publishShapeInGEOM(
   
   // Puplish the GEOM object
   if ( !aGeomObj->_is_nil() ) {
-    QString aName = GEOMBase::GetDefaultName( theName );
+    QString aName = HYDROData_GeomTool::GetFreeName( theStudy, theName );
 
     SALOMEDS::SObject_var aResultSO = 
       theGeomEngine->PublishInStudy( theStudy, SALOMEDS::SObject::_nil(), 
-                                     aGeomObj, qPrintable( theName ) );
+                                     aGeomObj, qPrintable( aName ) );
     if ( aResultSO->_is_nil() ) {
       aGeomObj = GEOM::GEOM_Object::_nil();
     }
+    else
+      theGeomObjEntry = aResultSO->GetID();
   }
 
   return aGeomObj._retn();
- }
\ No newline at end of file
+}
+
+void HYDROData_CalculationCase::ClearRules( const bool theIsSetToUpdate )
+{
+  TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules );
+  HYDROData_PriorityQueue::ClearRules( aRulesLab );
+
+  // Indicate model of the need to update splitting
+  if ( theIsSetToUpdate ) {
+    SetToUpdate( true );
+  }
+}
+
+void HYDROData_CalculationCase::AddRule( const Handle(HYDROData_Object)&    theObject1,
+                                         HYDROData_PriorityType             thePriority,
+                                         const Handle(HYDROData_Object)&    theObject2,
+                                         HYDROData_Zone::MergeAltitudesType theMergeType )
+{
+  TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules );
+  HYDROData_PriorityQueue::AddRule( aRulesLab, theObject1, thePriority, theObject2, theMergeType );
+
+  // Indicate model of the need to update splitting
+  SetToUpdate( true );
+}
+
+QString HYDROData_CalculationCase::DumpRules() const
+{
+  TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules );
+  return HYDROData_PriorityQueue::DumpRules( aRulesLab );
+}
+
+void HYDROData_CalculationCase::SetAssignmentMode( AssignmentMode theMode )
+{
+  TDF_Label aModeLab = myLab.FindChild( DataTag_AssignmentMode );
+  TDataStd_Integer::Set( aModeLab, ( int ) theMode );
+
+  // Indicate model of the need to update splitting
+  SetToUpdate( true );
+}
+
+HYDROData_CalculationCase::AssignmentMode HYDROData_CalculationCase::GetAssignmentMode() const
+{
+  Handle(TDataStd_Integer) aModeAttr;
+  bool isOK = myLab.FindChild( DataTag_AssignmentMode ).FindAttribute( TDataStd_Integer::GetID(), aModeAttr );
+  if( isOK )
+    return ( AssignmentMode ) aModeAttr->Get();
+  else
+    return MANUAL;
+}
+
+void HYDROData_CalculationCase::DumpRulesToPython( const QString& theCalcCaseName,
+                                                   QStringList& theScript ) const
+{
+  TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules );
+  HYDROData_PriorityQueue::DumpRulesToPython( aRulesLab, theCalcCaseName, theScript );
+}
+
+HYDROData_Warning HYDROData_CalculationCase::GetLastWarning() const
+{
+  return myLastWarning;
+}
+
+void HYDROData_CalculationCase::SetWarning( HYDROData_WarningType theType, const QString& theData )
+{
+  myLastWarning.Type = theType;
+  myLastWarning.Data = theData;
+}
+
+bool HYDROData_CalculationCase::GetRule( int theIndex, 
+                                         Handle(HYDROData_Object)&           theObject1,
+                                         HYDROData_PriorityType&             thePriority,
+                                         Handle(HYDROData_Object)&           theObject2,
+                                         HYDROData_Zone::MergeAltitudesType& theMergeType ) const
+{
+  TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules );
+  return HYDROData_PriorityQueue::GetRule( aRulesLab, theIndex,
+    theObject1, thePriority, theObject2, theMergeType );
+}