Skip to content
Snippets Groups Projects
Commit 9226b874 authored by JensViloehr's avatar JensViloehr
Browse files

Merge branch 'fix/issue-63' into 'develop'

[FIX] Uninitialized values lead to issue on wing position if wing position is not "low"

See merge request !54
parents 8306c23b fd92a372
No related branches found
No related tags found
5 merge requests!263Apply 1 suggestion(s) to 1 file(s),!261Reintruduced automatic flight condition selection,!245Apply 1 suggestion(s) to 1 file(s),!233Initial open source version,!54[FIX] Uninitialized values lead to issue on wing position if wing position is not "low"
......@@ -284,22 +284,27 @@ geom2::Point_3 Wing::calculate_wing_position() {
const double fuselage_maximum_width = geom2::measure::width_max(data->fuselage);
const double fuselage_maximum_height = geom2::measure::height_max(data->fuselage);
double fuselage_upper_z;
double fuselage_lower_z;
/* Set fuselage upper and lower z to the center of the fuselage */
double fuselage_upper_z = data->fuselage.origin.z();
double fuselage_lower_z = data->fuselage.origin.z();
/* Keel beam height as fraction of fuselage height*/
double keel_beam_height = 0.005 * fuselage_maximum_height; // Assumed 0.5% of fuselage height
/* Define wing position limits */
if (data->specification_wing_mounting.value() == "low") {
fuselage_upper_z = data->fuselage.origin.z();
/* Limit to lower fuselage half*/
fuselage_lower_z = data->fuselage.origin.z() - fuselage_maximum_height * 0.5;
keel_beam_height = 0.005 * (fuselage_upper_z - fuselage_lower_z);
z_limits = {fuselage_lower_z + keel_beam_height, fuselage_upper_z};
} else if (data->specification_wing_mounting.value() == "high") {
/* Limit to upper fuselage half*/
fuselage_upper_z += fuselage_maximum_height * 0.5;
keel_beam_height = 0.005 * (fuselage_upper_z - fuselage_lower_z);
z_limits = {fuselage_lower_z, fuselage_upper_z - keel_beam_height};
} else {
z_limits = {fuselage_lower_z, fuselage_upper_z};
/* Allow variation between +- 10% of overall fuselage max height */
z_limits = {fuselage_lower_z - 0.10 * fuselage_maximum_height, fuselage_upper_z + 0.10 * fuselage_maximum_height};
}
// Assume center position
......
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