FourCIPP 1.29.0__tar.gz → 1.31.0__tar.gz

{fourcipp-1.29.0 → fourcipp-1.31.0}/.github/workflows/run_testsuite.yaml

@@ -70,10 +70,10 @@ jobs:
       - name: Run pytest using 4C_docker_main config
         run: |
           fourcipp switch-config-profile 4C_docker_main
-          pytest --color=yes -v
+          pytest -n 4 --color=yes -v
       - name: Run pytest using default config
         # For this job coverage is turned off, otherwise the checks would fail.
         # Coverage is done in the 4C docker job, as here 4C test input files are available.
         run: |
           fourcipp switch-config-profile default
-          pytest --color=yes -v --no-cov
+          pytest -n 4 --color=yes -v --no-cov

{fourcipp-1.29.0/src/FourCIPP.egg-info → fourcipp-1.31.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FourCIPP
-Version: 1.29.0
+Version: 1.31.0
 Summary: A streamlined Python Parser for 4C input files
 Author: FourCIPP Authors
 License: The MIT License (MIT)
@@ -39,6 +39,7 @@ Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pip-tools; extra == "dev"
+Requires-Dist: pytest-xdist; extra == "dev"
 Dynamic: license-file
 
 <p align="center">

{fourcipp-1.29.0 → fourcipp-1.31.0}/pyproject.toml

@@ -30,7 +30,7 @@ optional-dependencies = { safe = { file = [
 "fourcipp.config" = ["*.json", "*.yaml"]
 
 [project.optional-dependencies]
-dev = ["pre-commit", "pytest", "pytest-cov", "pip-tools"]
+dev = ["pre-commit", "pytest", "pytest-cov", "pip-tools", "pytest-xdist"]
 
 [tool.setuptools_scm]
 version_file = "src/fourcipp/version.py"

{fourcipp-1.29.0 → fourcipp-1.31.0/src/FourCIPP.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FourCIPP
-Version: 1.29.0
+Version: 1.31.0
 Summary: A streamlined Python Parser for 4C input files
 Author: FourCIPP Authors
 License: The MIT License (MIT)
@@ -39,6 +39,7 @@ Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pip-tools; extra == "dev"
+Requires-Dist: pytest-xdist; extra == "dev"
 Dynamic: license-file
 
 <p align="center">

{fourcipp-1.29.0 → fourcipp-1.31.0}/src/FourCIPP.egg-info/requires.txt

@@ -9,3 +9,4 @@ pre-commit
 pytest
 pytest-cov
 pip-tools
+pytest-xdist

{fourcipp-1.29.0 → fourcipp-1.31.0}/src/fourcipp/config/4C_metadata.yaml

@@ -1,5 +1,5 @@
 metadata:
-  commit_hash: 8095d8aaa1256ed5ab513233b4b304a6515766bc
+  commit_hash: e9cbd1b8923fa74b6bd9233af7947fc7d79be199
   version: 2025.4.0-dev
   description_section_name: TITLE
 legacy_element_specs:
@@ -41122,6 +41122,46 @@ sections:
           - name: COUPLING_ID
             type: int
             required: true
+    - name: BEAM INTERACTION/BEAM TO BEAM POINT COUPLING CONDITIONS
+      type: list
+      description: Coupling conditions between beams based on closest point projections.
+      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: PARAMETERS
+            type: group
+            required: false
+            specs:
+              - type: all_of
+                specs:
+                  - name: POSITIONAL_PENALTY_PARAMETER
+                    type: double
+                    required: true
+                  - name: ROTATIONAL_PENALTY_PARAMETER
+                    type: double
+                    required: true
+                  - name: PROJECTION_VALID_FACTOR
+                    type: double
+                    description: "Factor multiplied with sum of cross section radii to define valid projection distance"
+                    required: false
+                    default: 2
     - name: BEAM INTERACTION/BEAM TO SOLID EDGE CONTACT
       type: group
       description: Parameters for beam-to-solid edge contact.

{fourcipp-1.29.0 → fourcipp-1.31.0}/src/fourcipp/config/4C_schema.json

@@ -1,5 +1,5 @@
 {
-  "description": "Schema for 4C\nCommit hash: 8095d8aaa1256ed5ab513233b4b304a6515766bc\nVersion: 2025.4.0-dev",
+  "description": "Schema for 4C\nCommit hash: e9cbd1b8923fa74b6bd9233af7947fc7d79be199\nVersion: 2025.4.0-dev",
   "type": "object",
   "properties": {
     "ALE DOMAIN": {
@@ -69149,6 +69149,70 @@
         ]
       }
     },
+    "BEAM INTERACTION/BEAM TO BEAM POINT COUPLING CONDITIONS": {
+      "title": "BEAM INTERACTION/BEAM TO BEAM POINT COUPLING CONDITIONS (list)",
+      "description": "Coupling conditions between beams based on closest point projections.",
+      "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"
+          },
+          "PARAMETERS": {
+            "title": "PARAMETERS (group)",
+            "description": "No description yet.",
+            "type": "object",
+            "properties": {
+              "POSITIONAL_PENALTY_PARAMETER": {
+                "title": "POSITIONAL_PENALTY_PARAMETER (double)",
+                "description": "No description yet.",
+                "type": "number"
+              },
+              "ROTATIONAL_PENALTY_PARAMETER": {
+                "title": "ROTATIONAL_PENALTY_PARAMETER (double)",
+                "description": "No description yet.",
+                "type": "number"
+              },
+              "PROJECTION_VALID_FACTOR": {
+                "title": "PROJECTION_VALID_FACTOR (double)",
+                "description": "Factor multiplied with sum of cross section radii to define valid projection distance",
+                "default": 2,
+                "type": "number"
+              }
+            },
+            "additionalProperties": false,
+            "required": [
+              "POSITIONAL_PENALTY_PARAMETER",
+              "ROTATIONAL_PENALTY_PARAMETER"
+            ]
+          }
+        },
+        "additionalProperties": false,
+        "required": [
+          "E",
+          "COUPLING_ID"
+        ]
+      }
+    },
     "BEAM INTERACTION/BEAM TO SOLID EDGE CONTACT": {
       "title": "BEAM INTERACTION/BEAM TO SOLID EDGE CONTACT (group)",
       "description": "Parameters for beam-to-solid edge contact.",
@@ -401750,5 +401814,5 @@
     "PROBLEM TYPE"
   ],
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "8095d8aaa1256ed5ab513233b4b304a6515766bc"
+  "$id": "e9cbd1b8923fa74b6bd9233af7947fc7d79be199"
 }

{fourcipp-1.29.0 → fourcipp-1.31.0}/src/fourcipp/legacy_io/inline_dat.py

@@ -123,7 +123,14 @@ def _entry_casting_factory(spec: dict) -> LineListExtractor:
     """
 
     primitive_extractors = Primitive.PRIMITIVE_TYPES_TO_PYTHON.copy()
-    primitive_extractors["bool"] = lambda v: {"true": True, "false": False}[v]
+    primitive_extractors["bool"] = lambda v: {
+        "true": True,
+        "yes": True,
+        "1": True,
+        "false": False,
+        "no": False,
+        "0": False,
+    }[v]
 
     if spec["type"] in primitive_extractors:
         extractor = primitive_extractors[spec["type"]]

{fourcipp-1.29.0 → fourcipp-1.31.0}/src/fourcipp/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.29.0'
-__version_tuple__ = version_tuple = (1, 29, 0)
+__version__ = version = '1.31.0'
+__version_tuple__ = version_tuple = (1, 31, 0)
 
-__commit_id__ = commit_id = 'g2a27eaf10'
+__commit_id__ = commit_id = 'g13850abd6'

{fourcipp-1.29.0 → fourcipp-1.31.0}/tests/fourcipp/legacy_io/test_inline_dat.py

@@ -46,13 +46,23 @@ def test_entry_casting_factory_invalid_type():
         _entry_casting_factory({"type": "invalid"})
 
 
-def test_entry_casting_factory_bool_cast():
+@pytest.mark.parametrize(
+    "value,expected_value",
+    [
+        ("true", True),
+        ("yes", True),
+        ("1", True),
+        ("false", False),
+        ("no", False),
+        ("0", False),
+    ],
+)
+def test_entry_casting_factory_bool_cast(value, expected_value):
     """Test bool casting."""
     spec = {"type": "bool"}
     cast_func = _entry_casting_factory(spec)
 
-    assert cast_func(["true"]) is True
-    assert cast_func(["false"]) is False
+    assert cast_func([value]) is expected_value
 
 
 @pytest.mark.parametrize(

{fourcipp-1.29.0 → fourcipp-1.31.0}/tests/fourcipp/test_fourc_input.py

@@ -469,6 +469,25 @@ def test_roundtrip_test(fourc_file, tmp_path):
         )
 
 
+@pytest.mark.skipif(CONFIG.name != "4C_docker_main", reason="Not using docker config.")
+@pytest.mark.parametrize(
+    "fourc_file",
+    [
+        str(f.resolve())
+        for f in pathlib.Path("/home/user/4C/tests/input_files").glob("*.4C.yaml")
+    ],
+)
+def test_readin_all_test_files(fourc_file):
+    """Read all known 4C files and check if valid."""
+    fourc_file = pathlib.Path(fourc_file)
+
+    # Load 4C input test file
+    fourc_input = FourCInput.from_4C_yaml(fourc_file)
+
+    # Check if it is valid
+    fourc_input.validate()
+
+
 def test_extract_header_sections(fourc_input, fourc_input_with_legacy_section):
     """Test the header extraction."""