Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions api/fair_ontology.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -132,6 +136,7 @@
"m": "M",
"cm": "CentiM",
"mm": "MilliM",
"mm/min": "MilliM-PER-MIN",
"um": "MicroM",
"micron": "MicroM",
"microns": "MicroM",
Expand Down
14 changes: 14 additions & 0 deletions api/tests/test_fair_ontology.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"})
Expand Down
3 changes: 3 additions & 0 deletions web/app/equipment/register/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand All @@ -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" },
Expand Down