From 645c902d483a2c1ad0106aa7003351cc2c7dae25 Mon Sep 17 00:00:00 2001 From: Christophe Bourcier local Date: Thu, 13 Nov 2014 18:22:52 +0100 Subject: [PATCH] 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. --- src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx | 7 +++---- tests/test_sphere.py | 17 ----------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx index 1d998e1..1772559 100644 --- 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 2f52eb1..74f9b6f 100644 --- 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) -- 2.30.2