X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_CalculationCase.cxx;h=986c9b0161abbf40531000924a7a3c5121894597;hb=4d4d74dd554819c30f1c8ded5520cc6c25aba56b;hp=a418024d6f5c685a090fa941453d3227fad02b8d;hpb=64bd0bb694b4fe44c62d401bc1368337cff2631b;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index a418024d..986c9b01 100644
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -1,6 +1,22 @@
+// Copyright (C) 2014-2015  EDF-R&D
+// 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_IAltitudeObject.h"
 #include "HYDROData_Document.h"
@@ -8,13 +24,24 @@
 #include "HYDROData_Iterator.h"
 #include "HYDROData_NaturalObject.h"
 #include "HYDROData_PolylineXY.h"
-#include "HYDROData_SplitToZonesTool.h"
-#include "HYDROData_SplittedShapesGroup.h"
+#include "HYDROData_StricklerTable.h"
+#include "HYDROData_LandCoverMap.h"
+#include "HYDROData_SplitShapesGroup.h"
 #include "HYDROData_Region.h"
 #include "HYDROData_Tool.h"
-#include "HYDROData_Zone.h"
+#include "HYDROData_GeomTool.h"
+
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
 
+#ifndef LIGHT_MODE
 #include <GEOMBase.h>
+#endif
+
+#ifdef WIN32
+  #pragma warning ( default: 4251 )
+#endif
 
 #include <QSet>
 
@@ -33,6 +60,7 @@
 #include <TopExp.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TDataStd_Integer.hxx>
 
 //#define  DEB_CALCULATION 1
 #ifdef DEB_CALCULATION
@@ -42,6 +70,10 @@
 #define CALCULATION_REGIONS_PREF GetName() + "_Reg"
 #define CALCULATION_ZONES_PREF GetName() + "_Zone"
 #define CALCULATION_GROUPS_PREF GetName() + "_"
+//#define DEB_CLASS2D 1
+#ifdef DEB_CLASS2D
+#include <BRepBuilderAPI_MakeVertex.hxx>
+#endif
 
 #define EXPORT_NAME "HYDRO_" + GetName()
 
@@ -49,7 +81,7 @@ IMPLEMENT_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_CalculationCase, HYDROData_Entity)
 
 HYDROData_CalculationCase::HYDROData_CalculationCase()
-: HYDROData_Entity()
+: HYDROData_Entity( Geom_2d_and_groups )
 {
 }
 
@@ -62,38 +94,17 @@ void HYDROData_CalculationCase::SetName( const QString& theName )
   QString anOldCaseName = GetName();
   if ( anOldCaseName != theName )
   {
-    HYDROData_SequenceOfObjects aRegions = GetRegions();
-
-    HYDROData_SequenceOfObjects::Iterator anIter( aRegions );
-    for ( ; anIter.More(); anIter.Next() )
-    {
-      Handle(HYDROData_Region) aRegion =
-        Handle(HYDROData_Region)::DownCast( anIter.Value() );
-      if ( aRegion.IsNull() )
-        continue;
-
-      HYDROData_Tool::UpdateChildObjectName( anOldCaseName, theName, aRegion );
-
-      HYDROData_SequenceOfObjects aZones = aRegion->GetZones();
-      HYDROData_SequenceOfObjects::Iterator anIter( aZones );
-      for ( ; anIter.More(); anIter.Next() )
-      {
-        Handle(HYDROData_Zone) aRegZone =
-          Handle(HYDROData_Zone)::DownCast( anIter.Value() );
-        if ( aRegZone.IsNull() )
-          continue;
-
-        HYDROData_Tool::UpdateChildObjectName( anOldCaseName, theName, aRegZone );
-      }
-    }
+    // Update names of regions and its zones
+    UpdateRegionsNames( GetRegions(), anOldCaseName, theName );
 
-    HYDROData_SequenceOfObjects aGroups = GetGeometryGroups();
+    HYDROData_SequenceOfObjects aGroups = GetSplitGroups();
 
+    HYDROData_SequenceOfObjects::Iterator anIter;
     anIter.Init( aGroups );
     for ( ; anIter.More(); anIter.Next() )
     {
-      Handle(HYDROData_SplittedShapesGroup) aGroup =
-        Handle(HYDROData_SplittedShapesGroup)::DownCast( anIter.Value() );
+      Handle(HYDROData_SplitShapesGroup) aGroup =
+        Handle(HYDROData_SplitShapesGroup)::DownCast( anIter.Value() );
       if ( aGroup.IsNull() )
         continue;
 
@@ -104,19 +115,25 @@ void HYDROData_CalculationCase::SetName( const QString& theName )
   HYDROData_Entity::SetName( theName );
 }
 
-QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_CalculationCase::DumpToPython( const QString&       thePyScriptPath,
+                                                     MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  aResList.prepend( "# Calculation case" );
 
   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 );
   for ( ; anIter.More(); anIter.Next() )
   {
     Handle(HYDROData_Object) aRefGeomObj =
       Handle(HYDROData_Object)::DownCast( anIter.Value() );
-    setPythonReferenceObject( theTreatedObjects, aResList, aRefGeomObj, "AddGeometryObject" );
+    setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefGeomObj, "AddGeometryObject" );
   }
   aResList << QString( "" );
 
@@ -137,49 +154,90 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
       continue;
 
     int aGroupId = aFatherGeom->GetGroupId( aGeomGroup );
-    aResList << QString( "%1 = %2.GetGroup( %3 );" )
+    aResList << QString( "%1 = %2.GetGroup( %3 )" )
               .arg( aGroupName ).arg( aFatherGeom->GetObjPyName() ).arg( aGroupId );
 
-    aResList << QString( "%1.AddGeometryGroup( %2 );" ).arg( aCalculName ).arg( aGroupName );
+    aResList << QString( "%1.AddGeometryGroup( %2 )" ).arg( aCalculName ).arg( aGroupName );
   }
-  aResList << QString( "" );
 
   Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
-  setPythonReferenceObject( theTreatedObjects, aResList, aBoundaryPolyline, "SetBoundaryPolyline" );
-  aResList << QString( "" );
+  setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aBoundaryPolyline, "SetBoundaryPolyline" );
+
+  if( aMode==AUTOMATIC )
+    DumpRulesToPython( aCalculName, aResList );
 
-  aResList << QString( "%1.Update();" ).arg( aCalculName );
   aResList << QString( "" );
+  aResList << "# Start the algorithm of the partition and assignment";
+  aResList << QString( "%1.Update()" ).arg( aCalculName );
 
-  // Now we restore the regions and zones order
-  HYDROData_SequenceOfObjects aRegions = GetRegions();
-  anIter.Init( aRegions );
-  for ( ; anIter.More(); anIter.Next() )
+  if( aMode==MANUAL )
   {
-    Handle(HYDROData_Region) aRegion =
-      Handle(HYDROData_Region)::DownCast( anIter.Value() );
-    if ( aRegion.IsNull() )
-      continue;
-
-    QString aRegionName = aRegion->GetName();
-
-    HYDROData_SequenceOfObjects aZones = aRegion->GetZones();
-    HYDROData_SequenceOfObjects::Iterator aZonesIter( aZones );
-    for ( ; aZonesIter.More(); aZonesIter.Next() )
-    {
-      Handle(HYDROData_Zone) aRegZone =
-        Handle(HYDROData_Zone)::DownCast( aZonesIter.Value() );
-      if ( aRegZone.IsNull() )
-        continue;
-
-      // TODO
-    }
+    // Now we restore the
+    // - regions and zones order
+    DumpRegionsToPython( aResList, thePyScriptPath, theTreatedObjects, GetRegions() );   
   }
+
+  // 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();
@@ -188,6 +246,10 @@ HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetAllReferenceObjects()
   if ( !aBoundaryPolyline.IsNull() )
     aResSeq.Append( aBoundaryPolyline );
 
+  HYDROData_SequenceOfObjects aSeqOfGeomObjs = GetGeometryObjects();
+  aResSeq.Append( aSeqOfGeomObjs );
+
+  // Regions
   HYDROData_SequenceOfObjects aSeqOfRegions = GetRegions();
   aResSeq.Append( aSeqOfRegions );
 
@@ -197,100 +259,187 @@ HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetAllReferenceObjects()
 void HYDROData_CalculationCase::Update()
 {
   HYDROData_Entity::Update();
+  SetWarning();
 
   // At first we remove previously created objects
   RemoveRegions();
-  RemoveSplittedGroups();
+  RemoveSplitGroups();
 
   Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
   if ( aDocument.IsNull() )
     return;
 
+  // Split to zones
+  HYDROData_SplitToZonesTool::SplitDataList aZonesList, anEdgesList;
+
   Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
   HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
-  if ( aGeomObjects.IsEmpty() )
-    return;
+  if ( !aGeomObjects.IsEmpty() ) {
+    HYDROData_SequenceOfObjects aGeomGroups = GetGeometryGroups();
+
+    HYDROData_SplitToZonesTool::SplitDataList aSplitObjects =
+      HYDROData_SplitToZonesTool::Split( aGeomObjects, aGeomGroups, aBoundaryPolyline );
+    if ( !aSplitObjects.isEmpty() ) {
+      HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitObjects );
+      while( anIter.hasNext() ) {
+        const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
+        if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Zone )
+          aZonesList.append( aSplitData );
+        else if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Edge )
+          anEdgesList.append( aSplitData );
+      }
+    }
+  }
 
-  HYDROData_SequenceOfObjects aGeomGroups = GetGeometryGroups();
+  switch( GetAssignmentMode() )
+  {
+  case MANUAL:
+    CreateRegionsDef( aDocument, aZonesList );    
+    break;
+  case AUTOMATIC:
+    CreateRegionsAuto( aDocument, aZonesList );    
+    break;
+  }
 
-  HYDROData_SplitToZonesTool::SplitDataList aSplitedObjects =
-    HYDROData_SplitToZonesTool::Split( aGeomObjects, aGeomGroups, aBoundaryPolyline );
-  if ( aSplitedObjects.isEmpty() )
-    return;
+  CreateEdgeGroupsDef( aDocument, anEdgesList );
+}
 
+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;
 
-  QMap<QString,Handle(HYDROData_SplittedShapesGroup)> aSplittedEdgesGroupsMap;
-
-  // Create result regions for case, by default one zone for one region
-  HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitedObjects );
+  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 );
 
-    if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Zone )
-    {
-      // Create new region
-      Handle(HYDROData_Region) aRegion = addNewRegion();
+    // Add the zone for region
+    Handle(HYDROData_Zone) aRegionZone = aRegion->addNewZone( theDoc, aZonesPref, aSplitData.Face(), aSplitData.ObjectNames );
+  }
+}
 
-      QString aRegionName = HYDROData_Tool::GenerateObjectName( aDocument, aRegsPref );
-      aRegion->SetName( aRegionName );
+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, DataTag_CustomRules );
 
-      // Add the zone for region
-      Handle(HYDROData_Zone) aRegionZone = aRegion->addNewZone();
+  // 1. First we create a default region for each object included into the calculation case
+  HYDROData_SequenceOfObjects anObjects = GetGeometryObjects();
+  for( int i = anObjects.Lower(), n = anObjects.Upper(); i<=n; i++ )
+  {
+    Handle(HYDROData_Entity) anObj = anObjects.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 aZoneName = HYDROData_Tool::GenerateObjectName( aDocument, aZonesPref );
-      aRegionZone->SetName( aZoneName );
+  // 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::MergeType aMergeType;
+    Handle(HYDROData_Entity) 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 );
 
-      aRegionZone->SetShape( aSplitData.Face() );
+    if( aSplitData.ObjectNames.count() > 1 && aMergeType==HYDROData_Zone::Merge_UNKNOWN )
+    {
+      qDebug( "Error in algorithm: unresolved conflicts" );
+    }
 
-      // 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( aDocument->FindObjectByName( anObjName ) );
-        if ( aRefObject.IsNull() )
-          continue;
-
-        aRegionZone->AddGeometryObject( aRefObject );
-      }
+    Handle(HYDROData_Entity) aMergeEntity = aRegObj;
+    Handle(HYDROData_Object) aMergeObject = Handle(HYDROData_Object)::DownCast( aMergeEntity );
+    if ( !aMergeObject.IsNull() ) {
+      aMergeEntity = aMergeObject->GetAltitudeObject();
     }
-    else if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Edge )
-    {
-      // 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();
+    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->RemoveMergeObject();
+      aRegionZone->SetMergeObject( aMergeEntity );
+      break;
+    }
+  }
 
-        QString aCalcGroupName = CALCULATION_GROUPS_PREF + anObjName;
-        aSplittedGroup->SetName( aCalcGroupName );
+  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 );
+  }
+}
 
-        aSplittedEdgesGroupsMap.insert( anObjName, aSplittedGroup );
-      }
-      else
-      {
-        aSplittedGroup = aSplittedEdgesGroupsMap[ anObjName ];
-      }
+void HYDROData_CalculationCase::CreateEdgeGroupsDef( const Handle(HYDROData_Document)& theDoc,
+                                                     const HYDROData_SplitToZonesTool::SplitDataList& theEdges )
+{
+  QMap<QString,Handle(HYDROData_SplitShapesGroup)> aSplitEdgesGroupsMap;
 
-      if ( aSplittedGroup.IsNull() )
-        continue;
+  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;
 
-      aSplittedGroup->AddShape( aSplitData.Shape );
+    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_SplitShapesGroup) aSplitGroup;
+    if ( !aSplitEdgesGroupsMap.contains( anObjName ) )
+    {
+      aSplitGroup = addNewSplitGroup( CALCULATION_GROUPS_PREF + anObjName );
+      aSplitEdgesGroupsMap.insert( anObjName, aSplitGroup );
     }
+    else
+    {
+      aSplitGroup = aSplitEdgesGroupsMap[ anObjName ];
+    }
+    if ( aSplitGroup.IsNull() )
+      continue;
+
+    aSplitGroup->AddShape( aSplitData.Shape );
   }
 }
 
@@ -305,7 +454,7 @@ bool HYDROData_CalculationCase::AddGeometryObject( const Handle(HYDROData_Object
   AddReferenceObject( theObject, DataTag_GeometryObject );
   
   // Indicate model of the need to update splitting
-  SetToUpdate( true );
+  Changed( Geom_2d );
 
   return true;
 }
@@ -323,7 +472,7 @@ void HYDROData_CalculationCase::RemoveGeometryObject( const Handle(HYDROData_Obj
   RemoveReferenceObject( theObject->Label(), DataTag_GeometryObject );
 
   // Indicate model of the need to update splitting
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 void HYDROData_CalculationCase::RemoveGeometryObjects()
@@ -331,7 +480,7 @@ void HYDROData_CalculationCase::RemoveGeometryObjects()
   ClearReferenceObjects( DataTag_GeometryObject );
 
   // Indicate model of the need to update splitting
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 bool HYDROData_CalculationCase::AddGeometryGroup( const Handle(HYDROData_ShapesGroup)& theGroup )
@@ -345,7 +494,7 @@ bool HYDROData_CalculationCase::AddGeometryGroup( const Handle(HYDROData_ShapesG
   AddReferenceObject( theGroup, DataTag_GeometryGroup );
   
   // Indicate model of the need to update splitting
-  SetToUpdate( true );
+  Changed( Geom_Groups );
 
   return true;
 }
@@ -363,7 +512,7 @@ void HYDROData_CalculationCase::RemoveGeometryGroup( const Handle(HYDROData_Shap
   RemoveReferenceObject( theGroup->Label(), DataTag_GeometryGroup );
 
   // Indicate model of the need to update splitting
-  SetToUpdate( true );
+  Changed( Geom_Groups );
 }
 
 void HYDROData_CalculationCase::RemoveGeometryGroups()
@@ -371,7 +520,7 @@ void HYDROData_CalculationCase::RemoveGeometryGroups()
   ClearReferenceObjects( DataTag_GeometryGroup );
 
   // Indicate model of the need to update splitting
-  SetToUpdate( true );
+  Changed( Geom_Groups );
 }
 
 void HYDROData_CalculationCase::SetBoundaryPolyline( const Handle(HYDROData_PolylineXY)& thePolyline )
@@ -381,7 +530,8 @@ void HYDROData_CalculationCase::SetBoundaryPolyline( const Handle(HYDROData_Poly
   SetReferenceObject( thePolyline, DataTag_Polyline );
 
   // Indicate model of the need to update zones splitting
-  SetToUpdate( !IsEqual( aPrevPolyline, thePolyline ) || IsMustBeUpdated() );
+  if( !IsEqual( aPrevPolyline, thePolyline ) )
+    Changed( Geom_2d );
 }
 
 Handle(HYDROData_PolylineXY) HYDROData_CalculationCase::GetBoundaryPolyline() const
@@ -397,25 +547,58 @@ void HYDROData_CalculationCase::RemoveBoundaryPolyline()
   ClearReferenceObjects( DataTag_Polyline );
 
   // Indicate model of the need to update zones splitting
-  SetToUpdate( !aPrevPolyline.IsNull() || IsMustBeUpdated() );
+  Changed( Geom_2d );
+}
+
+void HYDROData_CalculationCase::SetStricklerTable( const Handle(HYDROData_StricklerTable)& theStricklerTable )
+{
+  Handle(HYDROData_StricklerTable) aPrevStricklerTable = GetStricklerTable();
+
+  SetReferenceObject( theStricklerTable, DataTag_StricklerTable );
+
+  // Indicate model of the need to update land covers partition
+  if( !IsEqual( aPrevStricklerTable, theStricklerTable ) )
+    Changed( Geom_No );
+}
+
+Handle(HYDROData_StricklerTable) HYDROData_CalculationCase::GetStricklerTable() const
+{
+  return Handle(HYDROData_StricklerTable)::DownCast( 
+           GetReferenceObject( DataTag_StricklerTable ) );
+}
+
+void HYDROData_CalculationCase::RemoveStricklerTable()
+{
+  Handle(HYDROData_StricklerTable) aPrevStricklerTable = GetStricklerTable();
+
+  ClearReferenceObjects( DataTag_StricklerTable );
+
+  // Indicate model of the need to update land covers partition
+  Changed( Geom_No );
+}
+
+Handle(HYDROData_LandCoverMap) HYDROData_CalculationCase::GetLandCoverMap() const
+{
+  Handle(HYDROData_LandCoverMap) aMap = Handle(HYDROData_LandCoverMap)::DownCast(
+    GetReferenceObject( DataTag_LandCoverMap ) );
+  return aMap;
+}
+
+void HYDROData_CalculationCase::SetLandCoverMap( const Handle(HYDROData_LandCoverMap)& theMap )
+{
+  SetReferenceObject( theMap, DataTag_LandCoverMap );
 }
 
 Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(HYDROData_Zone)& theZone )
 {
-  Handle(HYDROData_Region) aNewRegion = addNewRegion();
+  Changed( Geom_No );
+  Changed( Geom_No );
+  Changed( Geom_No );
+  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;
@@ -423,10 +606,14 @@ 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;
   
-  if ( HasReference( theRegion, DataTag_Region ) )
+  HYDROData_CalculationCase::DataTag aDataTag = DataTag_Region;
+
+  if ( HasReference( theRegion, aDataTag ) )
     return false; // Object is already in reference list
 
   // Move the region from other calculation
@@ -434,8 +621,8 @@ 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();
-    theRegion->CopyTo( aNewRegion );
+    Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF );
+    theRegion->CopyTo( aNewRegion, true );
 
     aFatherCalc->RemoveRegion( theRegion );
 
@@ -443,7 +630,7 @@ bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRe
   }
   else
   {
-    AddReferenceObject( theRegion, DataTag_Region );
+    AddReferenceObject( theRegion, aDataTag );
   }
 
   return true;
@@ -461,7 +648,6 @@ void HYDROData_CalculationCase::UpdateRegionsOrder()
     return;
 
   HYDROData_SequenceOfObjects aRegions = GetRegions();
-
   HYDROData_SequenceOfObjects::Iterator anIter( aRegions );
   for ( ; anIter.More(); anIter.Next() )
   {
@@ -493,7 +679,8 @@ void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& th
   if ( theRegion.IsNull() )
     return;
 
-  RemoveReferenceObject( theRegion->Label(), DataTag_Region );
+  HYDROData_CalculationCase::DataTag aDataTag = DataTag_Region;
+  RemoveReferenceObject( theRegion->Label(), aDataTag );
 
   // Remove region from data model
   Handle(HYDROData_CalculationCase) aFatherCalc = 
@@ -507,14 +694,14 @@ void HYDROData_CalculationCase::RemoveRegions()
   myLab.FindChild( DataTag_ChildRegion ).ForgetAllAttributes();
 }
 
-HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetSplittedGroups() const
+HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetSplitGroups() const
 {
-  return GetReferenceObjects( DataTag_SplittedGroups );
+  return GetReferenceObjects( DataTag_SplitGroups );
 }
 
-void HYDROData_CalculationCase::RemoveSplittedGroups()
+void HYDROData_CalculationCase::RemoveSplitGroups()
 {
-  myLab.FindChild( DataTag_SplittedGroups ).ForgetAllAttributes();
+  myLab.FindChild( DataTag_SplitGroups ).ForgetAllAttributes();
 }
 
 double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) const
@@ -523,6 +710,22 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) c
   return GetAltitudeForPoint( thePoint, aZone );
 }
 
+double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&                    thePoint,
+                                                       const Handle(HYDROData_Region)& theRegion ) const
+{
+  double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
+
+  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
+  if ( !aZone.IsNull() )
+  {
+    Handle(HYDROData_Region) aRefRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
+    if ( IsEqual( aRefRegion, theRegion ) )
+      aResAltitude = GetAltitudeForPoint( thePoint, aZone );
+  }
+
+  return aResAltitude;
+}
+
 double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&                  thePoint,
                                                        const Handle(HYDROData_Zone)& theZone ) const
 {
@@ -530,7 +733,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
   if ( theZone.IsNull() )
     return aResAltitude;
 
-  HYDROData_Zone::MergeAltitudesType aZoneMergeType = theZone->GetMergeType();
+  HYDROData_Zone::MergeType aZoneMergeType = theZone->GetMergeType();
   if ( !theZone->IsMergingNeed() )
   {
     aZoneMergeType = HYDROData_Zone::Merge_UNKNOWN;
@@ -543,7 +746,8 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
   HYDROData_IInterpolator* aZoneInterpolator = theZone->GetInterpolator();
   if ( aZoneMergeType == HYDROData_Zone::Merge_Object )
   {
-    Handle(HYDROData_IAltitudeObject) aMergeAltitude = theZone->GetMergeAltitude();
+    Handle(HYDROData_IAltitudeObject) aMergeAltitude = 
+      Handle(HYDROData_IAltitudeObject)::DownCast( theZone->GetMergeObject() );
     if ( !aMergeAltitude.IsNull() )
     {
       if ( aZoneInterpolator != NULL )
@@ -557,7 +761,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
   }
   else
   {
-    HYDROData_SequenceOfObjects aZoneObjects = theZone->GetGeometryObjects();
+    HYDROData_SequenceOfObjects aZoneObjects = theZone->GetObjects();
     HYDROData_SequenceOfObjects::Iterator anIter( aZoneObjects );
     for ( ; anIter.More(); anIter.Next() )
     {
@@ -609,6 +813,23 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
   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
@@ -626,6 +847,30 @@ NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints(
   return aResSeq;
 }
 
+double HYDROData_CalculationCase::GetStricklerCoefficientForPoint( const gp_XY& thePoint ) const
+{
+  Handle( HYDROData_LandCoverMap ) aMap = GetLandCoverMap();
+  Handle( HYDROData_StricklerTable ) aTable = GetStricklerTable();
+  if( aMap.IsNull() )
+    return 0.0;
+
+  QString aType;
+  aMap->FindByPoint( thePoint, aType );
+  double aCoeff = aTable->Get( aType, 0.0 );
+  return aCoeff;
+}
+
+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;
@@ -669,7 +914,16 @@ HYDROData_CalculationCase::PointClassification HYDROData_CalculationCase::GetPoi
   TopoDS_Face aZoneFace = TopoDS::Face( theZone->GetShape() );
   if ( aZoneFace.IsNull() )
     return aRes;
-  
+#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;
@@ -680,38 +934,63 @@ HYDROData_CalculationCase::PointClassification HYDROData_CalculationCase::GetPoi
   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_SplittedShapesGroup) HYDROData_CalculationCase::addNewSplittedGroup()
+Handle(HYDROData_SplitShapesGroup) HYDROData_CalculationCase::addNewSplitGroup( const QString& theName )
 {
-  TDF_Label aNewLab = myLab.FindChild( DataTag_SplittedGroups ).NewChild();
+  TDF_Label aNewLab = myLab.FindChild( DataTag_SplitGroups ).NewChild();
+
+  Handle(HYDROData_SplitShapesGroup) aNewGroup =
+    Handle(HYDROData_SplitShapesGroup)::DownCast( 
+      HYDROData_Iterator::CreateObject( aNewLab, KIND_SPLIT_GROUP ) );
+  AddReferenceObject( aNewGroup, DataTag_SplitGroups );
 
-  Handle(HYDROData_SplittedShapesGroup) aNewGroup =
-    Handle(HYDROData_SplittedShapesGroup)::DownCast( 
-      HYDROData_Iterator::CreateObject( aNewLab, KIND_SPLITTED_GROUP ) );
-  AddReferenceObject( aNewGroup, DataTag_SplittedGroups );
+  aNewGroup->SetName( theName );
 
   return aNewGroup;
 }
 
+QString HYDROData_CalculationCase::Export( int theStudyId ) const
+{
+#ifdef LIGHT_MODE
+  return "";
+#else
+  GEOM::GEOM_Gen_var aGEOMEngine = HYDROData_GeomTool::GetGeomGen();
+  SALOMEDS::Study_var aDSStudy = HYDROData_GeomTool::GetStudyByID( theStudyId );
+  
+  QString aGeomObjEntry, anErrorMsg;
+  bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry, anErrorMsg );
+  return isOK ? aGeomObjEntry : QString();
+#endif
+}
+
+#ifndef LIGHT_MODE
 bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var  theGeomEngine,
-                                        SALOMEDS::Study_ptr theStudy ) const
+                                        SALOMEDS::Study_ptr theStudy,
+                                        QString& theGeomObjEntry,
+                                        QString& theErrorMsg ) const
 {
   HYDROData_ShapesGroup::SeqOfGroupsDefs aSeqOfGroupsDefs;
 
   // Get groups definitions
-  HYDROData_SequenceOfObjects aSplittedGroups = GetSplittedGroups();
+  HYDROData_SequenceOfObjects aSplitGroups = GetSplitGroups();
 
-  HYDROData_SequenceOfObjects::Iterator anIter( aSplittedGroups );
+  HYDROData_SequenceOfObjects::Iterator anIter( aSplitGroups );
   for ( ; anIter.More(); anIter.Next() )
   {
     // Get shapes group
@@ -729,6 +1008,7 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var  theGeomEngine,
   }
   
   // Get faces
+  bool isAllNotSubmersible = true;
   TopTools_ListOfShape aFaces;
   HYDROData_SequenceOfObjects aCaseRegions = GetRegions();
   HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions );
@@ -736,20 +1016,39 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var  theGeomEngine,
   {
     Handle(HYDROData_Region) aRegion =
       Handle(HYDROData_Region)::DownCast( aRegionIter.Value() );
-    if( aRegion.IsNull() )
+    if( aRegion.IsNull() || !aRegion->IsSubmersible() )
       continue;
+    
+    if ( isAllNotSubmersible )
+      isAllNotSubmersible = false;
 
     TopoDS_Shape aRegionShape = aRegion->GetShape( &aSeqOfGroupsDefs );
     aFaces.Append( aRegionShape );
   }
 
-  return Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs );
+  bool aRes = false;
+
+  if ( aCaseRegions.IsEmpty() ) {
+    theErrorMsg = QString("the list of regions is empty.");
+  } else if ( isAllNotSubmersible ) {
+    theErrorMsg = QString("there are no submersible regions.");
+  } else {
+    aRes = Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs, theGeomObjEntry );;
+  }
+
+  if( aRes && !GetLandCoverMap().IsNull() && !GetStricklerTable().IsNull() )
+  {
+    QString aTelemacFileName = GetName() + ".telemac";
+    aRes = GetLandCoverMap()->ExportTelemac( aTelemacFileName, 1E-2, GetStricklerTable() );
+  }
+  return aRes;
 }
 
 bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var                            theGeomEngine,
                                         SALOMEDS::Study_ptr                           theStudy,
                                         const TopTools_ListOfShape&                   theFaces,
-                                        const HYDROData_ShapesGroup::SeqOfGroupsDefs& theGroupsDefs ) const
+                                        const HYDROData_ShapesGroup::SeqOfGroupsDefs& theGroupsDefs,
+                                        QString& theGeomObjEntry ) const
 {
   // Sew faces
   BRepBuilderAPI_Sewing aSewing( Precision::Confusion() * 10.0 );
@@ -803,7 +1102,7 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
   // Publish the sewed shape
   QString aName = EXPORT_NAME;
   GEOM::GEOM_Object_ptr aMainShape = 
-    publishShapeInGEOM( theGeomEngine, theStudy, aSewedShape, aName );
+    HYDROData_GeomTool::publishShapeInGEOM( theGeomEngine, theStudy, aSewedShape, aName, theGeomObjEntry );
 
   if ( aMainShape->_is_nil() )  
     return false;
@@ -828,9 +1127,12 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
 #ifdef DEB_CALCULATION
       cout << "\nOld shape(" << i << ") = " << aShape.TShape() <<endl;
 #endif
-      const TopoDS_Shape& aModifiedShape = aSewing.Modified( aShape );
-      if ( aModifiedShape.IsNull() )
-        continue;
+      
+      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();
@@ -896,45 +1198,132 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
 
   return true;
 }
+#endif
 
-GEOM::GEOM_Object_ptr HYDROData_CalculationCase::publishShapeInGEOM( 
-  GEOM::GEOM_Gen_var theGeomEngine, SALOMEDS::Study_ptr theStudy,
-  const TopoDS_Shape& theShape, const QString& theName ) const
+void HYDROData_CalculationCase::ClearRules( HYDROData_CalculationCase::DataTag theDataTag,
+                                            const bool theIsSetToUpdate )
 {
-  GEOM::GEOM_Object_var aGeomObj;
+  TDF_Label aRulesLab = myLab.FindChild( theDataTag );
+  HYDROData_PriorityQueue::ClearRules( aRulesLab );
 
-  if ( theGeomEngine->_is_nil() || theStudy->_is_nil() ||
-       theShape.IsNull() ) {
-    return aGeomObj._retn();
+  // Indicate model of the need to update splitting
+  if ( theIsSetToUpdate ) {
+    Changed( Geom_2d );
   }
+}
+
+void HYDROData_CalculationCase::AddRule( const Handle(HYDROData_Entity)&    theObject1,
+                                         HYDROData_PriorityType             thePriority,
+                                         const Handle(HYDROData_Entity)&    theObject2,
+                                         HYDROData_Zone::MergeType          theMergeType,
+                                         HYDROData_CalculationCase::DataTag theDataTag )
+{
+  TDF_Label aRulesLab = myLab.FindChild( theDataTag );
+  HYDROData_PriorityQueue::AddRule( aRulesLab, theObject1, thePriority, theObject2, theMergeType );
 
-  std::ostringstream aStreamShape;
-  // Write TopoDS_Shape in ASCII format to the stream
-  BRepTools::Write( theShape, aStreamShape );
-  // Returns the number of bytes that have been stored in the stream's buffer.
-  int aSize = aStreamShape.str().size();
-  // Allocate octect buffer of required size
-  CORBA::Octet* anOctetBuf = SALOMEDS::TMPFile::allocbuf( aSize );
-  // Copy ostrstream content to the octect buffer
-  memcpy( anOctetBuf, aStreamShape.str().c_str(), aSize );
-  // Create TMPFile
-  SALOMEDS::TMPFile_var aSeqFile = new SALOMEDS::TMPFile( aSize, aSize, anOctetBuf, 1 );
+  // Indicate model of the need to update splitting
+  Changed( Geom_2d );
+}
 
-  // Restore shape from the stream and get the GEOM object
-  GEOM::GEOM_IInsertOperations_var anInsOp = theGeomEngine->GetIInsertOperations( theStudy->StudyId() );
-  aGeomObj = anInsOp->RestoreShape( aSeqFile );
-  
-  // Puplish the GEOM object
-  if ( !aGeomObj->_is_nil() ) {
-    QString aName = GEOMBase::GetDefaultName( theName );
-
-    SALOMEDS::SObject_var aResultSO = 
-      theGeomEngine->PublishInStudy( theStudy, SALOMEDS::SObject::_nil(), 
-                                     aGeomObj, qPrintable( aName ) );
-    if ( aResultSO->_is_nil() ) {
-      aGeomObj = GEOM::GEOM_Object::_nil();
+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
+  Changed( Geom_2d );
+}
+
+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;
+}
+
+void HYDROData_CalculationCase::UpdateRegionsNames( const HYDROData_SequenceOfObjects& theRegions,
+                                                    const QString& theOldCaseName,
+                                                    const QString& theName )
+{
+  HYDROData_SequenceOfObjects::Iterator anIter( theRegions );
+  for ( ; anIter.More(); anIter.Next() )
+  {
+    Handle(HYDROData_Region) aRegion =
+      Handle(HYDROData_Region)::DownCast( anIter.Value() );
+    if ( aRegion.IsNull() )
+      continue;
+
+    HYDROData_Tool::UpdateChildObjectName( theOldCaseName, theName, aRegion );
+
+    HYDROData_SequenceOfObjects aZones = aRegion->GetZones();
+    HYDROData_SequenceOfObjects::Iterator anIter( aZones );
+    for ( ; anIter.More(); anIter.Next() )
+    {
+      Handle(HYDROData_Zone) aRegZone =
+        Handle(HYDROData_Zone)::DownCast( anIter.Value() );
+      if ( aRegZone.IsNull() )
+        continue;
+
+      HYDROData_Tool::UpdateChildObjectName( theOldCaseName, theName, aRegZone );
     }
   }
+}
 
-  return aGeomObj._retn();
- }
+void HYDROData_CalculationCase::DumpRegionsToPython( QStringList& theResList,
+                                                     const QString& thePyScriptPath,
+                                                     MapOfTreatedObjects& theTreatedObjects,
+                                                     const HYDROData_SequenceOfObjects& theRegions ) const
+{
+  HYDROData_SequenceOfObjects::Iterator anIter;
+  anIter.Init( theRegions );
+  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( thePyScriptPath, theTreatedObjects );
+    theResList << aRegDump;
+  }
+}
+
+bool HYDROData_CalculationCase::GetRule( int theIndex, 
+                                         Handle(HYDROData_Entity)&           theObject1,
+                                         HYDROData_PriorityType&             thePriority,
+                                         Handle(HYDROData_Entity)&           theObject2,
+                                         HYDROData_Zone::MergeType&          theMergeType,
+                                         HYDROData_CalculationCase::DataTag& theDataTag) const
+{
+  TDF_Label aRulesLab = myLab.FindChild( theDataTag );
+  return HYDROData_PriorityQueue::GetRule( aRulesLab, theIndex,
+    theObject1, thePriority, theObject2, theMergeType );
+}