Skip to content
Snippets Groups Projects
Commit d1f27f15 authored by Lukas Neuerburg's avatar Lukas Neuerburg
Browse files

applied sugestions regarding bwb config

parent d1845206
No related tags found
No related merge requests found
...@@ -46,7 +46,7 @@ bwbCalculatePolarConfig::bwbCalculatePolarConfig(const node& config) ...@@ -46,7 +46,7 @@ bwbCalculatePolarConfig::bwbCalculatePolarConfig(const node& config)
pathToLiftingLine(EndnodeReadOnly<std::string>("program_settings/LiftingLine/FolderPath")), pathToLiftingLine(EndnodeReadOnly<std::string>("program_settings/LiftingLine/FolderPath")),
stepWidthCL(EndnodeReadOnly<double>("LiftingLineForTAW/stepWidthCL")), stepWidthCL(EndnodeReadOnly<double>("LiftingLineForTAW/stepWidthCL")),
// other settings // other settings
setFlightConditionsMode(EndnodeReadOnly<std::string>("program_settings/FlightConditions/AdaptMachNumbersToCruiseReq")), setFlightConditionsMode(EndnodeReadOnly<bool>("program_settings/FlightConditions/AdaptMachNumbersToCruiseReq").read(config).value()),
// lifting line for TAW pitching moment corrections // lifting line for TAW pitching moment corrections
delta_CM0(EndnodeReadOnly<double>("LiftingLineForTAW/PitchingMoment/delta_CM0")), delta_CM0(EndnodeReadOnly<double>("LiftingLineForTAW/PitchingMoment/delta_CM0")),
delta_dCMdCL(EndnodeReadOnly<double>("LiftingLineForTAW/PitchingMoment/delta_dCMdCL")), delta_dCMdCL(EndnodeReadOnly<double>("LiftingLineForTAW/PitchingMoment/delta_dCMdCL")),
...@@ -80,7 +80,6 @@ bwbCalculatePolarConfig::bwbCalculatePolarConfig(const node& config) ...@@ -80,7 +80,6 @@ bwbCalculatePolarConfig::bwbCalculatePolarConfig(const node& config)
factorDragHL(EndnodeReadOnly<double>("program_settings/SemiEmpiricalHighLiftAdaptions/factorDrag")) { factorDragHL(EndnodeReadOnly<double>("program_settings/SemiEmpiricalHighLiftAdaptions/factorDrag")) {
CLModeAirfoilSelection.read(config); CLModeAirfoilSelection.read(config);
stepWidthCL.read(config); stepWidthCL.read(config);
setFlightConditionsMode.read(config);
pathToLiftingLine.read(config); pathToLiftingLine.read(config);
manualTransition.read(config); manualTransition.read(config);
manualTransitionWing.read(config); manualTransitionWing.read(config);
...@@ -110,13 +109,13 @@ bwbCalculatePolarConfig::bwbCalculatePolarConfig(const node& config) ...@@ -110,13 +109,13 @@ bwbCalculatePolarConfig::bwbCalculatePolarConfig(const node& config)
deltaTotalDragHL.read(config); deltaTotalDragHL.read(config);
factorDragHL.read(config); factorDragHL.read(config);
myRuntimeInfo->out << "config: " << liftingLineFolderPath << endl; myRuntimeInfo->out << "config: " << liftingLineFolderPath << endl;
if (setFlightConditionsMode.value() == "mode_0") { if (setFlightConditionsMode == false) {
myRuntimeInfo->info << "set flight conditions from config xml" << endl; myRuntimeInfo->info << "set flight conditions from config xml" << endl;
size_t numberFlightConditions(config.getVector(("program_settings/FlightConditions/FlightCondition"), 2).size()); size_t numberFlightConditions(config.getVector(("program_settings/FlightConditions/FlightCondition"), 2).size());
for (size_t i(0); i < numberFlightConditions; i++) { for (size_t i(0); i < numberFlightConditions; i++) {
readFlightConditions(config, i); readFlightConditions(config, i);
} }
} else if (setFlightConditionsMode.value() == "mode_1") { } else if (setFlightConditionsMode == true) {
myRuntimeInfo->info << "Hab vergessen was hier rein sollte" << endl; myRuntimeInfo->info << "Hab vergessen was hier rein sollte" << endl;
} }
CGPositions = {"design", "forward", "aft"}; CGPositions = {"design", "forward", "aft"};
......
...@@ -43,7 +43,7 @@ class bwbCalculatePolarConfig{ ...@@ -43,7 +43,7 @@ class bwbCalculatePolarConfig{
EndnodeReadOnly<std::string> CLModeAirfoilSelection; /**< Switch which sets if lift coefficient at ICA, at TOC or at average cruise is chosen for airfoil selection */ EndnodeReadOnly<std::string> CLModeAirfoilSelection; /**< Switch which sets if lift coefficient at ICA, at TOC or at average cruise is chosen for airfoil selection */
EndnodeReadOnly<double> stepWidthCL; EndnodeReadOnly<double> stepWidthCL;
// fligt condition parameters // fligt condition parameters
EndnodeReadOnly<std::string> setFlightConditionsMode; bool setFlightConditionsMode;
// lifting line pitching moment parameters // lifting line pitching moment parameters
EndnodeReadOnly<double> delta_CM0; EndnodeReadOnly<double> delta_CM0;
EndnodeReadOnly<double> delta_dCMdCL; EndnodeReadOnly<double> delta_dCMdCL;
......
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