metafold 0.12.dev6__tar.gz → 0.12.dev7__tar.gz

{metafold-0.12.dev6 → metafold-0.12.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metafold
-Version: 0.12.dev6
+Version: 0.12.dev7
 Summary: Metafold SDK for Python
 Author-email: Metafold 3D <info@metafold3d.com>
 License: Copyright 2024 Metafold 3D

{metafold-0.12.dev6 → metafold-0.12.dev7}/metafold/simulation/run_experiment.py

@@ -29,7 +29,9 @@ JSON manifest format
             ]
         },
         {"type": "piston_box", "shape_parameters": {"min": [...], "max": [...]}},
-        {"type": "piston_mesh", "file": "piston.ply", "velocity": [...]},
+        # piston parts take an optional "material" (preset key or inline dict);
+        # omit to use DEFAULT_PISTON_MATERIAL
+        {"type": "piston_mesh", "file": "piston.ply", "velocity": [...], "material": "default_piston_material"},
         {
             "type":           "mesh",
             "name":           "midsole",
@@ -177,6 +179,8 @@ def _build_parts(parts_config: list[dict]) -> list[ExperimentPart]:
                 kwargs["velocity"] = entry["velocity"]
             if "shape_parameters" in entry:
                 kwargs["shape_parameters"] = entry["shape_parameters"]
+            if "material" in entry:
+                kwargs["material"] = _resolve_material(entry["material"])
             parts.append(ExperimentPistonCylinder(**kwargs))
 
         elif part_type == "piston_box":
@@ -185,12 +189,16 @@ def _build_parts(parts_config: list[dict]) -> list[ExperimentPart]:
                 kwargs["velocity"] = entry["velocity"]
             if "shape_parameters" in entry:
                 kwargs["shape_parameters"] = entry["shape_parameters"]
+            if "material" in entry:
+                kwargs["material"] = _resolve_material(entry["material"])
             parts.append(ExperimentPistonBox(**kwargs))
 
         elif part_type == "piston_mesh":
             kwargs = {"filename": entry["file"]}
             if "velocity" in entry:
                 kwargs["velocity"] = entry["velocity"]
+            if "material" in entry:
+                kwargs["material"] = _resolve_material(entry["material"])
             parts.append(ExperimentPistonMesh(**kwargs))
 
         else:

{metafold-0.12.dev6 → metafold-0.12.dev7}/metafold.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metafold
-Version: 0.12.dev6
+Version: 0.12.dev7
 Summary: Metafold SDK for Python
 Author-email: Metafold 3D <info@metafold3d.com>
 License: Copyright 2024 Metafold 3D

{metafold-0.12.dev6 → metafold-0.12.dev7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "metafold"
-version = "0.12.dev6"
+version = "0.12.dev7"
 authors = [
     {name = "Metafold 3D", email = "info@metafold3d.com"},
 ]

{metafold-0.12.dev6 → metafold-0.12.dev7}/tests/test_run_experiment.py

@@ -114,6 +114,39 @@ class TestBuildParts:
         parts = _build_parts([{"type": "piston_mesh", "file": "piston.ply", "velocity": velocity}])
         assert parts[0].velocity == velocity
 
+    def test_piston_mesh_default_material_when_omitted(self):
+        from metafold.materials import DEFAULT_PISTON_MATERIAL
+        parts = _build_parts([{"type": "piston_mesh", "file": "piston.ply"}])
+        assert parts[0].material is DEFAULT_PISTON_MATERIAL
+
+    def test_piston_mesh_with_preset_material(self):
+        parts = _build_parts([
+            {"type": "piston_mesh", "file": "piston.ply", "material": "material_aluminum"}
+        ])
+        assert parts[0].material is MATERIAL_ALUMINUM
+
+    def test_piston_mesh_with_inline_material(self):
+        parts = _build_parts([
+            {
+                "type": "piston_mesh",
+                "file": "piston.ply",
+                "material": {
+                    "density": 1730.0,
+                    "thermal_conductivity": 45,
+                    "specific_heat": 4.8e-4,
+                    "constitutive_model": {
+                        "type": "rigid",
+                        "params": {"shear_modulus": 2667.0e6, "bulk_modulus": 8000.0e6},
+                    },
+                },
+            }
+        ])
+        assert parts[0].material.constitutive_model.params.get_type() == "rigid"
+
+    def test_piston_cylinder_with_material(self):
+        parts = _build_parts([{"type": "piston_cylinder", "material": "material_aluminum"}])
+        assert parts[0].material is MATERIAL_ALUMINUM
+
     def test_mesh_part_with_preset_material(self):
         parts = _build_parts([
             {