- Disable PreCAD when using basic periodicity API

- Use the new algo name MG_CADSurf

diff --git a/doc/salome/examples/test_periodicity.py b/doc/salome/examples/test_periodicity.py
index 8694c38dd33a77043c8675f9a7af60f06fc7d33c..5893c1acc1111c6b67e6fccf9e08d8228d9bd9ce 100644 (file)
--- a/doc/salome/examples/test_periodicity.py
+++ b/doc/salome/examples/test_periodicity.py
@@ -94,6 +94,8 @@ import SMESH
 from salome.smesh import smeshBuilder
 smesh = smeshBuilder.New(salome.myStudy)
 
+from salome.BLSURFPlugin import BLSURFPluginBuilder
+
 Mesh = smesh.Mesh(part, "Mesh")
 
 algo2d = Mesh.Triangle(algo=smeshBuilder.MG_CADSurf)
@@ -101,6 +103,8 @@ algo2d.SetGeometricMesh( 1 )
 algo2d.SetAngleMesh( 4 )
 algo2d.SetPhySize( 8 )
 algo2d.SetOptionValue( 'periodic_tolerance', '1e-2' )
+# Deactivate PreCAD
+algo2d.SetTopology(BLSURFPluginBuilder.FromCAD)
 
 def proj_x(shape1):
     shape2 = geompy.MakeTranslation(shape1, 100, 0., 0)

diff --git a/doc/salome/examples/test_periodicity_reflexion_advanced.py b/doc/salome/examples/test_periodicity_reflexion_advanced.py
index d9bab102114ae664a3c95edbc3516fc49a9d1cb7..91b79b51f21361ea1c10f0aca2b87b4ef13fdf64 100644 (file)
--- a/doc/salome/examples/test_periodicity_reflexion_advanced.py
+++ b/doc/salome/examples/test_periodicity_reflexion_advanced.py
@@ -80,6 +80,8 @@ import SMESH
 from salome.smesh import smeshBuilder
 smesh = smeshBuilder.New(salome.myStudy)
 
+from salome.BLSURFPlugin import BLSURFPluginBuilder
+
 Mesh = smesh.Mesh(part, "Mesh")
 
 algo2d = Mesh.Triangle(algo=smeshBuilder.MG_CADSurf)
@@ -87,6 +89,8 @@ algo2d.SetGeometricMesh( 1 )
 algo2d.SetAngleMesh( 4 )
 algo2d.SetPhySize( 8 )
 algo2d.SetOptionValue( 'periodic_tolerance', '1e-2' )
+# Deactivate PreCAD
+algo2d.SetTopology(BLSURFPluginBuilder.FromCAD)
 
 def rota_z(shape1):
     shape2 = geompy.MakeRotation(shape1, axe, -math.pi/2)

diff --git a/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc b/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc
index f614d91f0f97d5c2a3f9ee8c6e7fdfd2f48106f3..474b5bdd1d0c8fc2be8b7a79ca430a0e02d591b4 100644 (file)
--- a/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc
+++ b/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc
@@ -367,6 +367,8 @@ This is useful for instance for a Representative Volume Element so that the tran
 
 In GUI, periodicity association uses PreCAD (optional MG-CADSurf add-on). Be sure to have a PreCAD license to be able to use it. Otherwise, use \ref periodicity_tui_basic_api_usage "the basic API in TUI" or the \ref periodicity_tui_advanced_api_usage "the advanced API in TUI".
 
+Remark: to use the basic API to define periodicity, you have to disable PreCAD.
+
 \image html blsurf_periodicity_translation.png "Two periodic faces (translation)"
 
 \image html blsurf_periodicity_reflexion.png "Two periodic faces (reflexion)"

diff --git a/src/BLSURFPlugin/BLSURFPluginBuilder.py b/src/BLSURFPlugin/BLSURFPluginBuilder.py
index 06adba9cddc98c8a22a90d11c66233264c79be4d..9c4af7519d999d866f69b299747453612bbb3e48 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPluginBuilder.py
+++ b/src/BLSURFPlugin/BLSURFPluginBuilder.py
@@ -162,7 +162,7 @@ class BLSURF_Algorithm(Mesh_Algorithm):
   # <li>PreProcess or PreProcessPlus - by pre-processing a CAD model (OBSOLETE: FromCAD will be used)</li>
   # <li>PreCAD - by pre-processing with PreCAD a CAD model</li></ul>
   def SetTopology(self, way):
-    if way != PreCAD:
+    if way != PreCAD and way != FromCAD:
       print "Warning: topology mode %d is no longer supported. Mode FromCAD is used."%way
       way = FromCAD
     self.Parameters().SetTopology(way)

diff --git a/tests/test_enforced_internal_vertex.py b/tests/test_enforced_internal_vertex.py
index c7f3661cb5890d98593b2cd4a89cacc11ddf09b8..85dc59c736205c23607d41fa1f5aad7165037d97 100644 (file)
--- a/tests/test_enforced_internal_vertex.py
+++ b/tests/test_enforced_internal_vertex.py
@@ -35,7 +35,7 @@ smesh = smeshBuilder.New(salome.myStudy)
 
 Mesh = smesh.Mesh(part, "Mesh")
 
-algo2d = Mesh.Triangle(algo=smeshBuilder.BLSURF)
+algo2d = Mesh.Triangle(algo=smeshBuilder.MG_CADSurf)
 algo2d.SetGeometricMesh( 1 )
 algo2d.SetAngleMesh( 4 )
 algo2d.SetPhySize( 8 )

diff --git a/tests/test_enforced_vertex.py b/tests/test_enforced_vertex.py
index f22b392b9e5c987c37711458280dbd50196c65d3..5004bf6cb3e3f3b39e5ab4ff071a0a6fe4275ad7 100644 (file)
--- a/tests/test_enforced_vertex.py
+++ b/tests/test_enforced_vertex.py
@@ -32,7 +32,7 @@ smesh = smeshBuilder.New(salome.myStudy)
 Mesh = smesh.Mesh(box, "Mesh")
 
 
-algo2d = Mesh.Triangle(algo=smeshBuilder.BLSURF)
+algo2d = Mesh.Triangle(algo=smeshBuilder.MG_CADSurf)
 algo2d.SetGeometricMesh( 1 )
 algo2d.SetAngleMesh( 4 )
 algo2d.SetPhySize( 8 )

diff --git a/tests/test_periodicity.py b/tests/test_periodicity.py
index 5fb0085fd664fdd0dde5cc6ef9c7e951661f84c1..28283224b64ebd76b90a1ef1d413cd9c377c60f3 100644 (file)
--- a/tests/test_periodicity.py
+++ b/tests/test_periodicity.py
@@ -94,13 +94,17 @@ import SMESH
 from salome.smesh import smeshBuilder
 smesh = smeshBuilder.New(salome.myStudy)
 
+from salome.BLSURFPlugin import BLSURFPluginBuilder
+
 Mesh = smesh.Mesh(part, "Mesh")
 
-algo2d = Mesh.Triangle(algo=smeshBuilder.BLSURF)
+algo2d = Mesh.Triangle(algo=smeshBuilder.MG_CADSurf)
 algo2d.SetGeometricMesh( 1 )
 algo2d.SetAngleMesh( 4 )
 algo2d.SetPhySize( 8 )
 algo2d.SetOptionValue( 'periodic_tolerance', '1e-2' )
+# Deactivate PreCAD
+algo2d.SetTopology(BLSURFPluginBuilder.FromCAD)
 
 def proj_x(shape1):
     shape2 = geompy.MakeTranslation(shape1, 100, 0., 0)

diff --git a/tests/test_periodicity_2D.py b/tests/test_periodicity_2D.py
index 13c7fcd36c7d1957b30f2b516b5f29a7a8072bd8..d5a07bc079eadc3801031e707348e70356854932 100644 (file)
--- a/tests/test_periodicity_2D.py
+++ b/tests/test_periodicity_2D.py
@@ -56,9 +56,11 @@ import SMESH
 from salome.smesh import smeshBuilder
 smesh = smeshBuilder.New(salome.myStudy)
 
+from salome.BLSURFPlugin import BLSURFPluginBuilder
+
 Mesh = smesh.Mesh(part, "Mesh")
 
-algo2d = Mesh.Triangle(algo=smeshBuilder.BLSURF)
+algo2d = Mesh.Triangle(algo=smeshBuilder.MG_CADSurf)
 algo2d.SetVerbosity(10)
 #algo2d.SetTopology(smesh.PreCAD)
 algo2d.SetGeometricMesh( 1 )
@@ -66,6 +68,8 @@ algo2d.SetAngleMesh( 4 )
 algo2d.SetPhySize( 8 )
 #algo2d.SetGradation(1.05)
 algo2d.SetOptionValue( 'periodic_tolerance', '1e-2' )
+# Deactivate PreCAD
+algo2d.SetTopology(BLSURFPluginBuilder.FromCAD)
 
 # Periodicity
 

diff --git a/tests/test_periodicity_2D_precad.py b/tests/test_periodicity_2D_precad.py
index 93821710eff333cdb71342e99b9b2ca9ad7b4de1..027c4f33697f48aaa5da887e07d281cd61a46657 100644 (file)
--- a/tests/test_periodicity_2D_precad.py
+++ b/tests/test_periodicity_2D_precad.py
@@ -65,7 +65,7 @@ smesh = smeshBuilder.New(salome.myStudy)
 
 Mesh = smesh.Mesh(part, "Mesh")
 
-algo2d = Mesh.Triangle(algo=smeshBuilder.BLSURF)
+algo2d = Mesh.Triangle(algo=smeshBuilder.MG_CADSurf)
 algo2d.SetGeometricMesh( 1 )
 algo2d.SetAngleMesh( 4 )
 algo2d.SetPhySize( 8 )

diff --git a/tests/test_periodicity_precad.py b/tests/test_periodicity_precad.py
index 8a10ddade8bc981ed02fc16a7b42731815b094e3..bbbfaa23cbac8b0da68cf729d943f0e09c52a9ce 100644 (file)
--- a/tests/test_periodicity_precad.py
+++ b/tests/test_periodicity_precad.py
@@ -94,7 +94,7 @@ smesh = smeshBuilder.New(salome.myStudy)
 
 Mesh = smesh.Mesh(part, "Mesh")
 
-algo2d = Mesh.Triangle(algo=smeshBuilder.BLSURF)
+algo2d = Mesh.Triangle(algo=smeshBuilder.MG_CADSurf)
 algo2d.SetGeometricMesh( 1 )
 algo2d.SetAngleMesh( 4 )
 algo2d.SetPhySize( 8 )

diff --git a/tests/test_periodicity_reflexion.py b/tests/test_periodicity_reflexion.py
index 2ff31adbe6a032c883395940372d6fb19484b0ec..91b79b51f21361ea1c10f0aca2b87b4ef13fdf64 100644 (file)
--- a/tests/test_periodicity_reflexion.py
+++ b/tests/test_periodicity_reflexion.py
@@ -80,13 +80,17 @@ import SMESH
 from salome.smesh import smeshBuilder
 smesh = smeshBuilder.New(salome.myStudy)
 
+from salome.BLSURFPlugin import BLSURFPluginBuilder
+
 Mesh = smesh.Mesh(part, "Mesh")
 
-algo2d = Mesh.Triangle(algo=smeshBuilder.BLSURF)
+algo2d = Mesh.Triangle(algo=smeshBuilder.MG_CADSurf)
 algo2d.SetGeometricMesh( 1 )
 algo2d.SetAngleMesh( 4 )
 algo2d.SetPhySize( 8 )
 algo2d.SetOptionValue( 'periodic_tolerance', '1e-2' )
+# Deactivate PreCAD
+algo2d.SetTopology(BLSURFPluginBuilder.FromCAD)
 
 def rota_z(shape1):
     shape2 = geompy.MakeRotation(shape1, axe, -math.pi/2)

diff --git a/tests/test_periodicity_reflexion_2D.py b/tests/test_periodicity_reflexion_2D.py
index 8bc95c894068f484a538ab367d91322817b102ee..7f9f63962b54e7467306af3d732da809bee2a36c 100644 (file)
--- a/tests/test_periodicity_reflexion_2D.py
+++ b/tests/test_periodicity_reflexion_2D.py
@@ -56,9 +56,11 @@ import SMESH
 from salome.smesh import smeshBuilder
 smesh = smeshBuilder.New(salome.myStudy)
 
+from salome.BLSURFPlugin import BLSURFPluginBuilder
+
 Mesh = smesh.Mesh(part, "Mesh")
 
-algo2d = Mesh.Triangle(algo=smeshBuilder.BLSURF)
+algo2d = Mesh.Triangle(algo=smeshBuilder.MG_CADSurf)
 algo2d.SetVerbosity(1)
 #algo2d.SetTopology(smesh.PreCAD)
 algo2d.SetGeometricMesh( 1 )
@@ -66,6 +68,8 @@ algo2d.SetAngleMesh( 4 )
 algo2d.SetPhySize( 8 )
 #algo2d.SetGradation(1.05)
 algo2d.SetOptionValue( 'periodic_tolerance', '1e-2' )
+# Deactivate PreCAD
+algo2d.SetTopology(BLSURFPluginBuilder.FromCAD)
 
 # Periodicity
 

diff --git a/tests/test_periodicity_reflexion_2D_precad.py b/tests/test_periodicity_reflexion_2D_precad.py
index 5eed201e36e135ed35753d6ec60633361c343df2..8c0393ffc6d9c12795ca13891581b590e4745155 100644 (file)
--- a/tests/test_periodicity_reflexion_2D_precad.py
+++ b/tests/test_periodicity_reflexion_2D_precad.py
@@ -78,7 +78,7 @@ smesh = smeshBuilder.New(salome.myStudy)
 
 Mesh = smesh.Mesh(part, "Mesh")
 
-algo2d = Mesh.Triangle(algo=smeshBuilder.BLSURF)
+algo2d = Mesh.Triangle(algo=smeshBuilder.MG_CADSurf)
 algo2d.SetGeometricMesh( 1 )
 algo2d.SetAngleMesh( 4 )
 algo2d.SetPhySize( 8 )

diff --git a/tests/test_periodicity_reflexion_precad.py b/tests/test_periodicity_reflexion_precad.py
index efaee7c45aa4812e38d2d28e80c552cd34b6c1c9..f11a4dfae46787f2bf35878f130a0c7c121b2185 100644 (file)
--- a/tests/test_periodicity_reflexion_precad.py
+++ b/tests/test_periodicity_reflexion_precad.py
@@ -81,7 +81,7 @@ smesh = smeshBuilder.New(salome.myStudy)
 
 Mesh = smesh.Mesh(part, "Mesh")
 
-algo2d = Mesh.Triangle(algo=smeshBuilder.BLSURF)
+algo2d = Mesh.Triangle(algo=smeshBuilder.MG_CADSurf)
 algo2d.SetGeometricMesh( 1 )
 algo2d.SetAngleMesh( 4 )
 algo2d.SetPhySize( 8 )

diff --git a/tests/test_periodicity_with_points_2D_precad.py b/tests/test_periodicity_with_points_2D_precad.py
index 53223760a8ef5362be6e3eefd51854f5068b3cba..f303d63e27f4b28839138b01afda517cd4b61985 100644 (file)
--- a/tests/test_periodicity_with_points_2D_precad.py
+++ b/tests/test_periodicity_with_points_2D_precad.py
@@ -77,7 +77,7 @@ smesh = smeshBuilder.New(salome.myStudy)
 
 Mesh = smesh.Mesh(part, "Mesh")
 
-algo2d = Mesh.Triangle(algo=smeshBuilder.BLSURF)
+algo2d = Mesh.Triangle(algo=smeshBuilder.MG_CADSurf)
 algo2d.SetGeometricMesh( 1 )
 algo2d.SetAngleMesh( 4 )
 algo2d.SetPhySize( 8 )

diff --git a/tests/test_precad_intersections.py b/tests/test_precad_intersections.py
index 1736d1dd55c54aab845cc46dd4432f63a81469b3..c4e991b9ae9ee9e8478a2b081dd804f440ac5317 100644 (file)
--- a/tests/test_precad_intersections.py
+++ b/tests/test_precad_intersections.py
@@ -44,7 +44,7 @@ smesh = smeshBuilder.New(salome.myStudy)
 
 Mesh_1 = smesh.Mesh(Partition_1)
 
-BLSURF_1 = Mesh_1.Triangle(algo=smeshBuilder.BLSURF)
+BLSURF_1 = Mesh_1.Triangle(algo=smeshBuilder.MG_CADSurf)
 BLSURF_Parameters = BLSURF_1.Parameters()
 BLSURF_Parameters.SetPhySize( 5 )
 BLSURF_Parameters.SetPreCADMergeEdges( True )

diff --git a/tests/test_precad_keep_gaps.py b/tests/test_precad_keep_gaps.py
index 1809f6371b2ec9afdfe678136a0fef9f1c31967c..b23102ce07c349885ee86a249980cb2b72d761ff 100644 (file)
--- a/tests/test_precad_keep_gaps.py
+++ b/tests/test_precad_keep_gaps.py
@@ -44,7 +44,7 @@ smesh = smeshBuilder.New(salome.myStudy)
 
 Mesh_1 = smesh.Mesh(Partition_1)
 
-BLSURF_1 = Mesh_1.Triangle(algo=smeshBuilder.BLSURF)
+BLSURF_1 = Mesh_1.Triangle(algo=smeshBuilder.MG_CADSurf)
 BLSURF_Parameters = BLSURF_1.Parameters()
 BLSURF_Parameters.SetPhySize( 5 )
 

diff --git a/tests/test_sphere.py b/tests/test_sphere.py
index 4070292ebc0837154451d4ad95cf76364197a886..2f52eb1f03c4b99783ce79a69af1f12dbf824244 100644 (file)
--- a/tests/test_sphere.py
+++ b/tests/test_sphere.py
@@ -31,7 +31,7 @@ smesh = smeshBuilder.New(salome.myStudy)
 
 Mesh_1 = smesh.Mesh(sphere)
 
-BLSURF_1 = Mesh_1.Triangle(algo=smeshBuilder.BLSURF)
+BLSURF_1 = Mesh_1.Triangle(algo=smeshBuilder.MG_CADSurf)
 BLSURF_Parameters = BLSURF_1.Parameters()
 BLSURF_Parameters.SetPhySize( 5 )
 BLSURF_Parameters.SetGeometricMesh( 1 )