From 3bf0c5053d27a662ed3a86f8d2987d1757d483d8 Mon Sep 17 00:00:00 2001
From: Gerrit Pauls <gerrit.pauls@tuhh.de>
Date: Thu, 21 Nov 2024 12:21:47 +0100
Subject: [PATCH] Naming issue fixed
---
.../operating_conditions.cpp | 2 +-
.../condition_methods/operating_conditions.h | 2 +-
.../flight_segments/flight_segments.cpp | 20 +++++++++----------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/mission_analysis/src/libs/condition_methods/operating_conditions.cpp b/mission_analysis/src/libs/condition_methods/operating_conditions.cpp
index 9e66f6fb..44b3a2c2 100644
--- a/mission_analysis/src/libs/condition_methods/operating_conditions.cpp
+++ b/mission_analysis/src/libs/condition_methods/operating_conditions.cpp
@@ -34,7 +34,7 @@ Operating_conditions::Operating_conditions(std::vector<mission_file_data_handler
Operating_conditions::~Operating_conditions() {
}
-void Operating_conditions::set_segment_Operating_conditions(const uint16_t &i) {
+void Operating_conditions::set_segment_operating_conditions(const uint16_t &i) {
this->mission_step = i;
this->config = (*mission_data).at(i).config;
this->rating = (*mission_data).at(i).rating;
diff --git a/mission_analysis/src/libs/condition_methods/operating_conditions.h b/mission_analysis/src/libs/condition_methods/operating_conditions.h
index e7a41ccb..c10562de 100644
--- a/mission_analysis/src/libs/condition_methods/operating_conditions.h
+++ b/mission_analysis/src/libs/condition_methods/operating_conditions.h
@@ -51,7 +51,7 @@ class Operating_conditions {
/** \brief Function sets segment operating conditions
* \param i: index parameter of mission step [-]
*/
- void set_segment_Operating_conditions(const uint16_t &i);
+ void set_segment_operating_conditions(const uint16_t &i);
/** \brief Function deletes the time step processed values from the bleed- and shaft_power-Offtakes vectors of operationConditions
* \param time_step constant reference of the overall time step [s]
*/
diff --git a/mission_analysis/src/standard_mission/flight_segments/flight_segments.cpp b/mission_analysis/src/standard_mission/flight_segments/flight_segments.cpp
index f4626aa8..e0000899 100644
--- a/mission_analysis/src/standard_mission/flight_segments/flight_segments.cpp
+++ b/mission_analysis/src/standard_mission/flight_segments/flight_segments.cpp
@@ -124,7 +124,7 @@ void standard_mission::calculate_ground_run(Operating_conditions* oc, Flight_con
void standard_mission::takeoff_calculation(Operating_conditions* oc, Flight_conditions* fc, const uint16_t& a_mission_step) {
myRuntimeInfo->out << "Take-off calculation ..." << std::endl;
- oc->set_segment_Operating_conditions(a_mission_step);
+ oc->set_segment_operating_conditions(a_mission_step);
/* Set the initial conditions of the segment */
this->set_segment_initial_conditions(fc);
/* Takeoff distance is composed of ground run (break release until lift off) and 1st climb segment to screen height (35ft) */
@@ -529,7 +529,7 @@ void standard_mission::estimate_descent(const bool& last_segment_free_flight_swi
/* Initialize operating conditions object */
Operating_conditions descent_oc(&(this->mission_file->mission_data));
/* Set the operating conditions of the segment */
- descent_oc.set_segment_Operating_conditions(this->top_of_descent_index);
+ descent_oc.set_segment_operating_conditions(this->top_of_descent_index);
/* Initialize flight conditions object */
Flight_conditions descent_fc(&(this->mission_file->mission_data), &descent_oc,
&this->aero, &this->atm, &this->engine, this->variable_camber_segment_quantity);
@@ -630,7 +630,7 @@ double standard_mission::glideslope_interception(Operating_conditions* oc, Fligh
double range_for_descent(0.);
if (!simulation_mode) myRuntimeInfo->out << "Glideslope Interception ... " << std::endl;
/* Set the operating conditions of the segment */
- oc->set_segment_Operating_conditions(a_mission_step);
+ oc->set_segment_operating_conditions(a_mission_step);
/* Set the initial conditions of the segment */
this->set_segment_initial_conditions(fc, !simulation_mode);
fc->end_TAS = fc->TAS;
@@ -672,7 +672,7 @@ double standard_mission::landing(Operating_conditions* oc, Flight_conditions* fc
*/
if (!simulation_mode) myRuntimeInfo->out << "Landing ... " << std::endl;
double descent_to_touchdown_range(0.);
- oc->set_segment_Operating_conditions(a_mission_step);
+ oc->set_segment_operating_conditions(a_mission_step);
/* Set the initial conditions for the segment */
this->set_segment_initial_conditions(fc, !simulation_mode);
if (!simulation_mode) this->landing_distance = this->mission_profile.back().end_range; //get current range when landing is started
@@ -737,7 +737,7 @@ double standard_mission::change_speed_at_constant_ROC(Operating_conditions* oc,
double acceleration_increment(0.);
double minimum_acceleration(0.);
/* Set the operating conditions of the segment */
- oc->set_segment_Operating_conditions(a_mission_step);
+ oc->set_segment_operating_conditions(a_mission_step);
/* Set the initial conditions of the segment */
this->set_segment_initial_conditions(fc, !simulation_mode);
if (this->mission_file->mission_data.at(a_mission_step).mach_switch) {
@@ -826,7 +826,7 @@ double standard_mission::change_altitude_at_constant_speed(Operating_conditions*
<< std::endl;
}
/* Set the operating conditions of the segment */
- oc->set_segment_Operating_conditions(a_mission_step);
+ oc->set_segment_operating_conditions(a_mission_step);
if (this->mission_file->mission_data.at(a_mission_step).mode ==
Flight_conditions::FLCHANGESIMULATION ||
this->mission_file->mission_data.at(a_mission_step).mode == Flight_conditions::FLCHANGE) {
@@ -877,7 +877,7 @@ void standard_mission::cruise_at_constant_mach(Operating_conditions* oc, Flight_
int energy_carrier_id(fc->mission_data->at(fc->operating_condition->mission_step).energy_carrier_id);
/* Set the operating conditions of the segment */
- oc->set_segment_Operating_conditions(a_mission_step);
+ oc->set_segment_operating_conditions(a_mission_step);
/* Set the initial conditions of the segment */
this->set_segment_initial_conditions(fc);
double x_end = this->mission_file->mission_data.at(a_mission_step).rel_segment_length *
@@ -1016,7 +1016,7 @@ void standard_mission::cruise_at_constant_mach(Operating_conditions* oc, Flight_
void standard_mission::air_to_air_fuelling(Operating_conditions* oc, Flight_conditions* fc, const uint16_t& a_mission_step) {
myRuntimeInfo->out << "Air-to-air Fueling ... " << std::endl;
- oc->set_segment_Operating_conditions(a_mission_step);
+ oc->set_segment_operating_conditions(a_mission_step);
/* Set the initial conditions of the segment */
this->set_segment_initial_conditions(fc);
/* Set the true airspeed at the end of the segment */
@@ -1055,7 +1055,7 @@ void standard_mission::air_to_air_fuelling(Operating_conditions* oc, Flight_cond
void standard_mission::free_flight(Operating_conditions* oc, Flight_conditions* fc, const uint16_t& a_mission_step) {
myRuntimeInfo->out << "Climbing to Free-Flight-Optimum ... " << std::endl;
/* Set the operating conditions of the segment */
- oc->set_segment_Operating_conditions(a_mission_step);
+ oc->set_segment_operating_conditions(a_mission_step);
/* Set the initial conditions of the segment */
this->set_segment_initial_conditions(fc);
/* Convert true airspeed into Mach number */
@@ -1109,7 +1109,7 @@ void standard_mission::free_flight(Operating_conditions* oc, Flight_conditions*
/* Free-Flight-Cruise */
myRuntimeInfo->out << "Free-Flight-Cruise ... " << std::endl;
/* Set the operating conditions of the segment */
- oc->set_segment_Operating_conditions(a_mission_step);
+ oc->set_segment_operating_conditions(a_mission_step);
/* Set the initial conditions of the segment */
this->set_segment_initial_conditions(fc);
--
GitLab