Skip to content
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

Jump to bottom

Task #206 fix the bug in the equation where mass and power are being #218

Open
wants to merge 6 commits into
base: development
Choose a base branch
from
Open

Task #206 fix the bug in the equation where mass and power are being #218

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0902adc
Task #206 fix the bug in the equation where mass and power are being
Mar 6, 2024
33ce018
Task #206 Add my name in the author's list.
Mar 6, 2024
c42c0e9
Task #206 correction of the detecting error from the mass.
Mar 6, 2024
b95ead9
Task #206 updating of the concept.concept and restore the destroyed
Mar 14, 2024
fb05cbb
Task #206 Fix the error of the calculation.
Mar 15, 2024
7e534b1
Task #206 fix the errors.
Mar 20, 2024
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
24 changes: 12 additions & 12 deletions de.dlr.sc.virsat.model.extension.cefx/concept/concept.concept
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Concept de.dlr.sc.virsat.model.extension.cefx
FloatProperty systemMargin description "Constant system margin" default 0 quantityKind "Dimensionless" unit "Percent";
Type modeDuration of Category Parameter description "Duration of the modes" quantityKind "Time" unit "Second";
}

Category SystemMassParameters {
Applicable For [de.dlr.sc.virsat.model.extension.ps.ConfigurationTree, de.dlr.sc.virsat.model.extension.ps.AssemblyTree, de.dlr.sc.virsat.model.extension.ps.ElementConfiguration, de.dlr.sc.virsat.model.extension.ps.ElementOccurence];
Cardinality 1;
Expand All @@ -61,9 +61,9 @@ Concept de.dlr.sc.virsat.model.extension.cefx
Type massLaunchMax of Category Parameter quantityKind "Mass" unit "Kilogram";
Type massBuffer of Category Parameter quantityKind "Mass" unit "Kilogram";

Ref: massTotal = summary{SubSystemMassParameters.massTotal};
Ref: massTotal = summary{SubSystemMassParameters.massTotal, 0};
Ref: massTotalWithMargin = summary{SubSystemMassParameters.massTotalWithMargin};
Ref: massTotalWithMarginWithSystemMargin = massTotalWithMargin * (1 + SystemParameters.systemMargin);
Ref: massTotalWithMarginWithSystemMargin = massTotalWithMargin * (0 + SystemParameters.systemMargin);
franzTobiasDLR marked this conversation as resolved.
Show resolved Hide resolved
Ref: massLaunch = massTotalWithMarginWithSystemMargin + massPropellant + massAdapter;
Ref: massBuffer = massLaunchMax - massLaunch;
}
Expand All @@ -77,10 +77,10 @@ Concept de.dlr.sc.virsat.model.extension.cefx
Type powerEnergyWithMargin of Category Parameter quantityKind "Energy and Work" unit "Joule";
Type powerEnergyWithSystemMargin of Category Parameter quantityKind "Energy and Work" unit "Joule";

Ref: powerAvgWithMargin = summary{SubSystemPowerParameters.powerAvgWithMargin};
Ref: powerAvgWithSystemMargin = powerAvgWithMargin * (1 + SystemParameters.systemMargin);
Ref: powerAvgWithMargin = summary{SubSystemPowerParameters.powerAvgWithMargin, 0};
Ref: powerAvgWithSystemMargin = powerAvgWithMargin * (0 + SystemParameters.systemMargin);
franzTobiasDLR marked this conversation as resolved.
Show resolved Hide resolved
Ref: powerEnergyWithMargin = summary{SubSystemPowerParameters.powerEnergyWithMargin};
Ref: powerEnergyWithSystemMargin = powerEnergyWithMargin * (1 + SystemParameters.systemMargin);
Ref: powerEnergyWithSystemMargin = powerEnergyWithMargin * (0 + SystemParameters.systemMargin);
franzTobiasDLR marked this conversation as resolved.
Show resolved Hide resolved
}

/** SubSystem level specific collections of data and parameters */
Expand All @@ -94,8 +94,8 @@ Concept de.dlr.sc.virsat.model.extension.cefx
Type massMarginPercentage of Category Parameter quantityKind "Dimensionless" unit "Percent";
Type massMargin of Category Parameter quantityKind "Mass" unit "Kilogram";

Ref: massTotal = summary{EquipmentMassParameters.massTotal};
Ref: massTotalWithMargin = summary{EquipmentMassParameters.massTotalWithMargin, 1};
Ref: massTotal = summary{EquipmentMassParameters.massTotal, 0};
Ref: massTotalWithMargin = summary{EquipmentMassParameters.massTotalWithMargin, 0};
Ref: massMargin = massTotalWithMargin - massTotal;
Ref: massMarginPercentage = (massTotalWithMargin / massTotal) - 1;
}
Expand All @@ -107,7 +107,7 @@ Concept de.dlr.sc.virsat.model.extension.cefx
Type powerAvgWithMargin of Category Parameter quantityKind "Power" unit "Watt";
Type powerEnergyWithMargin of Category Parameter quantityKind "Energy and Work" unit "Joule";

Ref: powerAvgWithMargin = summary{EquipmentPowerParameters.powerAvgWithMargin};
Ref: powerAvgWithMargin = summary{EquipmentPowerParameters.powerAvgWithMargin, 0};
Ref: powerEnergyWithMargin = powerAvgWithMargin * SystemParameters.modeDuration;
}

Expand All @@ -127,8 +127,8 @@ Concept de.dlr.sc.virsat.model.extension.cefx
Type massTotal of Category Parameter quantityKind "Mass" unit "Kilogram" description "Mass of the unit including the mass of the child elements.";
Type massTotalWithMargin of Category Parameter quantityKind "Mass" unit "Kilogram";

Ref: massTotal = mass + summary{massTotal, 1};
Ref: massTotalWithMargin = mass + (mass * EquipmentParameters.marginMaturity) + summary{massTotalWithMargin, 1};
Ref: massTotal = mass + summary{massTotal, 0};
Ref: massTotalWithMargin = mass + (mass * EquipmentParameters.marginMaturity) + summary{massTotalWithMargin, 0};
}

Category EquipmentPowerParameters {
Expand All @@ -148,7 +148,7 @@ Concept de.dlr.sc.virsat.model.extension.cefx
Ref: powerUnitOnWithMargin = powerUnitOn + (powerUnitOn * EquipmentParameters.marginMaturity);
Ref: powerUnitStbyWithMargin = powerUnitStby + (powerUnitStby * EquipmentParameters.marginMaturity);
Ref: powerUnitAvgWithMargin = powerUnitOnWithMargin * powerDutyCycle + powerUnitStbyWithMargin * (1 - powerDutyCycle);
Ref: powerAvgWithMargin = (powerUnitAvgWithMargin + summary{powerAvgWithMargin, 1}) * ( 1 - powerUnitIsInactive);
Ref: powerAvgWithMargin = (powerUnitAvgWithMargin + summary{powerAvgWithMargin, 0}) * ( 1 - powerUnitIsInactive);
}

Category EquipmentTemperatureParameters {
Expand Down
Loading