FourCIPP 1.40.0__tar.gz → 1.42.0__tar.gz

{fourcipp-1.40.0/src/FourCIPP.egg-info → fourcipp-1.42.0}/PKG-INFO

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

{fourcipp-1.40.0 → fourcipp-1.42.0/src/FourCIPP.egg-info}/PKG-INFO

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

{fourcipp-1.40.0 → fourcipp-1.42.0}/src/fourcipp/config/4C_metadata.yaml

@@ -1,5 +1,5 @@
 metadata:
-  commit_hash: 6ab70b784ce325b9c08c98b0840e2482adccaaa9
+  commit_hash: 06d4d904c17421c86b75ff8b31abf86ea88d6f45
   version: 2025.4.0-dev
   description_section_name: TITLE
 legacy_element_specs:
@@ -7250,7 +7250,31 @@ sections:
         - type: all_of
           specs:
             - $ref: "2"
-    - name: BEAM CONTACT
+    - name: BEAM INTERACTION
+      type: group
+      required: false
+      specs:
+        - type: all_of
+          specs:
+            - name: REPARTITIONSTRATEGY
+              type: enum
+              description: "Type of employed repartitioning strategy"
+              required: false
+              default: "Adaptive"
+              choices:
+                - name: "Adaptive"
+                - name: "Everydt"
+                - name: "adaptive"
+                - name: "everydt"
+            - name: SEARCH_STRATEGY
+              type: enum
+              description: "Type of search strategy used for finding coupling pairs"
+              required: false
+              default: bruteforce_with_binning
+              choices:
+                - name: bruteforce_with_binning
+                - name: bounding_volume_hierarchy
+    - name: BEAM INTERACTION/BEAM TO BEAM CONTACT
       type: group
       required: false
       specs:
@@ -7349,7 +7373,30 @@ sections:
               description: "For gaps > -BEAMS_BASICSTIFFGAP, only the basic part of the contact linearization is applied!"
               required: false
               default: -1
-    - name: BEAM CONTACT/RUNTIME VTK OUTPUT
+    - name: BEAM INTERACTION/BEAM TO BEAM CONTACT CONDITIONS
+      type: list
+      description: Beam-to-beam contact conditions
+      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 BEAM CONTACT/RUNTIME VTK OUTPUT
       type: group
       required: false
       specs:
@@ -7390,69 +7437,6 @@ sections:
               description: "write visualization output to indicate which different penalty values are active.Explanation: 0 corresponds to btb point contact;1 corresponds to active btb line contact;2 indicates active end point contact "
               required: false
               default: false
-    - name: BEAM INTERACTION
-      type: group
-      required: false
-      specs:
-        - type: all_of
-          specs:
-            - name: REPARTITIONSTRATEGY
-              type: enum
-              description: "Type of employed repartitioning strategy"
-              required: false
-              default: "Adaptive"
-              choices:
-                - name: "Adaptive"
-                - name: "Everydt"
-                - name: "adaptive"
-                - name: "everydt"
-            - name: SEARCH_STRATEGY
-              type: enum
-              description: "Type of search strategy used for finding coupling pairs"
-              required: false
-              default: bruteforce_with_binning
-              choices:
-                - name: bruteforce_with_binning
-                - name: bounding_volume_hierarchy
-    - name: BEAM INTERACTION/BEAM TO BEAM CONTACT
-      type: group
-      required: false
-      specs:
-        - type: all_of
-          specs:
-            - name: STRATEGY
-              type: enum
-              description: "Type of employed solving strategy"
-              required: false
-              default: "None"
-              choices:
-                - name: "None"
-                - name: "Penalty"
-                - name: "none"
-                - name: "penalty"
-    - name: BEAM INTERACTION/BEAM TO BEAM CONTACT CONDITIONS
-      type: list
-      description: Beam-to-beam contact conditions
-      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 BEAM POINT COUPLING CONDITIONS
       type: list
       description: Coupling conditions between beams based on closest point projections.

{fourcipp-1.40.0 → fourcipp-1.42.0}/src/fourcipp/config/4C_schema.json

@@ -1,5 +1,5 @@
 {
-  "description": "Schema for 4C\nCommit hash: 6ab70b784ce325b9c08c98b0840e2482adccaaa9\nVersion: 2025.4.0-dev",
+  "description": "Schema for 4C\nCommit hash: 06d4d904c17421c86b75ff8b31abf86ea88d6f45\nVersion: 2025.4.0-dev",
   "type": "object",
   "properties": {
     "ALE DOMAIN": {
@@ -68761,8 +68761,38 @@
         "PATCHES"
       ]
     },
-    "BEAM CONTACT": {
-      "title": "BEAM CONTACT (group)",
+    "BEAM INTERACTION": {
+      "title": "BEAM INTERACTION (group)",
+      "description": "No description yet.",
+      "type": "object",
+      "properties": {
+        "REPARTITIONSTRATEGY": {
+          "title": "REPARTITIONSTRATEGY (enum)",
+          "description": "Type of employed repartitioning strategy",
+          "default": "Adaptive",
+          "type": "string",
+          "enum": [
+            "Adaptive",
+            "Everydt",
+            "adaptive",
+            "everydt"
+          ]
+        },
+        "SEARCH_STRATEGY": {
+          "title": "SEARCH_STRATEGY (enum)",
+          "description": "Type of search strategy used for finding coupling pairs",
+          "default": "bruteforce_with_binning",
+          "type": "string",
+          "enum": [
+            "bruteforce_with_binning",
+            "bounding_volume_hierarchy"
+          ]
+        }
+      },
+      "additionalProperties": false
+    },
+    "BEAM INTERACTION/BEAM TO BEAM CONTACT": {
+      "title": "BEAM INTERACTION/BEAM TO BEAM CONTACT (group)",
       "description": "No description yet.",
       "type": "object",
       "properties": {
@@ -68880,8 +68910,44 @@
       },
       "additionalProperties": false
     },
-    "BEAM CONTACT/RUNTIME VTK OUTPUT": {
-      "title": "BEAM CONTACT/RUNTIME VTK OUTPUT (group)",
+    "BEAM INTERACTION/BEAM TO BEAM CONTACT CONDITIONS": {
+      "title": "BEAM INTERACTION/BEAM TO BEAM CONTACT CONDITIONS (list)",
+      "description": "Beam-to-beam contact conditions",
+      "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 BEAM CONTACT/RUNTIME VTK OUTPUT": {
+      "title": "BEAM INTERACTION/BEAM TO BEAM CONTACT/RUNTIME VTK OUTPUT (group)",
       "description": "No description yet.",
       "type": "object",
       "properties": {
@@ -68930,92 +68996,6 @@
       },
       "additionalProperties": false
     },
-    "BEAM INTERACTION": {
-      "title": "BEAM INTERACTION (group)",
-      "description": "No description yet.",
-      "type": "object",
-      "properties": {
-        "REPARTITIONSTRATEGY": {
-          "title": "REPARTITIONSTRATEGY (enum)",
-          "description": "Type of employed repartitioning strategy",
-          "default": "Adaptive",
-          "type": "string",
-          "enum": [
-            "Adaptive",
-            "Everydt",
-            "adaptive",
-            "everydt"
-          ]
-        },
-        "SEARCH_STRATEGY": {
-          "title": "SEARCH_STRATEGY (enum)",
-          "description": "Type of search strategy used for finding coupling pairs",
-          "default": "bruteforce_with_binning",
-          "type": "string",
-          "enum": [
-            "bruteforce_with_binning",
-            "bounding_volume_hierarchy"
-          ]
-        }
-      },
-      "additionalProperties": false
-    },
-    "BEAM INTERACTION/BEAM TO BEAM CONTACT": {
-      "title": "BEAM INTERACTION/BEAM TO BEAM CONTACT (group)",
-      "description": "No description yet.",
-      "type": "object",
-      "properties": {
-        "STRATEGY": {
-          "title": "STRATEGY (enum)",
-          "description": "Type of employed solving strategy",
-          "default": "None",
-          "type": "string",
-          "enum": [
-            "None",
-            "Penalty",
-            "none",
-            "penalty"
-          ]
-        }
-      },
-      "additionalProperties": false
-    },
-    "BEAM INTERACTION/BEAM TO BEAM CONTACT CONDITIONS": {
-      "title": "BEAM INTERACTION/BEAM TO BEAM CONTACT CONDITIONS (list)",
-      "description": "Beam-to-beam contact conditions",
-      "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 BEAM POINT COUPLING CONDITIONS": {
       "title": "BEAM INTERACTION/BEAM TO BEAM POINT COUPLING CONDITIONS (list)",
       "description": "Coupling conditions between beams based on closest point projections.",
@@ -402293,5 +402273,5 @@
     "PROBLEM TYPE"
   ],
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "6ab70b784ce325b9c08c98b0840e2482adccaaa9"
+  "$id": "06d4d904c17421c86b75ff8b31abf86ea88d6f45"
 }

{fourcipp-1.40.0 → fourcipp-1.42.0}/src/fourcipp/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.40.0'
-__version_tuple__ = version_tuple = (1, 40, 0)
+__version__ = version = '1.42.0'
+__version_tuple__ = version_tuple = (1, 42, 0)
 
-__commit_id__ = commit_id = 'g5d681f020'
+__commit_id__ = commit_id = 'gb7932673f'

{fourcipp-1.40.0 → fourcipp-1.42.0}/tests/fourcipp/test_fourc_input.py

@@ -448,15 +448,15 @@ def test_roundtrip_test(fourc_file, tmp_path):
     # Load 4C input test file
     fourc_input = FourCInput.from_4C_yaml(fourc_file)
 
-    # Delete the original file (we need to dump the file in the original location to ensure that associated files, i.e., xml solver files, are still present)
-    fourc_file.unlink()
+    # Create new file to keep original file (necessary for parallel test execution)
+    fourcipp_file = fourc_file.parent / (fourc_file.stem + "_fourcipp.4C.yaml")
 
     # Dump out again
-    fourc_input.dump(fourc_file, validate=True)
+    fourc_input.dump(fourcipp_file, validate=True)
 
     # Command
     command = (
-        f"/home/user/4C/build/4C {fourc_file} xxx > {tmp_path / 'output.log'} 2>&1"
+        f"/home/user/4C/build/4C {fourcipp_file} xxx > {tmp_path / 'output.log'} 2>&1"
     )
 
     # Run 4C with the dumped input
@@ -465,7 +465,7 @@ def test_roundtrip_test(fourc_file, tmp_path):
     # Exit code -> 4C failed
     if return_code:
         raise SubprocessError(
-            f"Input file failed for {fourc_file}.\n\n4C command: {command}\n\nOutput: {(tmp_path / 'output.log').read_text()}"
+            f"Input file failed for {fourcipp_file}.\n\n4C command: {command}\n\nOutput: {(tmp_path / 'output.log').read_text()}"
         )