New test and fix on BlockMeshingPropertyDelaunayTetgen

Author: mpoudot

src/Core/protected/Topo/BlockMeshingPropertyDelaunayTetgen.h

@@ -36,7 +36,7 @@ class BlockMeshingPropertyDelaunayTetgen : public BlockMeshingProperty {
     /// Constructeur pour la méthode de maillage d'un bloc avec le Delaunay de Tetgen
     BlockMeshingPropertyDelaunayTetgen(const DelaunayLaw delLaw = QC,
                                        const double val=2.0, const double val2 = 2.0, double ratio_pyramid_size=1.0)
-    : m_law(delLaw), m_verbose(false), m_is_default(true), m_ratio_pyramid_size(ratio_pyramid_size)
+    : m_law(delLaw), m_verbose(false), m_is_default(delLaw == QC && val==2.0 && val2==2.0 && ratio_pyramid_size==1.0), m_ratio_pyramid_size(ratio_pyramid_size)
     {
         if(m_law==QC){
             m_radius_edge_ratio=val;
@@ -63,7 +63,7 @@ class BlockMeshingPropertyDelaunayTetgen : public BlockMeshingProperty {
       m_radius_edge_ratio(radius_edge_ratio),
       m_max_volume(max_volume),
       m_verbose(false),
-      m_is_default(true),
+      m_is_default(m_radius_edge_ratio==2.0 && m_max_volume==2.0 && m_ratio_pyramid_size==1.0),
 	  m_ratio_pyramid_size(ratio_pyramid_size)
     {}
 
@@ -176,7 +176,6 @@ class BlockMeshingPropertyDelaunayTetgen : public BlockMeshingProperty {
 #endif
 
 private:
-
     DelaunayLaw m_law;
 
     // indique de passer en mode verbose pour remonter des informations de

test_link/test_command_edit_geom.py

@@ -1,6 +1,7 @@
+import math
 import pyMagix3D as Mgx3D
 
-def test_command_join_entities(capfd):
+def test_command_join_entities():
     ctx = Mgx3D.getStdContext()
     ctx.clearSession() # Clean the session after the previous test
     gm = ctx.getGeomManager ()
@@ -56,7 +57,7 @@ def test_command_join_entities(capfd):
     ctx.redo()
     assert gm.getNbCurves()==25
 
-def test_command_scaling(capfd):
+def test_command_scaling():
     ctx = Mgx3D.getStdContext()
     ctx.clearSession() # Clean the session after the previous test
     gm = ctx.getGeomManager ()
@@ -93,7 +94,7 @@ def test_command_scaling(capfd):
     ctx.redo()
     assertPoint(gm, "Pt0001", 1, 1, 1)
 
-def test_command_scaling_2(capfd):
+def test_command_scaling_2():
     ctx = Mgx3D.getStdContext()
     ctx.clearSession() # Clean the session after the previous test
     gm = ctx.getGeomManager ()
@@ -109,7 +110,7 @@ def test_command_scaling_2(capfd):
     gm.scale (["Vol0000"], 3.000000e+00)
     assertPoint(tm, "Som0006", 3, 3, 3)
 
-def test_command_remove(capfd):
+def test_command_remove():
     ctx = Mgx3D.getStdContext()
     ctx.clearSession() # Clean the session after the previous test
     gm = ctx.getGeomManager ()
@@ -146,7 +147,17 @@ def test_command_remove(capfd):
     assert gm.getNbSurfaces()==3
     assert gm.getNbCurves()==10
 
-def test_command_mirroring(capfd):
+def test_command_mirror():
+    ctx = Mgx3D.getStdContext()
+    ctx.clearSession() # Clean the session after the previous test
+    gm = ctx.getGeomManager ()
+    tm = ctx.getTopoManager()
+    tm.newSphereWithTopo (Mgx3D.Point(0, 0, 0), 1, Mgx3D.Portion.HUITIEME, True, 0.5, 10, 10, "A")
+    assertClosePoint(gm, "Pt0000", 0, 0, 1)
+    gm.mirror(["Vol0000"], Mgx3D.Plane(Mgx3D.Point(0, 0, 0), Mgx3D.Vector(0, 0, 1)))
+    assertClosePoint(gm, "Pt0000", 0, 0, -1)
+
+def test_command_copy_mirror():
     #Ce test prend aussi en charge l'appel à CommandGeomCopy
     ctx = Mgx3D.getStdContext()
     ctx.clearSession() # Clean the session after the previous test
@@ -176,7 +187,7 @@ def test_command_mirroring(capfd):
     assert gm.getNbSurfaces()==17
     assert gm.getNbCurves()==32
 
-def test_command_common(capfd):
+def test_command_common():
     ctx = Mgx3D.getStdContext()
     ctx.clearSession() # Clean the session after the previous test
     gm = ctx.getGeomManager ()
@@ -206,7 +217,7 @@ def test_command_common(capfd):
     assert gm.getNbSurfaces()==11
     assert gm.getNbCurves()==20
 
-def test_command_common2d(capfd):
+def test_command_common2d():
     ctx = Mgx3D.getStdContext()
     ctx.clearSession() # Clean the session after the previous test
     gm = ctx.getGeomManager ()
@@ -240,4 +251,10 @@ def assertPoint(m, point, x, y, z):
     p = m.getCoord(point)
     assert p.getX() == x
     assert p.getY() == y
-    assert p.getZ() == z
+    assert p.getZ() == z
+
+def assertClosePoint(m, point, x, y, z):
+    p = m.getCoord(point)
+    assert math.isclose(p.getX(), x, abs_tol=1e-15)
+    assert math.isclose(p.getY(), y, abs_tol=1e-15)
+    assert math.isclose(p.getZ(), z, abs_tol=1e-15)

test_link/test_groups.py

@@ -2,6 +2,26 @@
 import pyMagix3D as Mgx3D
 import pytest
 
+def test_undo_hg():
+    ctx = Mgx3D.getStdContext()
+    ctx.clearSession() # Clean the session after the previous test
+
+    ctx.getGeomManager().newBox (Mgx3D.Point(0, 0, 0), Mgx3D.Point(1, 1, 1), "GGG")
+    with pytest.raises(RuntimeError) as excinfo:
+        ctx.getGroupManager().getInfos("Hors_Groupe_3D", 3)
+    ctx.getGroupManager().clearGroup(3, "GGG")
+    ctx.undo()
+    #with pytest.raises(RuntimeError) as excinfo:
+    #    ctx.getGroupManager().getInfos("Hors_Groupe_3D", 3)
+
+def test_set_topo_group():
+    ctx = Mgx3D.getStdContext()
+    ctx.clearSession() # Clean the session after the previous test
+    ctx.getTopoManager().newBoxWithTopo (Mgx3D.Point(0, 0, 0), Mgx3D.Point(1, 1, 1), 10, 10, 10)
+    with pytest.raises(RuntimeError) as excinfo:
+        ctx.getTopoManager().setGroup(["Bl0000"], 3, "AAA")
+    assert "Le groupe Hors_Groupe_3D ne contient pas Bl0000" in str(excinfo.value)
+
 def test_group_box():
     ctx = Mgx3D.getStdContext()
     ctx.clearSession() # Clean the session after the previous test
@@ -13,37 +33,45 @@ def test_group_box():
     coque = "Coque"
     ctx.getTopoManager().newBoxWithTopo (Mgx3D.Point(0, 0, 0), Mgx3D.Point(1, 1, 1), 10, 10, 10, acier)
     assert_all(ctx, "Bl0000", [acier])
-    
+
+    # Création d'une box avec topo sans groupe
     ctx.getTopoManager().newBoxWithTopo (Mgx3D.Point(0, 0, 0), Mgx3D.Point(1, 1, 1), 10, 10, 10)
     assert_all(ctx, "Bl0001", [hors_group])
+
+    # On ajoute le volume geom dans le groupe plastique 
+    # => le bloc topo est aussi dans le groupe plastique
     ctx.getGeomManager().addToGroup(["Vol0001"], 3, plastique)
     assert_all(ctx, "Bl0001", [plastique])
     ctx.undo()
     assert_all(ctx, "Bl0001", [hors_group])
     ctx.redo()
     assert_all(ctx, "Bl0001", [plastique])
 
+    # On affecte le volume geom dans le groupe coque 
+    # => le bloc topo est aussi et seulement dans le groupe coque
     ctx.getGeomManager().setGroup(["Vol0001"], 3, coque)
     assert_all(ctx, "Bl0001", [coque])
     ctx.undo()
     assert_all(ctx, "Bl0001", [plastique])
     ctx.redo()
     assert_all(ctx, "Bl0001", [coque])
-    
+
+    # On retire le volume geom du groupe coque 
+    # => le bloc topo est dans le groupe Hors_Groupe_3D
     ctx.getGeomManager().removeFromGroup(["Vol0001"], 3, coque)
     assert_all(ctx, "Bl0001", [hors_group])
     ctx.undo()
     assert_all(ctx, "Bl0001", [coque])
-    
+
+    # On détruit le groupe coque
+    # => le bloc topo est dans le groupe Hors_Groupe_3D
     ctx.getGroupManager().clearGroup(3, coque)
     assert_all(ctx, "Bl0001", [hors_group])
     ctx.undo()
-    #TODO Créer une issue
-    #assert_all(ctx, "Bl0001", [coque])
+    assert_all(ctx, "Bl0001", [coque])
 
     ctx.getGeomManager().addToGroup(["Vol0001"], 3, plastique) 
-    #TODO Cf issue précédente
-    #assert_all(ctx, "Bl0001", [plastique, coque])
+    assert_all(ctx, "Bl0001", [plastique, coque])
 
 
 def assert_all(ctx, block, group_names):

test_link/test_ns_mesh.py

@@ -70,12 +70,12 @@ def test_ns_mesh_2(capfd):
     mm.newAllBlocksMesh()
 
     assert gm.getNbVolumes() == 2
-    assert mm.getNbFaces() < 1900
+    assert mm.getNbFaces() < 1950
     assert mm.getNbFaces() > 1850
     out, err = capfd.readouterr()
     assert len(err) == 0
 
-def test_ns_mesh_2(capfd):
+def test_ns_mesh_3(capfd):
     ctx = Mgx3D.getStdContext()
     ctx.clearSession() # Clean the session after the previous test
     gm = ctx.getGeomManager()
@@ -109,3 +109,21 @@ def test_block_on_box_union(capfd):
     assert gm.getNbVolumes() == 1
     out, err = capfd.readouterr()
     assert len(err) == 0
+
+def test_block_on_cut_surface(capfd):
+    ctx = Mgx3D.getStdContext()
+    ctx.clearSession() # Clean the session after the previous test
+    gm = ctx.getGeomManager()
+    tm = ctx.getTopoManager()
+    mm = ctx.getMeshManager()
+
+    gm.newBox(Mgx3D.Point(0, 0, 0), Mgx3D.Point(1, 1, 1))
+    gm.newCylinder(Mgx3D.Point(0, 0, 0), 0.2, Mgx3D.Vector(1, 0, 0), 360)
+    gm.translate(["Vol0001"], Mgx3D.Vector(0, 0.5, 0.5))
+    gm.cut(["Vol0000"], ["Vol0001"])
+    tm.newUnstructuredTopoOnGeometry("Vol0002")
+    mm.newAllBlocksMesh()
+
+    assert gm.getNbVolumes() == 1
+    out, err = capfd.readouterr()
+    assert len(err) == 0

test_link/test_nsbox_cylinder.py

@@ -0,0 +1,47 @@
+import pyMagix3D as Mgx3D
+
+# Maillage structuré du cylindre et non structuré du cube
+def test_nsbox_cylinder(capfd):
+    ctx = Mgx3D.getStdContext()
+    gm = ctx.getGeomManager()
+    tm = ctx.getTopoManager()
+    ctx.clearSession() # Clean the session after the previous test
+
+    # Création d'un cylindre avec une topologie
+    tm.newCylinderWithTopo(Mgx3D.Point(0, 0, 0), .2, Mgx3D.Vector(1, 0, 0), 90, True, .5, 10, 10, 10, "A")
+    # Création d'une boite
+    gm.newBox(Mgx3D.Point(0, 0, 0), Mgx3D.Point(1, 1, 1), "B")
+    # Rotation d'une géométrie
+    gm.rotate(["Vol0000"], Mgx3D.RotX(270))
+    # Collage entre géométries
+    gm.glue(["Vol0001", "Vol0000"])
+    # Création d'un bloc topologique non structuré sur une géométrie
+    tm.newUnstructuredTopoOnGeometry("Vol0002")
+    # Création du maillage pour tous les blocs
+    ctx.getMeshManager().newAllBlocksMesh()
+
+    out, err = capfd.readouterr()
+    assert len(err) == 0
+
+# Maillage non structuré du cylindre et du cube
+def test_nsbox_nscylinder(capfd):
+    ctx = Mgx3D.getStdContext()
+    gm = ctx.getGeomManager()
+    tm = ctx.getTopoManager()
+    ctx.clearSession() # Clean the session after the previous test
+
+    # Création d'une boite
+    gm.newBox(Mgx3D.Point(0, 0, 0), Mgx3D.Point(1, 1, 1))
+    # Création d'un cylindre
+    gm.newCylinder(Mgx3D.Point(0, 0, 0), .2, Mgx3D.Vector(1, 0, 0), 360)
+    # Rotation d'une géométrie
+    gm.translate(["Vol0001"], Mgx3D.Vector(0.5, 0.5, 0.5))
+    # Fusion booléennes entre géométries
+    gm.fuse(["Vol0000", "Vol0001"])
+    # Création d'un bloc topologique non structuré sur une géométrie
+    tm.newUnstructuredTopoOnGeometry("Vol0002")
+    # Création du maillage pour tous les blocs
+    ctx.getMeshManager().newAllBlocksMesh()
+
+    out, err = capfd.readouterr()
+    assert len(err) == 0

test_link/test_nsbox_scylinder.py

@@ -0,0 +1,55 @@
+import pyMagix3D as Mgx3D
+import pytest
+
+def test_set_block_meshing_property(capfd):
+    ctx = Mgx3D.getStdContext()
+    ctx.clearSession() # Clean the session after the previous test
+    gm = ctx.getGeomManager()
+    tm = ctx.getTopoManager()
+
+    gm.newBox (Mgx3D.Point(0, 0, 0), Mgx3D.Point(1, 1, 1))
+    gm.newBox (Mgx3D.Point(1, 0, 0), Mgx3D.Point(2, 1, 1))
+    gm.newBox (Mgx3D.Point(2, 0, 0), Mgx3D.Point(3, 1, 1))
+    gm.newBox (Mgx3D.Point(3, 0, 0), Mgx3D.Point(4, 1, 1))
+
+    tm.newUnstructuredTopoOnGeometry("Vol0000")
+    tm.newUnstructuredTopoOnGeometry("Vol0001")
+    tm.newUnstructuredTopoOnGeometry("Vol0002")
+    tm.newUnstructuredTopoOnGeometry("Vol0003")
+
+    tm.setMeshingProperty (Mgx3D.BlockMeshingPropertyDelaunayTetgen(Mgx3D.BlockMeshingPropertyDelaunayTetgen.Min), ["Bl0000"])
+    tm.setMeshingProperty (Mgx3D.BlockMeshingPropertyDelaunayTetgen(Mgx3D.BlockMeshingPropertyDelaunayTetgen.QC, 0.8, 0.1), ["Bl0001"])
+    tm.setMeshingProperty (Mgx3D.BlockMeshingPropertyDelaunayTetgen(Mgx3D.BlockMeshingPropertyDelaunayTetgen.QCRadius, 0.5), ["Bl0002"])
+    tm.setMeshingProperty (Mgx3D.BlockMeshingPropertyDelaunayTetgen(Mgx3D.BlockMeshingPropertyDelaunayTetgen.QCMaxVol, 0.001), ["Bl0003"])
+
+    ctx.getMeshManager().newBlocksMesh(["Bl0000", "Bl0001", "Bl0002", "Bl0003"])
+
+    out, err = capfd.readouterr()
+    assert len(err) == 0
+
+def test_set_edge_meshing_property():
+    ctx = Mgx3D.getStdContext()
+    ctx.clearSession() # Clean the session after the previous test
+    tm = ctx.getTopoManager()
+
+    tm.newBoxWithTopo (Mgx3D.Point(0, 0, 0), Mgx3D.Point(1, 1, 1))
+    emp = Mgx3D.EdgeMeshingPropertyUniform(12)
+    tm.setMeshingProperty (emp, ["Ar0000"])
+
+    with pytest.raises(RuntimeError) as excinfo:
+        ctx.getMeshManager().newAllBlocksMesh()
+    assert "2 arêtes n'ont pas la même discrétisation" in str(excinfo.value)
+
+def test_set_face_meshing_property(capfd):
+    ctx = Mgx3D.getStdContext()
+    ctx.clearSession() # Clean the session after the previous test
+    gm = ctx.getGeomManager()
+    tm = ctx.getTopoManager()
+
+    gm.newBox (Mgx3D.Point(0, 0, 0), Mgx3D.Point(1, 1, 1))
+    tm.newUnstructuredTopoOnGeometry("Vol0000")
+    tm.setMeshingProperty (Mgx3D.FaceMeshingPropertyDelaunayGMSH(0.03, 0.07), ["Fa0005"])
+    ctx.getMeshManager().newAllBlocksMesh()
+
+    out, err = capfd.readouterr()
+    assert len(err) == 0

test_link/test_set_meshing_property.py

@@ -0,0 +1,26 @@
+import pyMagix3D as Mgx3D
+import pytest
+
+def test_snap_vertices_1():
+    ctx = Mgx3D.getStdContext()
+    ctx.clearSession() # Clean the session after the previous test
+    tm = ctx.getTopoManager()
+
+    tm.newBoxWithTopo (Mgx3D.Point(0, 0, 0), Mgx3D.Point(1, 1, 1), 10, 10, 10)
+    tm.splitFace ("Fa0000", "Ar0001", .5, True)
+    tm.splitBlocksWithOgridV2 (["Bl0000"], ["Fa0007","Fa0006","Fa0005","Fa0004"], .5, 10)
+    with pytest.raises(RuntimeError) as excinfo:
+        tm.snapVertices ("Fa0022", "Fa0021", True)
+    assert "il n'est pas prévu pour le moment le cas avec plusieurs arêtes communes entre les sommets fusionnés" in str(excinfo.value)
+
+def test_snap_vertices_2(capfd):
+    ctx = Mgx3D.getStdContext()
+    ctx.clearSession() # Clean the session after the previous test
+    tm = ctx.getTopoManager()
+
+    tm.newIJBoxesWithTopo(1, 2, False)
+    tm.snapVertices ("Ar0001", "Ar0003", True)
+    tm.snapVertices ("Ar0013", "Ar0015", True)
+
+    out, err = capfd.readouterr()
+    assert len(err) == 0