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

Get wind direction from velocity

Browse Source
This commit is contained in:
SiboVG 2024-09-21 05:24:17 +01:00
parent e8b2fdb448
commit b9d2ebd16b
2 changed files with 5 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
core/src/main/java/info/openrocket/core/models/wind/MultiLevelPinkNoiseWindModel.java
View File

@ -82,58 +82,12 @@ public class MultiLevelPinkNoiseWindModel implements WindModel {
return lowerVelocity.interpolate(upperVelocity, fraction);
}
private static double getInterpolatedDirection(LevelWindModel lowerLevel, LevelWindModel upperLevel, double fractionBetweenLevels) {
double lowerDirection = lowerLevel.model.getDirection();
double upperDirection = upperLevel.model.getDirection();
double directionDifference = upperDirection - lowerDirection;
// Ensure we take the shortest path around the circle
if (directionDifference > Math.PI) {
directionDifference -= 2 * Math.PI;
} else if (directionDifference < -Math.PI) {
directionDifference += 2 * Math.PI;
}
double interpolatedDirection = lowerDirection + fractionBetweenLevels * directionDifference;
return interpolatedDirection;
}
private double getPinkNoiseValue(double time, LevelWindModel lower, LevelWindModel upper, double fraction) {
double lowerNoise = lower.model.getWindVelocity(time, lower.altitude).length() - lower.model.getAverage();
double upperNoise = upper.model.getWindVelocity(time, upper.altitude).length() - upper.model.getAverage();
return lowerNoise + fraction * (upperNoise - lowerNoise);
}
public double getWindDirection(double altitude) {
if (levels.isEmpty()) {
return 0;
}
int index = Collections.binarySearch(levels, new LevelWindModel(altitude, null),
Comparator.comparingDouble(l -> l.altitude));
if (index >= 0) {
return levels.get(index).model.getDirection();
}
int insertionPoint = -index - 1;
if (insertionPoint == 0) {
return levels.get(0).model.getDirection();
}
if (insertionPoint == levels.size()) {
return levels.get(levels.size() - 1).model.getDirection();
}
// Interpolation (take the value between the closest two bounds)
LevelWindModel lowerLevel = levels.get(insertionPoint - 1);
LevelWindModel upperLevel = levels.get(insertionPoint);
double fractionBetweenLevels = (altitude - lowerLevel.altitude) / (upperLevel.altitude - lowerLevel.altitude);
// Interpolate direction
double interpolatedDirection = getInterpolatedDirection(lowerLevel, upperLevel, fractionBetweenLevels);
public double getWindDirection(double time, double altitude) {
Coordinate velocity = getWindVelocity(time, altitude);
double direction = Math.atan2(velocity.x, velocity.y);
// Normalize the result to be between 0 and 2*PI
return (interpolatedDirection + 2 * Math.PI) % (2 * Math.PI);
return (direction + 2 * Math.PI) % (2 * Math.PI);
}
@Override

2
core/src/main/java/info/openrocket/core/simulation/SimulationOptions.java
View File

@ -129,7 +129,7 @@ public class SimulationOptions implements ChangeSource, Cloneable, SimulationOpt
if (windModelType == WindModelType.AVERAGE) {
windDirection = averageWindModel.getDirection();
} else {
windDirection = multiLevelPinkNoiseWindModel.getWindDirection(launchAltitude);
windDirection = multiLevelPinkNoiseWindModel.getWindDirection(0, launchAltitude);
}
this.setLaunchRodDirection(windDirection);
}