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

Merge pull request #2253 from JoePfeiffer/fix-2196

Browse Source 
Check for 0 mass when running simulation
This commit is contained in:
Joe Pfeiffer 2023-07-17 18:26:10 -06:00 committed by GitHub
commit f691066145
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/resources/l10n/messages.properties
View File

@ -636,6 +636,8 @@ RK4SimulationStepper.error.valuesTooLarge = Simulation values exceeded limits.
SimulationModifierTree.OptimizationParameters = Optimization Parameters SimulationModifierTree.OptimizationParameters = Optimization Parameters
SimulationStepper.error.totalMassZero = Total mass of active states is 0
! SimulationExportPanel ! SimulationExportPanel
SimExpPan.border.Vartoexport = Variables to export SimExpPan.border.Vartoexport = Variables to export
SimExpPan.border.Stage = Stage to export SimExpPan.border.Stage = Stage to export

8
core/src/net/sf/openrocket/simulation/AbstractEulerStepper.java
View File

@ -3,10 +3,12 @@ package net.sf.openrocket.simulation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.models.atmosphere.AtmosphericConditions; import net.sf.openrocket.models.atmosphere.AtmosphericConditions;
import net.sf.openrocket.rocketcomponent.InstanceMap; import net.sf.openrocket.rocketcomponent.InstanceMap;
import net.sf.openrocket.rocketcomponent.RecoveryDevice; import net.sf.openrocket.rocketcomponent.RecoveryDevice;
import net.sf.openrocket.simulation.exception.SimulationException; import net.sf.openrocket.simulation.exception.SimulationException;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.Coordinate;
import net.sf.openrocket.util.GeodeticComputationStrategy; import net.sf.openrocket.util.GeodeticComputationStrategy;
import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.MathUtil;
@ -14,6 +16,7 @@ import net.sf.openrocket.util.WorldCoordinate;
public abstract class AbstractEulerStepper extends AbstractSimulationStepper { public abstract class AbstractEulerStepper extends AbstractSimulationStepper {
private static final Logger log = LoggerFactory.getLogger(AbstractEulerStepper.class); private static final Logger log = LoggerFactory.getLogger(AbstractEulerStepper.class);
private static final Translator trans = Application.getTranslator();
private static final double RECOVERY_TIME_STEP = 0.5; private static final double RECOVERY_TIME_STEP = 0.5;
@ -46,12 +49,15 @@ public abstract class AbstractEulerStepper extends AbstractSimulationStepper {
double dynP = (0.5 * atmosphere.getDensity() * airSpeed.length2()); double dynP = (0.5 * atmosphere.getDensity() * airSpeed.length2());
double dragForce = getCD() * dynP * status.getConfiguration().getReferenceArea(); double dragForce = getCD() * dynP * status.getConfiguration().getReferenceArea();
// n.b. this is constant, and could be calculated once at the beginning of this simulation branch...
double rocketMass = calculateStructureMass(status).getMass(); double rocketMass = calculateStructureMass(status).getMass();
double motorMass = calculateMotorMass(status).getMass(); double motorMass = calculateMotorMass(status).getMass();
double mass = rocketMass + motorMass; double mass = rocketMass + motorMass;
if (mass < MathUtil.EPSILON) {
throw new SimulationException(trans.get("SimulationStepper.error.totalMassZero"));
}
// Compute drag acceleration // Compute drag acceleration
Coordinate linearAcceleration; Coordinate linearAcceleration;
if (airSpeed.length() > 0.001) { if (airSpeed.length() > 0.001) {

4
core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java
View File

@ -329,6 +329,10 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
store.motorMass = calculateMotorMass(status); store.motorMass = calculateMotorMass(status);
store.rocketMass = structureMassData.add( store.motorMass ); store.rocketMass = structureMassData.add( store.motorMass );
if (store.rocketMass.getMass() < MathUtil.EPSILON) {
throw new SimulationException(trans.get("SimulationStepper.error.totalMassZero"));
}
// Calculate the forces from the aerodynamic coefficients // Calculate the forces from the aerodynamic coefficients
double dynP = (0.5 * store.flightConditions.getAtmosphericConditions().getDensity() * double dynP = (0.5 * store.flightConditions.getAtmosphericConditions().getDensity() *