Skip to content
Snippets Groups Projects
Commit be447823 authored by Luc Maisonobe's avatar Luc Maisonobe
Browse files

Fixed units for inertia.

parent 303bf784
No related branches found
No related tags found
No related merge requests found
......@@ -28,8 +28,8 @@ public class Units {
/** Seconds reciprocal unit. */
public static final Unit ONE_PER_S = Unit.parse("s⁻¹");
/** kg/m² unit. */
public static final Unit KG_PER_M2 = Unit.parse("kg/m²");
/** kg.m² unit. */
public static final Unit KG_M2 = Unit.parse("kg.m²");
/** km³/s² unit. */
public static final Unit KM3_PER_S2 = Unit.parse("km³/s²");
......
......@@ -36,22 +36,22 @@ public enum SpacecraftParametersKey {
context, false, false, true)),
/** 1-axis moment of inertia entry. */
I11((token, context, container) -> token.processAsDouble(Units.KG_PER_M2, container::setI11)),
I11((token, context, container) -> token.processAsDouble(Units.KG_M2, container::setI11)),
/** 2-axis moment of inertia entry. */
I22((token, context, container) -> token.processAsDouble(Units.KG_PER_M2, container::setI22)),
I22((token, context, container) -> token.processAsDouble(Units.KG_M2, container::setI22)),
/** 3-axis moment of inertia entry. */
I33((token, context, container) -> token.processAsDouble(Units.KG_PER_M2, container::setI33)),
I33((token, context, container) -> token.processAsDouble(Units.KG_M2, container::setI33)),
/** 1-axis / 2-axis inertia cross product entry. */
I12((token, context, container) -> token.processAsDouble(Units.KG_PER_M2, container::setI12)),
I12((token, context, container) -> token.processAsDouble(Units.KG_M2, container::setI12)),
/** 1-axis / 3-axis inertia cross product entry. */
I13((token, context, container) -> token.processAsDouble(Units.KG_PER_M2, container::setI13)),
I13((token, context, container) -> token.processAsDouble(Units.KG_M2, container::setI13)),
/** 2-axis / 3-axis inertia cross product entry. */
I23((token, context, container) -> token.processAsDouble(Units.KG_PER_M2, container::setI23));
I23((token, context, container) -> token.processAsDouble(Units.KG_M2, container::setI23));
/** Processing method. */
private final TokenProcessor processor;
......
......@@ -57,12 +57,12 @@ class SpacecraftParametersWriter extends AbstractWriter {
}
// inertia matrix
generator.writeEntry(SpacecraftParametersKey.I11.name(), Units.KG_PER_M2.fromSI(spacecraftParameters.getI11()), true);
generator.writeEntry(SpacecraftParametersKey.I22.name(), Units.KG_PER_M2.fromSI(spacecraftParameters.getI22()), true);
generator.writeEntry(SpacecraftParametersKey.I33.name(), Units.KG_PER_M2.fromSI(spacecraftParameters.getI33()), true);
generator.writeEntry(SpacecraftParametersKey.I12.name(), Units.KG_PER_M2.fromSI(spacecraftParameters.getI12()), true);
generator.writeEntry(SpacecraftParametersKey.I13.name(), Units.KG_PER_M2.fromSI(spacecraftParameters.getI13()), true);
generator.writeEntry(SpacecraftParametersKey.I23.name(), Units.KG_PER_M2.fromSI(spacecraftParameters.getI23()), true);
generator.writeEntry(SpacecraftParametersKey.I11.name(), Units.KG_M2.fromSI(spacecraftParameters.getI11()), true);
generator.writeEntry(SpacecraftParametersKey.I22.name(), Units.KG_M2.fromSI(spacecraftParameters.getI22()), true);
generator.writeEntry(SpacecraftParametersKey.I33.name(), Units.KG_M2.fromSI(spacecraftParameters.getI33()), true);
generator.writeEntry(SpacecraftParametersKey.I12.name(), Units.KG_M2.fromSI(spacecraftParameters.getI12()), true);
generator.writeEntry(SpacecraftParametersKey.I13.name(), Units.KG_M2.fromSI(spacecraftParameters.getI13()), true);
generator.writeEntry(SpacecraftParametersKey.I23.name(), Units.KG_M2.fromSI(spacecraftParameters.getI23()), true);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment