Merge pull request #313 from davidrudlstorfer/fix_yaml_beam_potential

Fix yaml beam potential

Author: davidrudlstorfer

src/meshpy/four_c/beam_potential.py

@@ -91,7 +91,7 @@ def __init__(
     def add_header(
         self,
         *,
-        potential_type="Volume",
+        potential_type="volume",
         cutoff_radius=None,
         evaluation_strategy=None,
         regularization_type=None,
@@ -141,23 +141,23 @@ def add_header(
         settings = {
             "POT_LAW_PREFACTOR": " ".join(map(str, self.pot_law_prefactor)),
             "POT_LAW_EXPONENT": " ".join(map(str, self.pot_law_exponent)),
-            "BEAMPOTENTIAL_TYPE": potential_type,
+            "TYPE": potential_type,
             "CUTOFF_RADIUS": cutoff_radius,
             "STRATEGY": evaluation_strategy,
-            "NUM_INTEGRATION_SEGMENTS": integration_segments,
-            "NUM_GAUSSPOINTS": gauss_points,
+            "N_INTEGRATION_SEGMENTS": integration_segments,
+            "N_GAUSS_POINTS": gauss_points,
             "POTENTIAL_REDUCTION_LENGTH": potential_reduction_length,
             "AUTOMATIC_DIFFERENTIATION": automatic_differentiation,
         }
 
         if regularization_type is not None:
-            settings | {
+            settings = settings | {
                 "REGULARIZATION_TYPE": regularization_type,
                 "REGULARIZATION_SEPARATION": regularization_separation,
             }
 
         if choice_master_slave is not None:
-            settings | {"CHOICE_MASTER_SLAVE": choice_master_slave}
+            settings = settings | {"CHOICE_MASTER_SLAVE": choice_master_slave}
 
         self.input_file.add(
             {"BEAM POTENTIAL": settings},

tests/reference-files/test_four_c_simulation_beam_potential_helix.4C.yaml

@@ -9,8 +9,11 @@ BEAM POTENTIAL:
   N_INTEGRATION_SEGMENTS: 2
   N_GAUSS_POINTS: 50
   POTENTIAL_REDUCTION_LENGTH: 15
+  CHOICE_MASTER_SLAVE: smaller_eleGID_is_slave
+  AUTOMATIC_DIFFERENTIATION: false
 BEAM POTENTIAL/RUNTIME VTK OUTPUT:
   VTK_OUTPUT_BEAM_POTENTIAL: true
+  INTERVAL_STEPS: 1
   EVERY_ITERATION: true
   FORCES: true
   MOMENTS: true
@@ -44,6 +47,7 @@ DESIGN LINE BEAM POTENTIAL CHARGE CONDITIONS:
   - E: 1
     POTLAW: 2
     VAL: 2
+    FUNCT: none
 DNODE-NODE TOPOLOGY:
   - NODE 1 DNODE 1
 DLINE-NODE TOPOLOGY:

tests/test_four_c.py

@@ -166,9 +166,6 @@ def test_four_c_material_numbering(
     assert_results_equal(get_corresponding_reference_file_path(), input_file)
 
 
-@pytest.mark.skip(
-    reason="Temporarily disabled due to switch to .yaml based input files - check if test is necessary and fix"
-)
 def test_four_c_simulation_beam_potential_helix(
     assert_results_equal, get_corresponding_reference_file_path
 ):
@@ -179,7 +176,7 @@ def test_four_c_simulation_beam_potential_helix(
     mat = MaterialReissner(youngs_modulus=1000, radius=0.5, shear_correction=1.0)
 
     # define function for line charge density
-    fun = Function([{"SYMBOLIC_FUNCTION_OF_SPACE_TIME": "t"}])
+    fun = Function([{"COMPONENT": 0, "SYMBOLIC_FUNCTION_OF_SPACE_TIME": "t"}])
 
     # define the beam potential
     beampotential = BeamPotential(
@@ -192,16 +189,16 @@ def test_four_c_simulation_beam_potential_helix(
 
     # set headers for static case and beam potential
     beampotential.add_header(
-        potential_type="Volume",
+        potential_type="volume",
         cutoff_radius=10.0,
-        evaluation_strategy="SingleLengthSpecific_SmallSepApprox_Simple",
-        regularization_type="linear_extrapolation",
+        evaluation_strategy="single_length_specific_small_separations_simple",
+        regularization_type="linear",
         regularization_separation=0.1,
         integration_segments=2,
         gauss_points=50,
         potential_reduction_length=15.0,
         automatic_differentiation=False,
-        choice_master_slave="lower_eleGID_is_slave",
+        choice_master_slave="smaller_eleGID_is_slave",
     )
     beampotential.add_runtime_output(every_iteration=True)
 
@@ -235,6 +232,8 @@ def test_four_c_simulation_beam_potential_helix(
             {
                 "NUMDOF": 9,
                 "ONOFF": [1, 1, 1, 1, 1, 1, 0, 0, 0],
+                "VAL": [0, 0, 0, 0, 0, 0, 0, 0, 0],
+                "FUNCT": [0, 0, 0, 0, 0, 0, 0, 0, 0],
             },
             bc_type=mpy.bc.dirichlet,
         )