hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
SiboVG 2023-04-01 16:09:24 +02:00
parent 215080e0c9
commit d834deb5ba
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/src/net/sf/openrocket/file/rasaero/export/SimulationDTO.java
View File

@ -169,52 +169,59 @@ public class SimulationDTO {
// Sustainer // Sustainer
case 0: case 0:
setSustainerEngine(RASAeroCommonConstants.OPENROCKET_TO_RASAERO_MOTOR(motors, motor, motorConfig, warnings)); setSustainerEngine(RASAeroCommonConstants.OPENROCKET_TO_RASAERO_MOTOR(motors, motor, motorConfig, warnings));
double sustainerMass = stage.getSectionMass() + motorMass;
// Calculate mass & CG of sustainer
CGCalcConfig.setOnlyStage(0);
calc = MassCalculator.calculateStructure(CGCalcConfig);
// Set mass
double sustainerMass = calc.getMass() + motorMass;
setSustainerLaunchWt(sustainerMass * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_WEIGHT); setSustainerLaunchWt(sustainerMass * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_WEIGHT);
// Calculate CG of sustainer // Set CG
CGCalcConfig.setOnlyStage(0); double sustainerCG = calc.getCM().x;
double sustainerCG = MassCalculator.calculateStructure(CGCalcConfig).getCM().x;
setSustainerCG(sustainerCG * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_LENGTH); setSustainerCG(sustainerCG * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_LENGTH);
// Ignition delay // Set ignition delay
ignitionDelay = motorConfig != null ? motorConfig.getIgnitionDelay() : 0; ignitionDelay = motorConfig != null ? motorConfig.getIgnitionDelay() : 0;
setSustainerIgnitionDelay(ignitionDelay); setSustainerIgnitionDelay(ignitionDelay);
break; break;
// Booster 1 // Booster 1
case 1: case 1:
setBooster1Engine(RASAeroCommonConstants.OPENROCKET_TO_RASAERO_MOTOR(motors, motor, motorConfig, warnings)); setBooster1Engine(RASAeroCommonConstants.OPENROCKET_TO_RASAERO_MOTOR(motors, motor, motorConfig, warnings));
// Aggregate CG of sustainer and booster 1 // Calculate mass & CG of sustainer + booster 1 combined
CGCalcConfig.setOnlyStage(0); CGCalcConfig.setOnlyStage(0);
for (int i = 1; i <= stage.getStageNumber(); i++) { for (int i = 1; i <= stage.getStageNumber(); i++) {
CGCalcConfig._setStageActive(i, true); CGCalcConfig._setStageActive(i, true);
} }
calc = MassCalculator.calculateStructure(CGCalcConfig); calc = MassCalculator.calculateStructure(CGCalcConfig);
// Aggregate mass of sustainer and booster 1 // Set mass
double booster1Mass = calc.getMass() + motorMass + sustainerMotorMass; double booster1Mass = calc.getMass() + motorMass + sustainerMotorMass;
setBooster1LaunchWt(booster1Mass * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_WEIGHT); setBooster1LaunchWt(booster1Mass * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_WEIGHT);
// CG // Set CG
totalCG = calc.getCM().x; totalCG = calc.getCM().x;
setBooster1CG(totalCG * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_LENGTH); setBooster1CG(totalCG * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_LENGTH);
// Ignition delay // Set ignition delay
ignitionDelay = motorConfig != null ? motorConfig.getIgnitionDelay() : 0; ignitionDelay = motorConfig != null ? motorConfig.getIgnitionDelay() : 0;
setBooster1IgnitionDelay(ignitionDelay); setBooster1IgnitionDelay(ignitionDelay);
// Separation delay // Set separation delay
separationDelay = separationConfig != null ? separationConfig.getSeparationDelay() : 0; separationDelay = separationConfig != null ? separationConfig.getSeparationDelay() : 0;
setBooster1SeparationDelay(separationDelay); // TODO: this could be handled a bit better (look at separation delay, upper stage ignition event etc.) setBooster1SeparationDelay(separationDelay); // TODO: this could be handled a bit better (look at separation delay, upper stage ignition event etc.)
setIncludeBooster1(mount != null && mount.isMotorMount()); setIncludeBooster1(mount != null && mount.isMotorMount());
break; break;
// Booster 2 // Booster 2
case 2: case 2:
setBooster2Engine(RASAeroCommonConstants.OPENROCKET_TO_RASAERO_MOTOR(motors, motor, motorConfig, warnings)); setBooster2Engine(RASAeroCommonConstants.OPENROCKET_TO_RASAERO_MOTOR(motors, motor, motorConfig, warnings));
// Calculate the aggregated CG of the sustainer, booster and booster 2 // Calculate mass & CG of sustainer + booster 1 + booster 2 combined
CGCalcConfig.setOnlyStage(0); CGCalcConfig.setOnlyStage(0);
for (int i = 1; i <= stage.getStageNumber(); i++) { for (int i = 1; i <= stage.getStageNumber(); i++) {
CGCalcConfig._setStageActive(i, true); CGCalcConfig._setStageActive(i, true);
@ -227,19 +234,20 @@ public class SimulationDTO {
Motor booster1Motor = booster1Config.getMotor(); Motor booster1Motor = booster1Config.getMotor();
double booster1MotorMass = booster1Motor != null ? booster1Motor.getLaunchMass() : 0; double booster1MotorMass = booster1Motor != null ? booster1Motor.getLaunchMass() : 0;
// Aggregate mass of sustainer, booster 1 and booster 2 // Set mass
double booster2Mass = calc.getMass() + motorMass + sustainerMotorMass + booster1MotorMass; double booster2Mass = calc.getMass() + motorMass + sustainerMotorMass + booster1MotorMass;
setBooster2LaunchWt(booster2Mass * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_WEIGHT); setBooster2LaunchWt(booster2Mass * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_WEIGHT);
// CG // Set CG
totalCG = calc.getCM().x; totalCG = calc.getCM().x;
setBooster2CG(totalCG * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_LENGTH); setBooster2CG(totalCG * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_LENGTH);
// Separation delay // Set separation delay
separationDelay = separationConfig != null ? separationConfig.getSeparationDelay() : 0; separationDelay = separationConfig != null ? separationConfig.getSeparationDelay() : 0;
setBooster2Delay(separationDelay); // TODO: this could be handled a bit better (look at separation delay, upper stage ignition event etc.) setBooster2Delay(separationDelay); // TODO: this could be handled a bit better (look at separation delay, upper stage ignition event etc.)
setIncludeBooster2(mount != null && mount.isMotorMount()); setIncludeBooster2(mount != null && mount.isMotorMount());
break; break;
// Invalid // Invalid
default: default: