Merge remote branch 'origin/V7_dev' into V7_dev

diff --git a/src/SMESH/memoire.h b/src/SMESH/memoire.h
index b9d6415d14743ea48df853004a8e084d8d2de89c..51db0552ef42b7f892bb55c61ec28c2c4f44b569 100644 (file)
--- a/src/SMESH/memoire.h
+++ b/src/SMESH/memoire.h
@@ -30,14 +30,14 @@ void memostat(const char* f, int l)
 #ifdef WIN32
         //rnv: TODO: find alternative of the malloc_stats() on windows platform
 #else
-  /*  struct mallinfo mem = mallinfo(); */
-  /*  std::cerr << f << ":"<< l << " " << mem.arena << " " << mem.ordblks << " " << mem.hblks << " " << mem.hblkhd << " "  << mem.uordblks << " "  << mem.fordblks << " " << mem.keepcost << std::endl; */
+  struct mallinfo mem = mallinfo();
+  std::cerr << f << ":"<< l << " " << mem.arena << " " << mem.ordblks << " " << mem.hblks << " " << mem.hblkhd << " "  << mem.uordblks << " "  << mem.fordblks << " " << mem.keepcost << std::endl;
   std::cerr << f << ":" << l << " --------------------------" << std::endl;
   malloc_stats();
   std::cerr << f << ":" << l << " --------------------------" << std::endl;
 #endif
 }
 
-#define MEMOSTAT //memostat( __FILE__, __LINE__ )
+#define MEMOSTAT memostat( __FILE__, __LINE__ )
 
 #endif

diff --git a/src/StdMeshers/StdMeshers_Regular_1D.cxx b/src/StdMeshers/StdMeshers_Regular_1D.cxx
index 3f3cb47ff8e1f2ee1981fe4a4e594863645892ee..939ceafde7e8bc9cbe96a547577ba566f311c29a 100644 (file)
--- a/src/StdMeshers/StdMeshers_Regular_1D.cxx
+++ b/src/StdMeshers/StdMeshers_Regular_1D.cxx
@@ -184,6 +184,7 @@ bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh&         aMesh,
 
   else if (hypName == "NumberOfSegments")
   {
+       MESSAGE("CheckHypothesis: NumberOfSegments");
     const StdMeshers_NumberOfSegments * hyp =
       dynamic_cast <const StdMeshers_NumberOfSegments * >(theHyp);
     ASSERT(hyp);
@@ -591,6 +592,7 @@ void StdMeshers_Regular_1D::redistributeNearVertices (SMESH_Mesh &          theM
       }
       if ( _hypType == NB_SEGMENTS )
       {
+       MESSAGE("redistributeNearVertices NB_SEGMENTS");
         compensateError(0, vertexLength, f, l, theLength, theC3d, theParameters, true );
       }
       else if ( nPar <= 3 )
@@ -665,6 +667,7 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh &     theMesh,
                                                       const bool       theReverse,
                                                       bool             theConsiderPropagation)
 {
+  MESSAGE("computeInternalParameters");
   theParams.clear();
 
   double f = theFirstU, l = theLastU;
@@ -686,7 +689,7 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh &     theMesh,
     if ( ! SMESH_Algo::GetSortedNodesOnEdge( theMesh.GetMeshDS(), mainEdge, _quadraticMesh,
                                              mainEdgeParamsOfNodes, SMDSAbs_Edge ))
       return error("Bad node parameters on the source edge of Propagation Of Distribution");
-
+    MESSAGE("mainEdgeParamsOfNodes.size(): " << mainEdgeParamsOfNodes.size());
     vector< double > segLen( mainEdgeParamsOfNodes.size() - 1 );
     double totalLen = 0;
     BRepAdaptor_Curve mainEdgeCurve( mainEdge );
@@ -715,7 +718,7 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh &     theMesh,
       ++nbParams;
     }
     if ( nbParams != segLen.size()-1 )
-      return error( SMESH_Comment("Can't divide into ") << segLen.size() << " segements");
+      return error( SMESH_Comment("Can't divide into ") << segLen.size() << " segments");
 
     compensateError( segLen[ theReverse ? segLen.size()-1 : 0 ],
                      segLen[ theReverse ? 0 : segLen.size()-1 ],
@@ -729,7 +732,7 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh &     theMesh,
   case LOCAL_LENGTH:
   case MAX_LENGTH:
   case NB_SEGMENTS: {
-
+    MESSAGE("computeInternalParameters: LOCAL_LENGTH MAX_LENGTH NB_SEGMENTS");
     double eltSize = 1;
     int nbSegments;
     if ( _hypType == MAX_LENGTH )
@@ -762,6 +765,7 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh &     theMesh,
           if (computed) {
             SMESHDS_SubMesh* smds = sm->GetSubMeshDS();
             int nb_segments = smds->NbElements();
+            MESSAGE("nb_segments: "<<nb_segments);
             if (nbseg - 1 <= nb_segments && nb_segments <= nbseg + 1) {
               isFound = true;
               nbseg = nb_segments;
@@ -842,6 +846,7 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh &     theMesh,
         break;
       case StdMeshers_NumberOfSegments::DT_Regular:
         eltSize = theLength / nbSegments;
+        MESSAGE("eltSize = theLength / nbSegments " << eltSize << " = " << theLength << " / " << nbSegments );
         break;
       default:
         return false;
@@ -855,6 +860,7 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh &     theMesh,
     for ( int i = 2; i < NbPoints; i++ ) // skip 1st and last points
     {
       double param = Discret.Parameter(i);
+      MESSAGE("computeInternalParameters: theParams  " << i << " " <<  param);
       theParams.push_back( param );
     }
     compensateError( eltSize, eltSize, f, l, theLength, theC3d, theParams, true ); // for PAL9899
@@ -1108,6 +1114,7 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh &     theMesh,
 
 bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & theShape)
 {
+  MESSAGE("Compute");
   if ( _hypType == NONE )
     return false;
 
@@ -1207,6 +1214,7 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t
 
       //Add the Node in the DataStructure
       SMDS_MeshNode * node = meshDS->AddNode(P.X(), P.Y(), P.Z());
+      MESSAGE("meshDS->AddNode parameter " << param << " coords=" << "("<< P.X() <<", " << P.Y() << ", " << P.Z() << ")");
       meshDS->SetNodeOnEdge(node, shapeID, param);
 
       if(_quadraticMesh) {

diff --git a/src/Tools/blocFissure/gmu/construitFissureGenerale.py b/src/Tools/blocFissure/gmu/construitFissureGenerale.py
index ddffac3898297bc0d03e1ac71a788dce3cc2703b..f75c2742b5482481cc21d9b80e6b8394b6b9c49a 100644 (file)
--- a/src/Tools/blocFissure/gmu/construitFissureGenerale.py
+++ b/src/Tools/blocFissure/gmu/construitFissureGenerale.py
@@ -12,6 +12,7 @@ from salome.smesh import smeshBuilder
 import SMESH
 import math
 import bisect
+import traceback
 
 # from extractionOrientee import extractionOrientee
 # from extractionOrienteeMulti import extractionOrienteeMulti
@@ -51,6 +52,7 @@ from construitMaillagePipe import construitMaillagePipe
 from mailleAretesEtJonction import mailleAretesEtJonction
 from mailleFacesFissure import mailleFacesFissure
 from mailleFacesPeau import mailleFacesPeau
+from fissError import fissError
 
 # -----------------------------------------------------------------------------
 # --- procédure complète fissure générale

diff --git a/src/Tools/blocFissure/gmu/initLog.py b/src/Tools/blocFissure/gmu/initLog.py
index c9c78b30c42266c06f561435391ee04ccc488eaf..bc427de1d3c0aedc04556887cc825e1c8c63deb2 100644 (file)
--- a/src/Tools/blocFissure/gmu/initLog.py
+++ b/src/Tools/blocFissure/gmu/initLog.py
@@ -12,6 +12,7 @@ loglevel = warning
 
 def setDebug(logfile=None):
   global loglevel
+  logging.shutdown()
   if logfile:
     logging.basicConfig(filename=logfile,
                         format='%(relativeCreated)d %(funcName)s[%(lineno)d] %(message)s',
@@ -24,6 +25,7 @@ def setDebug(logfile=None):
 
 def setVerbose(logfile=None):
   global loglevel
+  logging.shutdown()
   if logfile:
     logging.basicConfig(filename=logfile,
                         format='%(relativeCreated)d %(funcName)s[%(lineno)d] %(message)s',
@@ -36,6 +38,7 @@ def setVerbose(logfile=None):
 
 def setRelease(logfile=None):
   global loglevel
+  logging.shutdown()
   if logfile:
     logging.basicConfig(filename=logfile,
                         format='%(funcName)s[%(lineno)d] %(message)s',
@@ -48,6 +51,7 @@ def setRelease(logfile=None):
   
 def setUnitTests(logfile=None):
   global loglevel
+  logging.shutdown()
   if logfile:
     logging.basicConfig(filename=logfile,
                         format='%(funcName)s[%(lineno)d] %(message)s',
@@ -60,6 +64,7 @@ def setUnitTests(logfile=None):
   
 def setPerfTests(logfile=None):
   global loglevel
+  logging.shutdown()
   if logfile:
     logging.basicConfig(filename=logfile,
                         format='%(relativeCreated)d %(funcName)s[%(lineno)d] %(message)s',