Merge branch 'main' into issue#262

Author: mpoudot

testExportData/section_box1.py

@@ -1,4 +1,5 @@
 import pyMagix3D as Mgx3D
+import os
 
 ctx = Mgx3D.getStdContext()
 gm = ctx.getGeomManager()
@@ -44,5 +45,10 @@
 # Création du maillage pour tous les blocs
 mm.newAllBlocksMesh()
 # Sauvegarde du maillage (mli)
-filename = "section.mli2"
-mm.writeMli(filename)
+filename = "/dev/shm/section.mli2"
+mm.writeMli(filename)
+
+assert os.path.exists(filename)
+assert os.path.getsize(filename) > 0
+
+os.remove(filename)

test_link/test_export_cgns.py

@@ -5,7 +5,7 @@ def test_export_demicyl_3d(capfd):
     ctx = Mgx3D.getStdContext()
     ctx.clearSession() # Clean the session after the previous test
 
-    cgnsfilename = "demiCylinder.cgns"
+    cgnsfilename = "/dev/shm/demiCylinder.cgns"
     ctx.getTopoManager().newCylinderWithTopo (Mgx3D.Point(0, 0, 0), 1, Mgx3D.Vector(10, 0, 0), 360, True, .5, 10, 10, 10)
     ctx.getTopoManager().splitAllBlocks ("Ar0013",.5)
     ctx.getTopoManager().splitAllBlocks ("Ar0004",.5)
@@ -34,13 +34,13 @@ def test_export_demicyl_3d(capfd):
     out, err = capfd.readouterr()
     assert len(err) == 0
 
-
+    os.remove(cgnsfilename)
 
 def test_export_quad_2d(capfd):
     ctx = Mgx3D.getStdContext()
     ctx.clearSession() # Clean the session after the previous test
 
-    cgnsfilename = "quadOGrid.cgns"
+    cgnsfilename = "/dev/shm/quadOGrid.cgns"
     ctx.getGeomManager().newVertex (Mgx3D.Point(0, 0, 0))
     ctx.getGeomManager().newVertex (Mgx3D.Point(1, 0, 0))
     ctx.getGeomManager().newVertex (Mgx3D.Point(1, 1, 0))
@@ -69,3 +69,5 @@ def test_export_quad_2d(capfd):
     assert os.path.getsize(cgnsfilename) > 0
     out, err = capfd.readouterr()
     assert len(err) == 0
+
+    os.remove(cgnsfilename)

test_link/test_export_vtk.py

@@ -6,7 +6,7 @@ def test_export_box(capfd):
     ctx = Mgx3D.getStdContext()
     ctx.clearSession() # Clean the session after the previous test
 
-    vtkfilename = "box.vtk"
+    vtkfilename = "/dev/shm/box.vtk"
     ctx.getGeomManager().newBox (Mgx3D.Point(0, 0, 0), Mgx3D.Point(1, 1, 1))
     ctx.getTopoManager().newUnstructuredTopoOnGeometry("Vol0000")
     ctx.getMeshManager().newAllFacesMesh()
@@ -17,11 +17,13 @@ def test_export_box(capfd):
     out, err = capfd.readouterr()
     assert len(err) == 0
 
+    os.remove(vtkfilename)
+
 def test_export_cylinder(capfd):
     ctx = Mgx3D.getStdContext()
     ctx.clearSession() # Clean the session after the previous test
 
-    vtkfilename = "cylinder.vtk"
+    vtkfilename = "/dev/shm/cylinder.vtk"
     ctx.getGeomManager().newCylinder(Mgx3D.Point(0.3, 0.5, 0.5), 0.4, Mgx3D.Vector(0.4, 0, 0), 360)
     ctx.getTopoManager().newUnstructuredTopoOnGeometry("Vol0000")
     ctx.getMeshManager().newAllFacesMesh()
@@ -32,6 +34,8 @@ def test_export_cylinder(capfd):
     out, err = capfd.readouterr()
     assert len(err) == 0
 
+    os.remove(vtkfilename)
+
 def test_export_imported_step(capfd):
     ctx = Mgx3D.getStdContext()
     ctx.clearSession() # Clean the session after the previous test
@@ -44,7 +48,7 @@ def test_export_imported_step(capfd):
     # Import STEP
     ctx.getGeomManager().importSTEP(step_file_path)
 
-    vtkfilename = "B0.vtk"
+    vtkfilename = "/dev/shm/B0.vtk"
     ctx.getTopoManager().newUnstructuredTopoOnGeometry("Vol0000")
     ctx.getMeshManager().newAllFacesMesh()
     ctx.getGeomManager().exportVTK(vtkfilename)
@@ -53,3 +57,5 @@ def test_export_imported_step(capfd):
     assert os.path.getsize(vtkfilename) > 0
     out, err = capfd.readouterr()
     assert len(err) == 0
+
+    os.remove(vtkfilename)

test_link/test_io_blocks.py

@@ -38,7 +38,7 @@ def test_export_no_assoc():
     tm = ctx.getTopoManager ()
 
     ctx.getTopoManager().newSphereWithTopo (Mgx3D.Point(0, 0, 0), 1, Mgx3D.Portion.DEMI, True, .5, 10, 10)
-    mgxt_filename = os.path.join(test_folder, "data/half_sphere_export.mgxt")
+    mgxt_filename = "/dev/shm/half_sphere_export.mgxt"
     tm.exportBlocks(mgxt_filename, False)
     assert os.path.exists(mgxt_filename)
     assert os.path.getsize(mgxt_filename) > 0
@@ -49,3 +49,5 @@ def test_export_no_assoc():
     assert tm.getNbFaces()==26
     assert tm.getNbEdges()==39
     assert len(tm.getVertices()) == 20
+
+    os.remove(mgxt_filename)

test_link/test_law_beta.py

@@ -2,11 +2,13 @@
 import pytest
 import math
 import LimaScripting as lima
+import os
 
 def l2_norme(n0, n1):
     return math.sqrt( pow(n1.x()-n0.x(),2) + pow(n1.y()-n0.y(),2) + pow(n1.z()-n0.z(),2) )
 
 
+
 def test_law_beta(capfd):
     ctx = Mgx3D.getStdContext()
     ctx.clearSession() # Clean the session after the previous test
@@ -28,7 +30,7 @@ def test_law_beta(capfd):
     ctx.getMeshManager().newAllBlocksMesh()
 
     # Sauvegarde du maillage (mli)
-    filename = "meshing_law_beta.mli2"
+    filename = "/dev/shm/meshing_law_beta.mli2"
     mm.writeMli(filename)
     mesh_lima = lima.Maillage()
     mesh_lima.lire(filename)
@@ -46,6 +48,8 @@ def test_law_beta(capfd):
     n25 = mesh_lima.noeud(25)
     assert( abs(l2_norme(n2, n25) - s1_ar0000) < eps )
 
+    os.remove(filename)
+
 
 
 # Beta law with target first mesh edge size seems to work only if this
@@ -73,7 +77,7 @@ def test_law_beta_onCurve_1(capfd):
     ctx.getMeshManager().newAllBlocksMesh()
 
     # Sauvegarde du maillage (mli)
-    filename = "meshing_law_beta_2.mli2"
+    filename = "/dev/shm/meshing_law_beta_2.mli2"
     mm.writeMli(filename)
     mesh_lima = lima.Maillage()
     mesh_lima.lire(filename)
@@ -89,6 +93,8 @@ def test_law_beta_onCurve_1(capfd):
     # real meshing edge size
     assert( abs(l2_norme(n0, n8) - 0.000123750926732273) < eps )
 
+    os.remove(filename)
+
 
 
 # Beta law with target first mesh edge size for a topological
@@ -131,7 +137,7 @@ def test_law_beta_onCurve_2(capfd):
     ctx.getMeshManager().newAllBlocksMesh()
 
     # Sauvegarde du maillage (mli)
-    filename = "meshing_law_beta_3.mli2"
+    filename = "/dev/shm/meshing_law_beta_3.mli2"
     mm.writeMli(filename)
     mesh_lima = lima.Maillage()
     mesh_lima.lire(filename)
@@ -145,4 +151,31 @@ def test_law_beta_onCurve_2(capfd):
     # target meshing edge size (not respected)
     assert( abs(l2_norme(n2, n17) - s1_ar0001) > eps )
     # real meshing edge size
-    assert( abs(l2_norme(n2, n17) - 0.0000594519721850694) < eps )
+    assert( abs(l2_norme(n2, n17) - 0.0000594519721850694) < eps )
+
+    os.remove(filename)
+
+
+
+# This test case shows that the "Inverser le sens" option doesn't work when the
+# beta law is used with a target first mesh edge size. To show this, we use the
+# same test as "test_law_beta", which is successful, and the only
+# difference is we turn false the direction option.
+def test_law_beta_fail(capfd):
+    ctx = Mgx3D.getStdContext()
+    ctx.clearSession() # Clean the session after the previous test
+
+    # chosen first mesh edge size
+    s1_ar0000 = 0.005
+
+    # Création d'une boite avec une topologie
+    ctx.getTopoManager().newBoxWithTopo (Mgx3D.Point(0, 0, 0), Mgx3D.Point(1, 1, 1), 10, 10, 10)
+
+    # Changement de discrétisation pour les arêtes Ar0000
+    emp = Mgx3D.EdgeMeshingPropertyBeta(10, 1.1, False, True, s1_ar0000)
+    ctx.getTopoManager().setMeshingProperty (emp, ["Ar0000"])
+    with pytest.raises(RuntimeError) as excinfo:
+        # Création du maillage pour tous les blocs
+        ctx.getMeshManager().newAllBlocksMesh()
+    expected = "EdgeMeshingPropertyBeta, on ne peut pas trouver de beta"
+    assert expected in str(excinfo.value)

test_link/test_law_biexponential.py

@@ -2,6 +2,7 @@
 import pytest
 import math
 import LimaScripting as lima
+import os
 
 def l2_norme(n0, n1):
     return math.sqrt( pow(n1.x()-n0.x(),2) + pow(n1.y()-n0.y(),2) + pow(n1.z()-n0.z(),2) )
@@ -32,7 +33,7 @@ def test_law_biexponential_Linear(capfd):
     ctx.getMeshManager().newAllBlocksMesh()
 
     # Sauvegarde du maillage (mli)
-    filename = "meshing_law_biexponential.mli2"
+    filename = "/dev/shm/meshing_law_biexponential.mli2"
     mm.writeMli(filename)
     mesh_lima = lima.Maillage()
     mesh_lima.lire(filename)
@@ -60,6 +61,8 @@ def test_law_biexponential_Linear(capfd):
     n107 = mesh_lima.noeud(107)
     assert( abs(l2_norme(n2, n107) - s2_ar0011) < eps )
 
+    os.remove(filename)
+
 # Target sizes are not respected here. It is due to how
 # the projected topological edge length is computed in
 # the code. This also affects the other laws.
@@ -86,7 +89,7 @@ def test_law_biexponential_onCurve_1(capfd):
     ctx.getMeshManager().newAllBlocksMesh()
 
     # Sauvegarde du maillage (mli)
-    filename = "meshing_law_biexponential.mli2"
+    filename = "/dev/shm/meshing_law_biexponential.mli2"
     mm.writeMli(filename)
     mesh_lima = lima.Maillage()
     mesh_lima.lire(filename)
@@ -126,6 +129,7 @@ def test_law_biexponential_onCurve_1(capfd):
     # because the topological edge is straight)
     assert( abs(l2_norme(n7, n203) - s2_ar0000) < eps )
 
+    os.remove
 
 # Bi-exponential law with target first and last mesh edge size for a topological
 # edge associated to a geometric curve with the two topological
@@ -174,7 +178,7 @@ def test_law_biexponential_onCurve_2(capfd):
     ctx.getMeshManager().newAllBlocksMesh()
 
     # Sauvegarde du maillage (mli)
-    filename = "meshing_law_biexponential_3.mli2"
+    filename = "/dev/shm/meshing_law_biexponential_3.mli2"
     mm.writeMli(filename)
     mesh_lima = lima.Maillage()
     mesh_lima.lire(filename)
@@ -215,6 +219,7 @@ def test_law_biexponential_onCurve_2(capfd):
     # real meshing edge size
     assert( abs(l2_norme(n7, n123) - 3.97338661590123e-1) < eps )
 
+    os.remove(filename)
 
 # Bi-exponential law with target first and last mesh edge size for a topological
 # edge associated to a geometric surface.
@@ -268,7 +273,7 @@ def test_law_biexponential_onSurface(capfd):
     ctx.getMeshManager().newAllBlocksMesh()
 
     # Sauvegarde du maillage (mli)
-    filename = "meshing_law_geometric_3.mli2"
+    filename = "/dev/shm/meshing_law_geometric_3.mli2"
     mm.writeMli(filename)
     mesh_lima = lima.Maillage()
     mesh_lima.lire(filename)
@@ -307,4 +312,6 @@ def test_law_biexponential_onSurface(capfd):
     # target meshing edge size (not respected)
     assert( abs(l2_norme(n8, n192) - s2_ar0022) > eps )
     # real meshing edge size
-    assert( abs(l2_norme(n8, n192) - 4.9378232958398e-1) < eps )
+    assert( abs(l2_norme(n8, n192) - 4.9378232958398e-1) < eps )
+
+    os.remove(filename)

test_link/test_law_bigeometric.py

@@ -2,6 +2,7 @@
 import pytest
 import math
 import LimaScripting as lima
+import os
 
 def l2_norme(n0, n1):
     return math.sqrt( pow(n1.x()-n0.x(),2) + pow(n1.y()-n0.y(),2) + pow(n1.z()-n0.z(),2) )
@@ -35,7 +36,7 @@ def test_law_bigeometric_Linear(capfd):
     ctx.getMeshManager().newAllBlocksMesh()
 
     # Sauvegarde du maillage (mli)
-    filename = "meshing_law_bigeometric.mli2"
+    filename = "/dev/shm/meshing_law_bigeometric.mli2"
     mm.writeMli(filename)
     mesh_lima = lima.Maillage()
     mesh_lima.lire(filename)
@@ -75,6 +76,7 @@ def test_law_bigeometric_Linear(capfd):
     assert( abs(l2_norme(n2, n107) - s2_ar0000) > eps )
     assert( abs(l2_norme(n2, n107) - 0.25) < eps )
 
+    os.remove(filename)
 
 # This test shows an example of "Découpage polaire" option, with geometric law.
 # In 3D, it's difficult to get a suitable situation to use this option.
@@ -144,7 +146,7 @@ def test_law_bigeometric_polar(capfd):
     ctx.getMeshManager().newAllBlocksMesh()
 
     # Sauvegarde du maillage (mli)
-    filename = "meshing_law_bigeometric_polar.mli2"
+    filename = "/dev/shm/meshing_law_bigeometric_polar.mli2"
     mm.writeMli(filename)
     mesh_lima = lima.Maillage()
     mesh_lima.lire(filename)
@@ -166,4 +168,6 @@ def test_law_bigeometric_polar(capfd):
     # target meshing edge size (not respected)
     assert( abs(l2_norme(n1, n16) - s_ar0000) > eps )
     # real meshing edge size
-    assert( abs(l2_norme(n1, n16) - 3.13783707036233e-1) < eps )
+    assert( abs(l2_norme(n1, n16) - 3.13783707036233e-1) < eps )
+
+    os.remove(filename)