FourCIPP 1.23.0__py3-none-any.whl → 1.25.0__py3-none-any.whl

fourcipp/config/4C_metadata.yaml

@@ -1,5 +1,5 @@
 metadata:
-  commit_hash: 262e1be1daabe544ce5559a8c52830f3c740f284
+  commit_hash: 37fa31a1e6bd9674c05cf4a8e56854212c075a1e
   version: 2025.4.0-dev
   description_section_name: TITLE
 legacy_element_specs:
@@ -76997,16 +76997,6 @@ sections:
               description: "Do you want to have binary output?"
               required: false
               default: true
-            - name: OUTPUT_EVERY_ITER
-              type: bool
-              description: "Do you desire structural displ. output every Newton iteration"
-              required: false
-              default: false
-            - name: OEI_FILE_COUNTER
-              type: int
-              description: "Add an output name affix by introducing a additional number"
-              required: false
-              default: 0
             - name: ELEMENT_MAT_ID
               type: bool
               description: "Output of the material id of each element"
@@ -77191,32 +77181,6 @@ sections:
               description: "write restart every RESTARTEVERY steps"
               required: false
               default: -1
-    - name: IO/EVERY ITERATION
-      type: group
-      required: false
-      specs:
-        - type: all_of
-          specs:
-            - name: OUTPUT_EVERY_ITER
-              type: bool
-              description: "Do you wish output every Newton iteration?"
-              required: false
-              default: false
-            - name: RUN_NUMBER
-              type: int
-              description: "Create a new folder for different runs of the same simulation. If equal -1, no folder is created."
-              required: false
-              default: -1
-            - name: STEP_NP_NUMBER
-              type: int
-              description: "Give the number of the step (i.e. step_{n+1}) for which you want to write the debug output. If a negative step number is provided, all steps willbe written."
-              required: false
-              default: -1
-            - name: WRITE_OWNER_EACH_NEWTON_ITER
-              type: bool
-              description: "If yes, the ownership of elements and nodes are written each Newton step, instead of only once per time/load step."
-              required: false
-              default: false
     - name: IO/MONITOR STRUCTURE DBC
       type: group
       required: false

fourcipp/config/4C_schema.json

@@ -1,5 +1,5 @@
 {
-  "description": "Schema for 4C\nCommit hash: 262e1be1daabe544ce5559a8c52830f3c740f284\nVersion: 2025.4.0-dev",
+  "description": "Schema for 4C\nCommit hash: 37fa31a1e6bd9674c05cf4a8e56854212c075a1e\nVersion: 2025.4.0-dev",
   "type": "object",
   "properties": {
     "ALE DOMAIN": {
@@ -131486,18 +131486,6 @@
           "default": true,
           "type": "boolean"
         },
-        "OUTPUT_EVERY_ITER": {
-          "title": "OUTPUT_EVERY_ITER (bool)",
-          "description": "Do you desire structural displ. output every Newton iteration",
-          "default": false,
-          "type": "boolean"
-        },
-        "OEI_FILE_COUNTER": {
-          "title": "OEI_FILE_COUNTER (int)",
-          "description": "Add an output name affix by introducing a additional number",
-          "default": 0,
-          "type": "integer"
-        },
         "ELEMENT_MAT_ID": {
           "title": "ELEMENT_MAT_ID (bool)",
           "description": "Output of the material id of each element",
@@ -131728,38 +131716,6 @@
       },
       "additionalProperties": false
     },
-    "IO/EVERY ITERATION": {
-      "title": "IO/EVERY ITERATION (group)",
-      "description": "No description yet.",
-      "type": "object",
-      "properties": {
-        "OUTPUT_EVERY_ITER": {
-          "title": "OUTPUT_EVERY_ITER (bool)",
-          "description": "Do you wish output every Newton iteration?",
-          "default": false,
-          "type": "boolean"
-        },
-        "RUN_NUMBER": {
-          "title": "RUN_NUMBER (int)",
-          "description": "Create a new folder for different runs of the same simulation. If equal -1, no folder is created.",
-          "default": -1,
-          "type": "integer"
-        },
-        "STEP_NP_NUMBER": {
-          "title": "STEP_NP_NUMBER (int)",
-          "description": "Give the number of the step (i.e. step_{n+1}) for which you want to write the debug output. If a negative step number is provided, all steps willbe written.",
-          "default": -1,
-          "type": "integer"
-        },
-        "WRITE_OWNER_EACH_NEWTON_ITER": {
-          "title": "WRITE_OWNER_EACH_NEWTON_ITER (bool)",
-          "description": "If yes, the ownership of elements and nodes are written each Newton step, instead of only once per time/load step.",
-          "default": false,
-          "type": "boolean"
-        }
-      },
-      "additionalProperties": false
-    },
     "IO/MONITOR STRUCTURE DBC": {
       "title": "IO/MONITOR STRUCTURE DBC (group)",
       "description": "No description yet.",
@@ -401187,5 +401143,5 @@
     "PROBLEM TYPE"
   ],
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "262e1be1daabe544ce5559a8c52830f3c740f284"
+  "$id": "37fa31a1e6bd9674c05cf4a8e56854212c075a1e"
 }

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/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/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.23.0'
-__version_tuple__ = version_tuple = (1, 23, 0)
+__version__ = version = '1.25.0'
+__version_tuple__ = version_tuple = (1, 25, 0)
 
 __commit_id__ = commit_id = None

{fourcipp-1.23.0.dist-info → fourcipp-1.25.0.dist-info}/METADATA

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

{fourcipp-1.23.0.dist-info → fourcipp-1.25.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 fourcipp/__init__.py,sha256=4pz7DVXErSbUcLqPTaHnQfdJzKkpfZDivBqbHbTgpRE,1388
 fourcipp/fourc_input.py,sha256=1-EMbwc5tWbWtbZqzRF4_ytrvkcQVgtC5ZX1uz6NFuQ,23954
-fourcipp/version.py,sha256=P3XffA-p9h5BxuyWJHU1dJZQu36UzXx5XFNcAuWmEmQ,706
-fourcipp/config/4C_metadata.yaml,sha256=byWXEz8Ye9yH6aFotCkx_82IHgJBPXfrlggGCnANQxI,11888807
-fourcipp/config/4C_schema.json,sha256=Ne47pWykevdLz3eByQ_paNtlSNpKc2PbXdm1WMedvGQ,16495098
+fourcipp/version.py,sha256=R81gORYF1NfYL6QjkEQ0pDs6XD7HgxQcT2joD2_hfcw,706
+fourcipp/config/4C_metadata.yaml,sha256=Ibxgfxv0GzWW9xV-8n_po7Om_FoOKH5gbYHY9ugPl9E,11887255
+fourcipp/config/4C_schema.json,sha256=RVWI9cL8BjyFtGEBiEd49M0HKxkcXLgFGPe4VBz-A4A,16493324
 fourcipp/config/config.yaml,sha256=n2c2a6E4HKfAdNWOQz1kLUuf5p4NLxIddaAi2t5eM38,460
 fourcipp/legacy_io/__init__.py,sha256=L3MWW-WjPbPAJVX8Z0Uheftn0dRPnqNnSBic3uloFhI,5750
 fourcipp/legacy_io/element.py,sha256=rP8F-m-8ZCwCxtV_OASvvLeNYr01zsmgZsDZSJ_G1gY,3977
-fourcipp/legacy_io/inline_dat.py,sha256=t8eMmJ_mAK7kKYAhNNlsES9JbZ760DHR0101Mj9vkSQ,6723
+fourcipp/legacy_io/inline_dat.py,sha256=wqXM8dNEcTrx6Ek_6mrAE9dWk53NC0T4kOTD_auw2vQ,6837
 fourcipp/legacy_io/node.py,sha256=e7m0W7dai_b1XgaqD37k3QS44ySCas3HetmyTLS9_78,3522
 fourcipp/legacy_io/node_topology.py,sha256=hqGGzhyNhFX-BMW8SzztfzM8zoZLLltVScMv-p4hDH0,5394
 fourcipp/legacy_io/particle.py,sha256=8LoRsyKVfhl5Qf_EoO8vLmbH0QSpB_Nho464ifkHAZc,2172
@@ -15,14 +15,14 @@ fourcipp/utils/cli.py,sha256=Tn9jx0KhC421zv-DMpqNU2hpb6fyi4-r4qV17f-ts4Y,5807
 fourcipp/utils/configuration.py,sha256=_9Yo_2Rxw1QDhib9OV_MjLXBhVPfIBA2qmdOG3EuIKU,6467
 fourcipp/utils/converter.py,sha256=D40YQ96WqPEEpB7fwAB5XC2v-jRki4v1sIJ-ngO08nU,5194
 fourcipp/utils/dict_utils.py,sha256=uC0uaBNP3Wh2v3kFy9JHnAYARMukAN4cl40pmiBT13Y,12891
-fourcipp/utils/metadata.py,sha256=wYu07eCrOTNHSnhDxHyQzF6OU8D_2ZuJfytiIpn3sxY,30895
+fourcipp/utils/metadata.py,sha256=TxKmpx-Mb3VeR6okUUtHDo0TwGcKxpyCtCExzphFEPU,30906
 fourcipp/utils/not_set.py,sha256=NHf0UXDmTuZfvfnIIgkkx4EohxRsN4MVUHUpt7VOnaQ,2433
 fourcipp/utils/type_hinting.py,sha256=izPEhbMdmhrIBamCLqqF_6iDZW-w7a8kplUugbQILyw,1714
 fourcipp/utils/validation.py,sha256=FejHOj1MddaU7gEpMN-f8Mz3rYjflakd1qcsKnctHqA,5292
 fourcipp/utils/yaml_io.py,sha256=jPgVnxE858XTpDC6BVhfbbljQegL58zc3u2VPYCTvGE,5771
-fourcipp-1.23.0.dist-info/licenses/LICENSE,sha256=lkSOHdH9IZ8c3Vnz0fFjqls1cRlmLADBP8QEIwUlH3o,1082
-fourcipp-1.23.0.dist-info/METADATA,sha256=yz8KwsiLIpQUbL0yBlDjRMatYF8n3geubVdzMeDbTEI,7916
-fourcipp-1.23.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fourcipp-1.23.0.dist-info/entry_points.txt,sha256=44XBG4bwhuq1EwOZ0U055HYP8_qN6_d30ecVsa5Igng,53
-fourcipp-1.23.0.dist-info/top_level.txt,sha256=oZ6jgFFmvi157VwGUEFuKT3D8oS5mOkpOVx8zZURZrQ,9
-fourcipp-1.23.0.dist-info/RECORD,,
+fourcipp-1.25.0.dist-info/licenses/LICENSE,sha256=lkSOHdH9IZ8c3Vnz0fFjqls1cRlmLADBP8QEIwUlH3o,1082
+fourcipp-1.25.0.dist-info/METADATA,sha256=L76lYeCupl3aGYXkldHxokbMVqLgCBsyuq0-E1EYRL4,7916
+fourcipp-1.25.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fourcipp-1.25.0.dist-info/entry_points.txt,sha256=44XBG4bwhuq1EwOZ0U055HYP8_qN6_d30ecVsa5Igng,53
+fourcipp-1.25.0.dist-info/top_level.txt,sha256=oZ6jgFFmvi157VwGUEFuKT3D8oS5mOkpOVx8zZURZrQ,9
+fourcipp-1.25.0.dist-info/RECORD,,