FourCIPP 1.25.0__tar.gz → 1.27.0__tar.gz

{fourcipp-1.25.0/src/FourCIPP.egg-info → fourcipp-1.27.0}/PKG-INFO

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

{fourcipp-1.25.0 → fourcipp-1.27.0/src/FourCIPP.egg-info}/PKG-INFO

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

{fourcipp-1.25.0 → fourcipp-1.27.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.25.0 → fourcipp-1.27.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.25.0 → fourcipp-1.27.0}/src/fourcipp/fourc_input.py

@@ -75,8 +75,12 @@ def sort_by_section_names(data: dict) -> dict:
     This sorts the dictionary in the following style:
 
         1. "TITLE" section
-        2. Alphabetically sorted sections
-        3. Alphabetically sorted legacy sections
+        2. Required sections (in schema order)
+        3. Typed sections (alphabetically, case-insensitive)
+            3.1 MATERIALS section
+            3.2 'DESIGN *' sections (alphabetically, case-insensitive)
+        4. FUNCT sections (numeric order)
+        5. Legacy sections (alphabetically)
 
     Args:
         data: Dictionary to sort.
@@ -89,10 +93,23 @@ def sort_by_section_names(data: dict) -> dict:
     required_sections = CONFIG.fourc_json_schema["required"]
     n_sections_splitter = len(CONFIG.sections.all_sections) * 1000
 
-    # collect typed sections + numeric FUNCT sections
-    typed_and_funct = sorted(
-        sorted(CONFIG.sections.typed_sections, key=str.lower)
-        + [s for s in data.keys() if s.startswith("FUNCT") and s[5:].isdigit()],
+    # typed sections (sorted alphabetically + case insensitive, 'DESIGN *' + 'MATERIALS' at the end)
+    design_sections = [
+        s for s in CONFIG.sections.typed_sections if s.startswith("DESIGN")
+    ]
+    remaining_typed_sections = list(
+        set(CONFIG.sections.typed_sections) - set(design_sections) - set(["MATERIALS"])
+    )
+
+    typed_sections = (
+        sorted(remaining_typed_sections, key=str.lower)
+        + ["MATERIALS"]
+        + sorted(design_sections, key=str.lower)
+    )
+
+    # function sections (sorted numerically)
+    functions = sorted(
+        [s for s in data.keys() if s.startswith("FUNCT") and s[5:].isdigit()],
         key=lambda s: (
             s.lower() if not s.startswith("FUNCT") else f"funct{s[5:].zfill(10)}"
         ),
@@ -115,12 +132,15 @@ def sort_by_section_names(data: dict) -> dict:
         # Required sections
         elif section in required_sections:
             return 1 * n_sections_splitter + required_sections.index(section)
-        # Typed + FUNCT sections (alphabetical + case insensitive)
-        elif section in typed_and_funct:
-            return 2 * n_sections_splitter + typed_and_funct.index(section)
+        # Typed sections (alphabetical + case insensitive)
+        elif section in typed_sections:
+            return 2 * n_sections_splitter + typed_sections.index(section)
+        # Function sections (numeric order)
+        elif section in functions:
+            return 3 * n_sections_splitter + functions.index(section)
         # Legacy sections
         elif section in CONFIG.sections.legacy_sections:
-            return 3 * n_sections_splitter + CONFIG.sections.legacy_sections.index(
+            return 4 * n_sections_splitter + CONFIG.sections.legacy_sections.index(
                 section
             )
         # Unknown section

{fourcipp-1.25.0 → fourcipp-1.27.0}/src/fourcipp/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.25.0'
-__version_tuple__ = version_tuple = (1, 25, 0)
+__version__ = version = '1.27.0'
+__version_tuple__ = version_tuple = (1, 27, 0)
 
-__commit_id__ = commit_id = 'g74d5b3440'
+__commit_id__ = commit_id = 'gba4ffa9e5'

{fourcipp-1.25.0 → fourcipp-1.27.0}/tests/fourcipp/test_fourc_input.py

@@ -566,24 +566,25 @@ def test_sort_by_section_names():
     ]
 
     # also use end subset to also add some lowercase sections
-    typed_and_functions = (
-        typed_sections[:15]
-        + typed_sections[-15:]
-        + [f"FUNCT{i}" for i in [1, 2, 9, 10, 33]]
-    )
+    typed_sections = typed_sections[:15] + typed_sections[-15:]
+    typed_sections = sorted(typed_sections, key=str.lower)
 
-    # sort with proper key: alphabetically for typed, numerically for FUNCT
-    typed_and_functions = sorted(
-        typed_and_functions,
-        key=lambda s: (
-            s.lower() if not s.startswith("FUNCT") else f"funct{s[5:].zfill(10)}"
-        ),
-    )
+    # use first 5 'DESIGN * ' sections
+    design_sections = [
+        s for s in CONFIG.sections.typed_sections if s.startswith("DESIGN")
+    ][:5]
+    design_sections = sorted(design_sections, key=str.lower)
+
+    # create some FUNCT sections
+    function_sections = [f"FUNCT{i}" for i in [1, 2, 9, 10, 33]]
 
     correct_section_order = (
         [CONFIG.fourc_metadata["metadata"]["description_section_name"]]
         + CONFIG.fourc_json_schema["required"]
-        + typed_and_functions
+        + typed_sections
+        + ["MATERIALS"]
+        + design_sections
+        + function_sections
         + CONFIG.sections.legacy_sections
     )