Merge pull request #314 from davidrudlstorfer/fix_header_tests

Fix header tests

Author: davidrudlstorfer

src/meshpy/four_c/header_functions.py

@@ -188,7 +188,7 @@ def set_beam_to_solid_meshtying(
     segmentation=True,
     segmentation_search_points=2,
     couple_restart=False,
-    mortar_shape=None,
+    mortar_shape="none",
     n_gauss_points=6,
     n_integration_points_circ=None,
     penalty_parameter=None,
@@ -258,7 +258,8 @@ def set_beam_to_solid_meshtying(
             f"Got {interaction_type} of type {type(interaction_type)}."
         )
     bts_parameters["CONSTRAINT_STRATEGY"] = "penalty"
-    bts_parameters["PENALTY_PARAMETER"] = penalty_parameter
+    if penalty_parameter is not None:
+        bts_parameters["PENALTY_PARAMETER"] = penalty_parameter
     bts_parameters["GAUSS_POINTS"] = n_gauss_points
 
     if contact_discretization == "mortar":
@@ -281,7 +282,8 @@ def set_beam_to_solid_meshtying(
     bts_parameters["GEOMETRY_PAIR_SEGMENTATION_SEARCH_POINTS"] = (
         segmentation_search_points
     )
-    bts_parameters["COUPLE_RESTART_STATE"] = couple_restart
+    if interaction_type == _mpy.beam_to_solid.volume_meshtying:
+        bts_parameters["COUPLE_RESTART_STATE"] = couple_restart
 
     input_file.add(
         {bts_section_name: bts_parameters}, option_overwrite=option_overwrite
@@ -301,7 +303,7 @@ def set_header_static(
     write_bin=False,
     write_stress="no",
     write_strain="no",
-    prestress="none",
+    prestress="None",
     prestress_time=0,
     option_overwrite=False,
 ):

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

@@ -15,7 +15,7 @@ STRUCTURAL DYNAMIC:
   PREDICT: "TangDis"
   LINEAR_SOLVER: 1
   LOADLIN: false
-  PRESTRESS: "none"
+  PRESTRESS: "None"
   PRESTRESSTIME: 0
 SOLVER 1:
   SOLVER: "Superlu"

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

@@ -14,7 +14,7 @@ STRUCTURAL DYNAMIC:
   MAXTIME: 1
   PREDICT: "TangDis"
   LINEAR_SOLVER: 1
-  PRESTRESS: "none"
+  PRESTRESS: "None"
   PRESTRESSTIME: 0
   LOADLIN: false
 SOLVER 1:

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

@@ -14,7 +14,7 @@ STRUCTURAL DYNAMIC:
   MAXTIME: 10.5
   PREDICT: "TangDis"
   LINEAR_SOLVER: 1
-  PRESTRESS: "none"
+  PRESTRESS: "None"
   PRESTRESSTIME: 0
   LOADLIN: false
 SOLVER 1:

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

@@ -15,7 +15,7 @@ STRUCTURAL DYNAMIC:
   PREDICT: "TangDis"
   LINEAR_SOLVER: 1
   LOADLIN: false
-  PRESTRESS: "none"
+  PRESTRESS: "None"
   PRESTRESSTIME: 0
 SOLVER 1:
   SOLVER: "Superlu"

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

@@ -15,7 +15,7 @@ STRUCTURAL DYNAMIC:
   PREDICT: "TangDis"
   LINEAR_SOLVER: 1
   LOADLIN: false
-  PRESTRESS: "none"
+  PRESTRESS: "None"
   PRESTRESSTIME: 0
 SOLVER 1:
   SOLVER: "Superlu"

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

@@ -15,7 +15,7 @@ STRUCTURAL DYNAMIC:
   PREDICT: "TangDis"
   LINEAR_SOLVER: 1
   LOADLIN: false
-  PRESTRESS: "none"
+  PRESTRESS: "None"
   PRESTRESSTIME: 0
 SOLVER 1:
   SOLVER: "Superlu"

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

@@ -1,8 +1,8 @@
 BEAM INTERACTION/BEAM TO BEAM CONTACT:
-  STRATEGY: "Penalty"
+  STRATEGY: "penalty"
 BEAM CONTACT:
-  BEAMS_STRATEGY: "Penalty"
-  MODELEVALUATOR: "Standard"
+  BEAMS_STRATEGY: "penalty"
+  MODELEVALUATOR: "standard"
   BEAMS_SEGCON: true
   BEAMS_BTBLINEPENALTYPARAM: 0
   BEAMS_MAXDELTADISSCALEFAC: -1
@@ -16,13 +16,16 @@ BEAM CONTACT:
   BEAMS_PENREGPARAM_G0: 0
   BEAMS_PENREGPARAM_F0: 0
   BEAMS_PENREGPARAM_C0: 0
+  BEAMS_BTBPENALTYPARAM: 0
 BINNING STRATEGY:
   BIN_SIZE_LOWER_BOUND: 5
   DOMAINBOUNDINGBOX: "-1 -2 -3 1 2 3"
 BEAM INTERACTION:
   SEARCH_STRATEGY: bounding_volume_hierarchy
+  REPARTITIONSTRATEGY: "adaptive"
 BEAM CONTACT/RUNTIME VTK OUTPUT:
   VTK_OUTPUT_BEAM_CONTACT: true
   INTERVAL_STEPS: 1
+  EVERY_ITERATION: false
   CONTACT_FORCES: true
   GAPS: true

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

@@ -4,6 +4,8 @@ IO:
   OUTPUT_BIN: false
   STRUCT_DISP: false
   VERBOSITY: "Standard"
+  STRUCT_STRAIN: "no"
+  STRUCT_STRESS: "no"
 STRUCTURAL DYNAMIC:
   INT_STRATEGY: "Standard"
   DYNAMICTYPE: "Statics"
@@ -13,6 +15,8 @@ STRUCTURAL DYNAMIC:
   LOADLIN: true
   PREDICT: "TangDis"
   LINEAR_SOLVER: 1
+  PRESTRESS: None
+  PRESTRESSTIME: 0
 SOLVER 1:
   SOLVER: "Superlu"
   NAME: "Structure_Solver"
@@ -24,22 +28,28 @@ STRUCT NOX/Printing:
   Test Details: true
 IO/RUNTIME VTK OUTPUT:
   INTERVAL_STEPS: 1
+  OUTPUT_DATA_FORMAT: binary
+  EVERY_ITERATION: false
 IO/RUNTIME VTK OUTPUT/STRUCTURE:
   OUTPUT_STRUCTURE: true
   DISPLACEMENT: true
+  STRESS_STRAIN: false
   ELEMENT_OWNER: true
   ELEMENT_GID: true
   ELEMENT_MAT_ID: true
 IO/RUNTIME VTK OUTPUT/BEAMS:
   OUTPUT_BEAMS: true
   DISPLACEMENT: true
+  USE_ABSOLUTE_POSITIONS: true
+  TRIAD_VISUALIZATIONPOINT: false
   STRAINS_GAUSSPOINT: true
   ELEMENT_GID: true
 BEAM INTERACTION/BEAM TO SOLID VOLUME MESHTYING/RUNTIME VTK OUTPUT:
   WRITE_OUTPUT: true
   NODAL_FORCES: true
   MORTAR_LAMBDA_DISCRET: true
   MORTAR_LAMBDA_CONTINUOUS: true
+  MORTAR_LAMBDA_CONTINUOUS_SEGMENTS: 5
   SEGMENTATION: true
   INTEGRATION_POINTS: true
 BEAM INTERACTION/BEAM TO SOLID SURFACE/RUNTIME VTK OUTPUT:
@@ -48,24 +58,30 @@ BEAM INTERACTION/BEAM TO SOLID SURFACE/RUNTIME VTK OUTPUT:
   AVERAGED_NORMALS: true
   MORTAR_LAMBDA_DISCRET: true
   MORTAR_LAMBDA_CONTINUOUS: true
+  MORTAR_LAMBDA_CONTINUOUS_SEGMENTS: 5
   SEGMENTATION: true
   INTEGRATION_POINTS: true
 BINNING STRATEGY:
   BIN_SIZE_LOWER_BOUND: 0.69
   DOMAINBOUNDINGBOX: "1 2 3 4 5 6"
 BEAM INTERACTION:
-  REPARTITIONSTRATEGY: "Everydt"
+  REPARTITIONSTRATEGY: "everydt"
 BEAM CONTACT:
   MODELEVALUATOR: "Standard"
 BEAM INTERACTION/BEAM TO SOLID VOLUME MESHTYING:
   CONTACT_DISCRETIZATION: mortar
   CONSTRAINT_STRATEGY: penalty
   GEOMETRY_PAIR_SEGMENTATION_SEARCH_POINTS: 2
+  GAUSS_POINTS: 6
+  MORTAR_SHAPE_FUNCTION: none
+  GEOMETRY_PAIR_STRATEGY: segmentation
+  COUPLE_RESTART_STATE: false
 BEAM INTERACTION/BEAM TO SOLID SURFACE MESHTYING:
   CONTACT_DISCRETIZATION: gauss_point_to_segment
   CONSTRAINT_STRATEGY: penalty
   COUPLING_TYPE: consistent_fad
   GEOMETRY_PAIR_STRATEGY: gauss_point_projection_without_boundary_segmentation
   GEOMETRY_PAIR_SEGMENTATION_SEARCH_POINTS: 2
+  GAUSS_POINTS: 6
 STRUCT NOX/Status Test:
   XML File: "NOT_DEFINED"

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

@@ -4,10 +4,12 @@ IO:
   OUTPUT_BIN: false
   STRUCT_DISP: false
   VERBOSITY: "Standard"
+  STRUCT_STRAIN: "no"
+  STRUCT_STRESS: "no"
 STRUCTURAL DYNAMIC:
   INT_STRATEGY: "Standard"
   DYNAMICTYPE: "Statics"
-  PRESTRESS: "MULF"
+  PRESTRESS: "mulf"
   PRESTRESSTIME: 1
   TIMESTEP: 0.1
   NUMSTEP: 17
@@ -25,7 +27,7 @@ STRUCT NOX/Printing:
   Linear Solver Details: true
   Test Details: true
 BEAM INTERACTION:
-  REPARTITIONSTRATEGY: "Everydt"
+  REPARTITIONSTRATEGY: "everydt"
 BEAM CONTACT:
   MODELEVALUATOR: "Standard"
 BINNING STRATEGY:
@@ -36,10 +38,14 @@ BEAM INTERACTION/BEAM TO SOLID VOLUME MESHTYING:
   CONSTRAINT_STRATEGY: penalty
   GEOMETRY_PAIR_SEGMENTATION_SEARCH_POINTS: 2
   COUPLE_RESTART_STATE: true
+  GAUSS_POINTS: 6
+  GEOMETRY_PAIR_STRATEGY: segmentation
+  MORTAR_SHAPE_FUNCTION: "none"
 BEAM INTERACTION/BEAM TO SOLID SURFACE MESHTYING:
   CONTACT_DISCRETIZATION: gauss_point_to_segment
   CONSTRAINT_STRATEGY: penalty
   GEOMETRY_PAIR_STRATEGY: gauss_point_projection_without_boundary_segmentation
   GEOMETRY_PAIR_SEGMENTATION_SEARCH_POINTS: 2
+  GAUSS_POINTS: 6
 STRUCT NOX/Status Test:
   XML File: "NOT_DEFINED"

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

@@ -4,14 +4,19 @@ IO:
   OUTPUT_BIN: false
   STRUCT_DISP: false
   VERBOSITY: "Standard"
+  STRUCT_STRAIN: "no"
+  STRUCT_STRESS: "no"
 STRUCTURAL DYNAMIC:
   INT_STRATEGY: "Standard"
   DYNAMICTYPE: "Statics"
   TIMESTEP: 0.01
   NUMSTEP: 17
   MAXTIME: 2.1
+  LOADLIN: false
   PREDICT: "TangDis"
   LINEAR_SOLVER: 1
+  PRESTRESS: None
+  PRESTRESSTIME: 0
 SOLVER 1:
   SOLVER: "Superlu"
   NAME: "Structure_Solver"

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

@@ -4,14 +4,19 @@ IO:
   OUTPUT_BIN: false
   STRUCT_DISP: false
   VERBOSITY: "Standard"
+  STRUCT_STRAIN: "no"
+  STRUCT_STRESS: "no"
 STRUCTURAL DYNAMIC:
   INT_STRATEGY: "Standard"
   DYNAMICTYPE: "Statics"
   TIMESTEP: 0.01
   NUMSTEP: 210
   MAXTIME: 2.1
+  LOADLIN: false
   PREDICT: "TangDis"
   LINEAR_SOLVER: 1
+  PRESTRESS: None
+  PRESTRESSTIME: 0
 SOLVER 1:
   SOLVER: "Superlu"
   NAME: "Structure_Solver"

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

@@ -4,14 +4,19 @@ IO:
   OUTPUT_BIN: false
   STRUCT_DISP: false
   VERBOSITY: "Standard"
+  STRUCT_STRAIN: "no"
+  STRUCT_STRESS: "no"
 STRUCTURAL DYNAMIC:
   INT_STRATEGY: "Standard"
   DYNAMICTYPE: "Statics"
   TIMESTEP: 0.12352941176470589
   NUMSTEP: 17
   MAXTIME: 2.1
+  LOADLIN: false
   PREDICT: "TangDis"
   LINEAR_SOLVER: 1
+  PRESTRESS: None
+  PRESTRESSTIME: 0
 SOLVER 1:
   SOLVER: "Superlu"
   NAME: "Structure_Solver"

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

@@ -4,14 +4,19 @@ IO:
   OUTPUT_BIN: false
   STRUCT_DISP: false
   VERBOSITY: "Standard"
+  STRUCT_STRAIN: "no"
+  STRUCT_STRESS: "no"
 STRUCTURAL DYNAMIC:
   INT_STRATEGY: "Standard"
   DYNAMICTYPE: "Statics"
   TIMESTEP: 0.01
   NUMSTEP: 17
   MAXTIME: 0.17
+  LOADLIN: false
   PREDICT: "TangDis"
   LINEAR_SOLVER: 1
+  PRESTRESS: None
+  PRESTRESSTIME: 0
 SOLVER 1:
   SOLVER: "Superlu"
   NAME: "Structure_Solver"

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

@@ -3,8 +3,8 @@ PROBLEM TYPE:
 IO:
   OUTPUT_BIN: false
   STRUCT_DISP: false
-  STRUCT_STRESS: "Cauchy"
-  STRUCT_STRAIN: "GL"
+  STRUCT_STRESS: "cauchy"
+  STRUCT_STRAIN: "gl"
   VERBOSITY: "Standard"
 STRUCTURAL DYNAMIC:
   INT_STRATEGY: "Standard"
@@ -15,6 +15,8 @@ STRUCTURAL DYNAMIC:
   LOADLIN: true
   PREDICT: "TangDis"
   LINEAR_SOLVER: 1
+  PRESTRESS: None
+  PRESTRESSTIME: 0
 SOLVER 1:
   SOLVER: "Superlu"
   NAME: "Structure_Solver"
@@ -26,6 +28,8 @@ STRUCT NOX/Printing:
   Test Details: true
 IO/RUNTIME VTK OUTPUT:
   INTERVAL_STEPS: 1
+  EVERY_ITERATION: false
+  OUTPUT_DATA_FORMAT: "binary"
 IO/RUNTIME VTK OUTPUT/STRUCTURE:
   OUTPUT_STRUCTURE: true
   DISPLACEMENT: true
@@ -39,11 +43,13 @@ IO/RUNTIME VTK OUTPUT/BEAMS:
   TRIAD_VISUALIZATIONPOINT: true
   STRAINS_GAUSSPOINT: true
   ELEMENT_GID: true
+  USE_ABSOLUTE_POSITIONS: true
 BEAM INTERACTION/BEAM TO SOLID VOLUME MESHTYING/RUNTIME VTK OUTPUT:
   WRITE_OUTPUT: true
   NODAL_FORCES: true
   MORTAR_LAMBDA_DISCRET: true
   MORTAR_LAMBDA_CONTINUOUS: true
+  MORTAR_LAMBDA_CONTINUOUS_SEGMENTS: 5
   SEGMENTATION: true
   INTEGRATION_POINTS: true
 BEAM INTERACTION/BEAM TO SOLID SURFACE/RUNTIME VTK OUTPUT:
@@ -52,6 +58,7 @@ BEAM INTERACTION/BEAM TO SOLID SURFACE/RUNTIME VTK OUTPUT:
   AVERAGED_NORMALS: true
   MORTAR_LAMBDA_DISCRET: true
   MORTAR_LAMBDA_CONTINUOUS: true
+  MORTAR_LAMBDA_CONTINUOUS_SEGMENTS: 5
   SEGMENTATION: true
   INTEGRATION_POINTS: true
 STRUCT NOX/Status Test:

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

@@ -107,7 +107,7 @@ STRUCTURAL DYNAMIC:
   PREDICT: "TangDis"
   LINEAR_SOLVER: 1
   LOADLIN: false
-  PRESTRESS: "none"
+  PRESTRESS: "None"
   PRESTRESSTIME: 0
 SOLVER 1:
   SOLVER: "Superlu"