Skip to content

Handle optional BaseUnit in write_model_description() #879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
t-sommer merged 1 commit into from
Jun 16, 2026
Merged

Handle optional BaseUnit in write_model_description() #879

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 36 additions & 34 deletions src/fmpy/model_description.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,23 +1120,24 @@ def set_attributes(element, object, attributes):
for unit in model_description.unitDefinitions:
Unit = SubElement(UnitDefinitions, "Unit")
Unit.set("name", unit.name)
BaseUnit = SubElement(Unit, "BaseUnit")
set_attributes(
BaseUnit,
unit.baseUnit,
[
("kg", 0),
("m", 0),
("s", 0),
("A", 0),
("K", 0),
("mol", 0),
("cd", 0),
("rad", 0),
("factor", 1.0),
("offset", 0.0),
],
)
if unit.baseUnit:
BaseUnit = SubElement(Unit, "BaseUnit")
set_attributes(
BaseUnit,
unit.baseUnit,
[
("kg", 0),
("m", 0),
("s", 0),
("A", 0),
("K", 0),
("mol", 0),
("cd", 0),
("rad", 0),
("factor", 1.0),
("offset", 0.0),
],
)
for display_unit in unit.displayUnits:
DisplayUnit = SubElement(Unit, "DisplayUnit")
set_attributes(DisplayUnit, display_unit, [("name", None), ("factor", 1.0), ("offset", 0.0)])
Expand Down Expand Up @@ -1360,23 +1361,24 @@ def set_attributes(element, object, attributes):
for unit in model_description.unitDefinitions:
Unit = SubElement(UnitDefinitions, "Unit")
Unit.set("name", unit.name)
BaseUnit = SubElement(Unit, "BaseUnit")
set_attributes(
BaseUnit,
unit.baseUnit,
[
("kg", 0),
("m", 0),
("s", 0),
("A", 0),
("K", 0),
("mol", 0),
("cd", 0),
("rad", 0),
("factor", 1.0),
("offset", 0.0),
],
)
if unit.baseUnit:
BaseUnit = SubElement(Unit, "BaseUnit")
set_attributes(
BaseUnit,
unit.baseUnit,
[
("kg", 0),
("m", 0),
("s", 0),
("A", 0),
("K", 0),
("mol", 0),
("cd", 0),
("rad", 0),
("factor", 1.0),
("offset", 0.0),
],
)
for display_unit in unit.displayUnits:
DisplayUnit = SubElement(Unit, "DisplayUnit")
set_attributes(DisplayUnit, display_unit, [("name", None), ("factor", 1.0), ("offset", 0.0)])
Expand Down
Loading