diff --git a/api/fair_ontology.py b/api/fair_ontology.py index a98a372..c31dfe5 100644 --- a/api/fair_ontology.py +++ b/api/fair_ontology.py @@ -34,6 +34,7 @@ "MilliL-PER-MIN": "VolumeFlowRate", "M3-PER-SEC": "VolumeFlowRate", "KiloGM-PER-SEC": "MassFlowRate", + "GM-PER-MIN": "MassFlowRate", "W": "Power", "KiloW": "Power", "MilliW": "Power", @@ -53,6 +54,7 @@ "ANGSTROM": "Length", "M-PER-MIN": "LinearVelocity", "M-PER-SEC": "LinearVelocity", + "MilliM-PER-MIN": "LinearVelocity", "MicroM-PER-MIN": "LinearVelocity", "MicroM-PER-SEC": "LinearVelocity", "DEG_C": "CelsiusTemperature", @@ -115,6 +117,8 @@ "m3/s": "M3-PER-SEC", "m³/s": "M3-PER-SEC", "kg/s": "KiloGM-PER-SEC", + # Powder feed rate (directed energy deposition). + "g/min": "GM-PER-MIN", "W": "W", "watt": "W", "watts": "W", @@ -132,6 +136,7 @@ "m": "M", "cm": "CentiM", "mm": "MilliM", + "mm/min": "MilliM-PER-MIN", "um": "MicroM", "micron": "MicroM", "microns": "MicroM", diff --git a/api/tests/test_fair_ontology.py b/api/tests/test_fair_ontology.py index c2978c1..a904310 100644 --- a/api/tests/test_fair_ontology.py +++ b/api/tests/test_fair_ontology.py @@ -108,6 +108,20 @@ def test_sub_second_times(self): self.assertEqual(infer_qudt("µs")["qudt_unit"], QUDT_UNIT_BASE + "MicroSEC") self.assertEqual(infer_qudt("ps")["qudt_unit"], QUDT_UNIT_BASE + "PicoSEC") + def test_directed_energy_deposition_units(self): + # LP-DED scan speed, powder feed and layer/hatch dimensions. + self.assertEqual( + infer_qudt("mm/min"), + {"qudt_unit": QUDT_UNIT_BASE + "MilliM-PER-MIN", + "qudt_quantity_kind": QUDT_QK_BASE + "LinearVelocity"}, + ) + self.assertEqual( + infer_qudt("g/min"), + {"qudt_unit": QUDT_UNIT_BASE + "GM-PER-MIN", + "qudt_quantity_kind": QUDT_QK_BASE + "MassFlowRate"}, + ) + self.assertEqual(infer_qudt("mm")["qudt_unit"], QUDT_UNIT_BASE + "MilliM") + def test_etch_rate_has_quantity_kind_only(self): # qudt.org has no NanoM-PER-MIN unit individual. self.assertEqual(infer_qudt("nm/min"), {"qudt_quantity_kind": QUDT_QK_BASE + "LinearVelocity"}) diff --git a/web/app/equipment/register/page.tsx b/web/app/equipment/register/page.tsx index c797a52..73bd69e 100644 --- a/web/app/equipment/register/page.tsx +++ b/web/app/equipment/register/page.tsx @@ -47,6 +47,7 @@ const UNIT_OPTIONS = [ { value: "SLPM", label: "SLPM" }, { value: "mL/min", label: "mL/min" }, { value: "g", label: "g" }, + { value: "g/min", label: "g/min" }, { value: "kg/s", label: "kg/s" }, { value: "m^3/s", label: "m^3/s" }, { value: "V", label: "V" }, @@ -66,6 +67,8 @@ const UNIT_OPTIONS = [ { value: "°", label: "° (degrees)" }, { value: "nm", label: "nm" }, { value: "um", label: "um" }, + { value: "mm", label: "mm" }, + { value: "mm/min", label: "mm/min" }, { value: "nm/min", label: "nm/min" }, { value: "Å", label: "Å" }, { value: "Å/min", label: "Å/min" },