diff --git a/propulsion_design/src/integration/default/turbofan.cpp b/propulsion_design/src/integration/default/turbofan.cpp index ecabd09fd43fdd7eedf6503deac01bdc73a35a12..47875e5934364a33ac9276b860712a267217ccf5 100644 --- a/propulsion_design/src/integration/default/turbofan.cpp +++ b/propulsion_design/src/integration/default/turbofan.cpp @@ -155,13 +155,12 @@ namespace design geom2::Vector_3{0.25 * wing_chord, 0, 0}; /* Wing local x position of engine */ - const double length_factor = this->n_engines_.wing == 2 ? 0.9 : 0.85; - const double chord_engine = wing_quarter.x() - 0.15 * wing_chord - - length_factor * engine.dimension().length; // \cite Ata10 p. 83 + const double chord_engine = -0.1 * wing_chord; // \cite Ata10 p. 48f /* Wing local y position of engine */ const double height_engine = wing_quarter.y() - - 0.7 * geom2::measure::height_max(engine.nacelle()); + 0.5 * geom2::measure::height_max(engine.nacelle()) - + 0.1 * wing_chord; // \cite Ata10 p. 48f adapted to geometry_lib /* Adjust whether the engine is left or right */ auto position = geom2::Point_3{chord_engine, height_engine, span_engine}; diff --git a/propulsion_design/src/nacelle/default/turbofan.cpp b/propulsion_design/src/nacelle/default/turbofan.cpp index 1282e09f27ae68c689d04f47fc01d090611e0883..d7eb37f685b603290b14d400c3fb28657c6153ec 100644 --- a/propulsion_design/src/nacelle/default/turbofan.cpp +++ b/propulsion_design/src/nacelle/default/turbofan.cpp @@ -60,11 +60,11 @@ namespace geometry builder.insert_back(shape, {0.0, 0.0, 0.0}); /* Section 1 */ - shape.set_scale(1.25); + shape.set_scale(1.21); // \cite Ata10 p. 45 builder.insert_back(shape, {0.0, 0.0, engine.dimension().length * 0.25}); /* Section 2 */ - shape.set_scale(1.25); + shape.set_scale(1.21); // \cite Ata10 p. 45 builder.insert_back(shape, {0.0, 0.0, engine.dimension().length * 0.50}); /* Section 3 */ diff --git a/propulsion_design/src/pylon/default/turbofan.cpp b/propulsion_design/src/pylon/default/turbofan.cpp index ec763830fe2705c1c3c0cbb86ed8d5b56181a481..8c79ca2ed96c815db9080e580475dc60d48c36e7 100644 --- a/propulsion_design/src/pylon/default/turbofan.cpp +++ b/propulsion_design/src/pylon/default/turbofan.cpp @@ -65,19 +65,24 @@ namespace geometry /* * The offset of the engine to the origin since - * the pylon origin relative to the engine position. + * the pylon origin relative to the position of + * the second segment of the nacelle. Therefore, + * the pylon is also elevated to the second of + * the nacelle height. */ - const auto offset = engine.position() - CGAL::ORIGIN; - + const auto offset_start = engine.position() - CGAL::ORIGIN - geom2::Vector_3( + engine.dimension().length * 0.25, 0, (engine.dimension().height)*0.21/2); + const auto offset_end = engine.position() - CGAL::ORIGIN; + /* Section at nacelle attachment */ pylon.sections.emplace_back(profile); - pylon.sections.back().origin = geom2::transform::to_local(pylon, attachment.first - offset); + pylon.sections.back().origin = geom2::transform::to_local(pylon, attachment.first - offset_start); pylon.sections.back().set_chord_length(engine.dimension().length); /* Section attaching to the parent component */ pylon.sections.emplace_back(profile); - pylon.sections.back().origin = geom2::transform::to_local(pylon, attachment.second - offset); - pylon.sections.back().set_chord_length(engine.dimension().length); + pylon.sections.back().origin = geom2::transform::to_local(pylon, attachment.second -offset_end); + pylon.sections.back().set_chord_length(engine.dimension().length); /* Add the pylon to the engine */ engine.set_pylon(pylon);