Review comments

Author: davidrudlstorfer

tests/test_cosserat_curve.py

@@ -206,7 +206,6 @@ def test_cosserat_curve_mesh_warp(
             Rotation([0, 0, 1], -0.5 * np.pi) * Rotation([0, 1, 0], -0.5 * np.pi)
         ),
     )
-    print("###", type(mesh), mesh)
     assert_results_equal(get_corresponding_reference_file_path(), mesh, rtol=1e-10)
 
 

tests/test_four_c_simulation.py

@@ -361,6 +361,10 @@ def test_four_c_simulation_beam_and_solid_tube(
     nodes = [32, 69]
     add_result_description(input_file, displacements, nodes)
 
+    # Call get_unique_geometry_sets to check that this does not affect the
+    # mesh creation.
+    mesh.get_unique_geometry_sets(link_to_nodes="all_nodes")
+
     # Add mesh to input file
     input_file.add(mesh)
 
@@ -574,6 +578,9 @@ def test_four_c_simulation_rotated_beam_axis(
     # Create input file
     input_file = InputFile()
 
+    # Create mesh
+    mesh = Mesh()
+
     # Set header
     set_header_static(input_file, time_step=0.05, n_steps=20)
 
@@ -591,17 +598,17 @@ def test_four_c_simulation_rotated_beam_axis(
 
     # Create mesh.
     for i in range(3):
-        mesh = Mesh()
+        mesh_line = Mesh()
 
         # Create the first line.
         set_1 = create_beam_mesh_line(
-            mesh, Beam3rHerm2Line3, mat, [0, 0, 0], 1.0 * direction, n_el=3
+            mesh_line, Beam3rHerm2Line3, mat, [0, 0, 0], 1.0 * direction, n_el=3
         )
 
         if not i == 0:
             # In the second case rotate the line, so the triads do not
             # match any more.
-            mesh.rotate(Rotation(direction, alpha))
+            mesh_line.rotate(Rotation(direction, alpha))
 
         if i == 2:
             # The third line is with couplings.
@@ -611,7 +618,7 @@ def test_four_c_simulation_rotated_beam_axis(
 
         # Add the second line.
         set_2 = create_beam_mesh_line(
-            mesh,
+            mesh_line,
             Beam3rHerm2Line3,
             mat,
             1.0 * direction,
@@ -621,7 +628,7 @@ def test_four_c_simulation_rotated_beam_axis(
         )
 
         # Add boundary conditions.
-        mesh.add(
+        mesh_line.add(
             BoundaryCondition(
                 set_1["start"],
                 {
@@ -633,7 +640,7 @@ def test_four_c_simulation_rotated_beam_axis(
                 bc_type=mpy.bc.dirichlet,
             )
         )
-        mesh.add(
+        mesh_line.add(
             BoundaryCondition(
                 set_2["end"],
                 {
@@ -648,19 +655,22 @@ def test_four_c_simulation_rotated_beam_axis(
 
         if i == 2:
             # In the third case add a coupling.
-            mesh.couple_nodes()
+            mesh_line.couple_nodes()
 
         # Add the mesh to the input file.
-        input_file.add(mesh)
+        mesh.add(mesh_line)
 
         # Each time move the whole mesh.
-        input_file.mesh.translate([1, 0, 0])
+        mesh.translate([1, 0, 0])
 
     # Add result checks.
     displacements = [[1.5015284845, 0.35139255451, -1.0126517891]] * 3
     nodes = [13, 26, 40]
     add_result_description(input_file, displacements, nodes)
 
+    # Add the mesh to the input file
+    input_file.add(mesh)
+
     # Check the created input file
     assert_results_equal(get_corresponding_reference_file_path(), input_file)
 

tests/test_mesh_creation_functions.py

@@ -34,7 +34,6 @@
 from meshpy.core.node import NodeCosserat
 from meshpy.core.rotation import Rotation
 from meshpy.four_c.element_beam import Beam3eb, Beam3rHerm2Line3
-from meshpy.four_c.input_file import InputFile
 from meshpy.four_c.material import MaterialEulerBernoulli, MaterialReissner
 from meshpy.mesh_creation_functions.beam_basic_geometry import (
     create_beam_mesh_arc_at_node,

tests/test_meshpy.py

@@ -1173,14 +1173,10 @@ def test_meshpy_replace_nodes_geometry_set(
 def create_beam_to_solid_conditions_model(get_corresponding_reference_file_path):
     """Create the input file for the beam-to-solid input conditions tests."""
 
-    # TODO rework this test once the input file is refactored, i.e.
-    # input_file, mesh = InputFile(yaml_file=...)
-    # ... add different geometry sets to the mesh
-    # input_file.add(mesh)
-    # this way it is tested exhaustively rather than accessing the mesh
-    # in the input file during the beam mesh creation
-
-    # Create input file.
+    # TODO update this function to take the "full_import" argument
+    # Then return the input file and corresponding mesh.
+
+    # Create input file
     input_file = InputFile(
         yaml_file=get_corresponding_reference_file_path(
             reference_file_base_name="test_create_cubit_input_block"
@@ -1411,13 +1407,13 @@ def test_meshpy_stvenantkirchhoff_solid(
 
     material_2 = MaterialStVenantKirchhoff(youngs_modulus=370, nu=0.20, density=5.2e-7)
 
-    # Create input file
-    input_file = InputFile()
-    input_file.add(material_1)
-    input_file.add(material_2)
+    # Create mesh
+    mesh = Mesh()
+    mesh.add(material_1)
+    mesh.add(material_2)
 
     # Compare with the reference file
-    assert_results_equal(get_corresponding_reference_file_path(), input_file)
+    assert_results_equal(get_corresponding_reference_file_path(), mesh)
 
 
 @pytest.mark.parametrize(
@@ -1811,8 +1807,7 @@ def create_mesh(mesh):
     mesh_ref_2.translate(translate)
 
     mesh = Mesh()
-    mesh.add(mesh_ref_1)
-    mesh.add(mesh_ref_2)
+    mesh.add(mesh_ref_1, mesh_ref_2)
 
     # Now copy the first mesh and add them together in the input file.
     mesh_copy_1 = Mesh()
@@ -1822,8 +1817,7 @@ def create_mesh(mesh):
     mesh_copy_2.translate(translate)
 
     mesh_copy = Mesh()
-    mesh_copy.add(mesh_copy_1)
-    mesh_copy.add(mesh_copy_2)
+    mesh_copy.add(mesh_copy_1, mesh_copy_2)
 
     # Check that the input files are the same.
     # TODO: add reference file check here as well
@@ -1854,7 +1848,7 @@ def test_meshpy_mesh_add_checks():
     mesh.add(geometry_set)
 
     # Add the objects again and check for errors.
-    # TODO catch and test errors
+    # TODO catch and test error messages
     with pytest.raises(ValueError):
         mesh.add(node)
     with pytest.raises(ValueError):