FourCIPP 1.24.0__tar.gz → 1.26.0__tar.gz

{fourcipp-1.24.0/src/FourCIPP.egg-info → fourcipp-1.26.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FourCIPP
-Version: 1.24.0
+Version: 1.26.0
 Summary: A streamlined Python Parser for 4C input files
 Author: FourCIPP Authors
 License: The MIT License (MIT)

{fourcipp-1.24.0 → fourcipp-1.26.0/src/FourCIPP.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FourCIPP
-Version: 1.24.0
+Version: 1.26.0
 Summary: A streamlined Python Parser for 4C input files
 Author: FourCIPP Authors
 License: The MIT License (MIT)

{fourcipp-1.24.0 → fourcipp-1.26.0}/src/fourcipp/config/4C_metadata.yaml

@@ -1,5 +1,5 @@
 metadata:
-  commit_hash: 37fa31a1e6bd9674c05cf4a8e56854212c075a1e
+  commit_hash: 94e6a4c70b221f84b9211d6b06a3da3f08248d2a
   version: 2025.4.0-dev
   description_section_name: TITLE
 legacy_element_specs:
@@ -40971,6 +40971,98 @@ sections:
           - name: COUPLING_ID
             type: int
             required: true
+    - name: BEAM INTERACTION/BEAM TO SOLID EDGE CONTACT
+      type: group
+      description: Parameters for beam-to-solid edge contact.
+      required: false
+      specs:
+        - type: all_of
+          specs:
+            - name: CONSTRAINT_ENFORCEMENT
+              type: enum
+              description: "How the beam-to-edge constraints should be enforced."
+              required: false
+              default: none
+              choices:
+                - name: none
+                - name: penalty
+                - name: lagrange
+            - name: PENALTY_LAW
+              type: group
+              description: Parameters for penalty law
+              required: true
+              specs:
+                - type: all_of
+                  specs:
+                    - name: TYPE
+                      type: enum
+                      description: "Type of penalty law"
+                      required: false
+                      default: none
+                      choices:
+                        - name: none
+                        - name: linear
+                        - name: linear_quadratic
+                    - name: PENALTY_PARAMETER
+                      type: double
+                      description: "Penalty parameter for beam-to-solid surface contact"
+                      required: false
+                      default: 0
+                      validator:
+                        range:
+                          minimum: 0
+                          maximum: 1.7976931348623157e+308
+                          minimum_exclusive: false
+                          maximum_exclusive: false
+                    - name: PENALTY_PARAMETER_G0
+                      type: double
+                      description: "First penalty regularization parameter G0 >=0: For gap<G0 contact is active"
+                      required: false
+                      default: 0
+    - name: BEAM INTERACTION/BEAM TO SOLID EDGE CONTACT BEAM
+      type: list
+      required: false
+      spec:
+        type: all_of
+        specs:
+          - name: E
+            type: int
+            description: "ID of the condition. This ID refers to the respective topological entity of the condition."
+            required: true
+          - name: ENTITY_TYPE
+            type: enum
+            description: "The type of entity that E refers to."
+            required: false
+            default: legacy_id
+            choices:
+              - name: legacy_id
+              - name: node_set_id
+              - name: element_block_id
+          - name: COUPLING_ID
+            type: int
+            required: true
+    - name: BEAM INTERACTION/BEAM TO SOLID EDGE CONTACT SOLID EDGE
+      type: list
+      required: false
+      spec:
+        type: all_of
+        specs:
+          - name: E
+            type: int
+            description: "ID of the condition. This ID refers to the respective topological entity of the condition."
+            required: true
+          - name: ENTITY_TYPE
+            type: enum
+            description: "The type of entity that E refers to."
+            required: false
+            default: legacy_id
+            choices:
+              - name: legacy_id
+              - name: node_set_id
+              - name: element_block_id
+          - name: COUPLING_ID
+            type: int
+            required: true
     - name: BEAM INTERACTION/BEAM TO SOLID SURFACE CONTACT
       type: group
       required: false

{fourcipp-1.24.0 → fourcipp-1.26.0}/src/fourcipp/config/4C_schema.json

@@ -1,5 +1,5 @@
 {
-  "description": "Schema for 4C\nCommit hash: 37fa31a1e6bd9674c05cf4a8e56854212c075a1e\nVersion: 2025.4.0-dev",
+  "description": "Schema for 4C\nCommit hash: 94e6a4c70b221f84b9211d6b06a3da3f08248d2a\nVersion: 2025.4.0-dev",
   "type": "object",
   "properties": {
     "ALE DOMAIN": {
@@ -69053,6 +69053,133 @@
         ]
       }
     },
+    "BEAM INTERACTION/BEAM TO SOLID EDGE CONTACT": {
+      "title": "BEAM INTERACTION/BEAM TO SOLID EDGE CONTACT (group)",
+      "description": "Parameters for beam-to-solid edge contact.",
+      "type": "object",
+      "properties": {
+        "CONSTRAINT_ENFORCEMENT": {
+          "title": "CONSTRAINT_ENFORCEMENT (enum)",
+          "description": "How the beam-to-edge constraints should be enforced.",
+          "default": "none",
+          "type": "string",
+          "enum": [
+            "none",
+            "penalty",
+            "lagrange"
+          ]
+        },
+        "PENALTY_LAW": {
+          "title": "PENALTY_LAW (group)",
+          "description": "Parameters for penalty law",
+          "type": "object",
+          "properties": {
+            "TYPE": {
+              "title": "TYPE (enum)",
+              "description": "Type of penalty law",
+              "default": "none",
+              "type": "string",
+              "enum": [
+                "none",
+                "linear",
+                "linear_quadratic"
+              ]
+            },
+            "PENALTY_PARAMETER": {
+              "title": "PENALTY_PARAMETER (double)",
+              "description": "Penalty parameter for beam-to-solid surface contact",
+              "default": 0,
+              "type": "number",
+              "minimum": 0,
+              "maximum": 1.7976931348623157e+308
+            },
+            "PENALTY_PARAMETER_G0": {
+              "title": "PENALTY_PARAMETER_G0 (double)",
+              "description": "First penalty regularization parameter G0 >=0: For gap<G0 contact is active",
+              "default": 0,
+              "type": "number"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "PENALTY_LAW"
+      ]
+    },
+    "BEAM INTERACTION/BEAM TO SOLID EDGE CONTACT BEAM": {
+      "title": "BEAM INTERACTION/BEAM TO SOLID EDGE CONTACT BEAM (list)",
+      "description": "No description yet.",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "E": {
+            "title": "E (int)",
+            "description": "ID of the condition. This ID refers to the respective topological entity of the condition.",
+            "type": "integer"
+          },
+          "ENTITY_TYPE": {
+            "title": "ENTITY_TYPE (enum)",
+            "description": "The type of entity that E refers to.",
+            "default": "legacy_id",
+            "type": "string",
+            "enum": [
+              "legacy_id",
+              "node_set_id",
+              "element_block_id"
+            ]
+          },
+          "COUPLING_ID": {
+            "title": "COUPLING_ID (int)",
+            "description": "No description yet.",
+            "type": "integer"
+          }
+        },
+        "additionalProperties": false,
+        "required": [
+          "E",
+          "COUPLING_ID"
+        ]
+      }
+    },
+    "BEAM INTERACTION/BEAM TO SOLID EDGE CONTACT SOLID EDGE": {
+      "title": "BEAM INTERACTION/BEAM TO SOLID EDGE CONTACT SOLID EDGE (list)",
+      "description": "No description yet.",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "E": {
+            "title": "E (int)",
+            "description": "ID of the condition. This ID refers to the respective topological entity of the condition.",
+            "type": "integer"
+          },
+          "ENTITY_TYPE": {
+            "title": "ENTITY_TYPE (enum)",
+            "description": "The type of entity that E refers to.",
+            "default": "legacy_id",
+            "type": "string",
+            "enum": [
+              "legacy_id",
+              "node_set_id",
+              "element_block_id"
+            ]
+          },
+          "COUPLING_ID": {
+            "title": "COUPLING_ID (int)",
+            "description": "No description yet.",
+            "type": "integer"
+          }
+        },
+        "additionalProperties": false,
+        "required": [
+          "E",
+          "COUPLING_ID"
+        ]
+      }
+    },
     "BEAM INTERACTION/BEAM TO SOLID SURFACE CONTACT": {
       "title": "BEAM INTERACTION/BEAM TO SOLID SURFACE CONTACT (group)",
       "description": "No description yet.",
@@ -401143,5 +401270,5 @@
     "PROBLEM TYPE"
   ],
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "37fa31a1e6bd9674c05cf4a8e56854212c075a1e"
+  "$id": "94e6a4c70b221f84b9211d6b06a3da3f08248d2a"
 }

{fourcipp-1.24.0 → fourcipp-1.26.0}/src/fourcipp/legacy_io/inline_dat.py

@@ -121,12 +121,15 @@ def _entry_casting_factory(spec: dict) -> LineListExtractor:
     Returns:
         Casting function for the spec
     """
-    if spec["type"] in Primitive.PRIMITIVE_TYPES_TO_PYTHON:
-        return partial(
-            _extract_entry, extractor=Primitive.PRIMITIVE_TYPES_TO_PYTHON[spec["type"]]
-        )
+
+    primitive_extractors = Primitive.PRIMITIVE_TYPES_TO_PYTHON.copy()
+    primitive_extractors["bool"] = lambda v: {"true": True, "false": False}[v]
+
+    if spec["type"] in primitive_extractors:
+        extractor = primitive_extractors[spec["type"]]
+        return partial(_extract_entry, extractor=extractor)
     elif spec["type"] == "vector":
-        value_type = Primitive.PRIMITIVE_TYPES_TO_PYTHON[spec["value_type"]["type"]]
+        value_type = primitive_extractors[spec["value_type"]["type"]]
         return partial(_extract_vector, extractor=value_type, size=spec["size"])
     elif spec["type"] == "enum":
         choices = [s["name"] for s in spec["choices"]]

{fourcipp-1.24.0 → fourcipp-1.26.0}/src/fourcipp/utils/metadata.py

@@ -295,7 +295,7 @@ class One_Of:
 
 class Primitive(InputSpec):
     PRIMITIVE_TYPES: list[str] = ["double", "bool", "int", "string", "path"]
-    PRIMITIVE_TYPES_TO_PYTHON: dict[str, type] = {
+    PRIMITIVE_TYPES_TO_PYTHON: dict[str, type | Callable] = {
         "double": float,
         "bool": bool,
         "int": int,

{fourcipp-1.24.0 → fourcipp-1.26.0}/src/fourcipp/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.24.0'
-__version_tuple__ = version_tuple = (1, 24, 0)
+__version__ = version = '1.26.0'
+__version_tuple__ = version_tuple = (1, 26, 0)
 
-__commit_id__ = commit_id = 'g009a43c11'
+__commit_id__ = commit_id = 'g97ad46bb9'

{fourcipp-1.24.0 → fourcipp-1.26.0}/tests/fourcipp/legacy_io/test_inline_dat.py

@@ -46,6 +46,27 @@ def test_entry_casting_factory_invalid_type():
         _entry_casting_factory({"type": "invalid"})
 
 
+def test_entry_casting_factory_bool_cast():
+    """Test bool casting."""
+    spec = {"type": "bool"}
+    cast_func = _entry_casting_factory(spec)
+
+    assert cast_func(["true"]) is True
+    assert cast_func(["false"]) is False
+
+
+@pytest.mark.parametrize(
+    "invalid_input", ["True", "False", "some text", "TRUE", "FALSE"]
+)
+def test_entry_casting_factory_invalid_bool_cast(invalid_input):
+    """Test invalid bool casting."""
+    spec = {"type": "bool"}
+    cast_func = _entry_casting_factory(spec)
+
+    with pytest.raises(KeyError):
+        cast_func([invalid_input])
+
+
 def test_casting_factory_invalid_type():
     """Test reading invalid types."""
     with pytest.raises(NotImplementedError, match="First entry has to be an all_of"):