Revert the default to not use PreCAD.

Be sure to use MeshGems_V1.3-8-patched-CEA-3.tgz to be able to mesh shapes with spheres without PreCAD enabled.

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx
index 1d998e1a22bb1f923e3923cdd324fccdf0393888..177255989e486cfd9fb726ae8486871d60a71e3e 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx
@@ -363,11 +363,10 @@ public:
   static bool            GetDefaultQuadraticMesh() { return false; }
   
   static int             GetDefaultVerbosity() { return 3; }
-  // Since Salome 7.5.0 and MeshGems 1.3, the default behaviour is to use PreCAD with all options at false
-  static Topology        GetDefaultTopology() { return PreCAD; }
+  static Topology        GetDefaultTopology() { return FromCAD; }
   // PreCAD
-  static bool            GetDefaultPreCADMergeEdges() { return false; }
-  static bool            GetDefaultPreCADProcess3DTopology() { return false; }
+  static bool            GetDefaultPreCADMergeEdges() { return true; }
+  static bool            GetDefaultPreCADProcess3DTopology() { return true; }
   static bool            GetDefaultPreCADDiscardInput() { return false; }
   
   static TSizeMap        GetDefaultSizeMap() { return TSizeMap();}

diff --git a/tests/test_sphere.py b/tests/test_sphere.py
index 2f52eb1f03c4b99783ce79a69af1f12dbf824244..74f9b6f5b500c796d4b267ad4530be53797f3957 100644 (file)
--- a/tests/test_sphere.py
+++ b/tests/test_sphere.py
@@ -36,12 +36,6 @@ BLSURF_Parameters = BLSURF_1.Parameters()
 BLSURF_Parameters.SetPhySize( 5 )
 BLSURF_Parameters.SetGeometricMesh( 1 )
 BLSURF_Parameters.SetAngleMesh( 8 )
-# Activate PreCAD
-# REMARK: These lines are the default behaviour from Salome 7.5.0
-# => It is not needed to add them
-#BLSURF_Parameters.SetTopology( 3 )
-#BLSURF_Parameters.SetPreCADMergeEdges( False )
-#BLSURF_Parameters.SetPreCADProcess3DTopology( False )
 
 ok = Mesh_1.Compute()
 
@@ -55,16 +49,5 @@ ok = Mesh_1.Compute()
 if not ok:
     raise Exception("Error when computing volume mesh")
 
-## Check that vertices are merged by preCAD preprocessing
-#nodes = []
-#for p in vertices:
-    #x, y, z = geompy.PointCoordinates(p)
-    #id_node = Mesh_1.FindNodeClosestTo(x, y, z)
-    #nodes.append(id_node)
-
-#nodes = set(nodes)
-
-#assert(len(nodes) == 1)
-
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser(1)