diff --git a/aerodynamic_analysis/src/bwb/bwbCalculatePolarConfig.cpp b/aerodynamic_analysis/src/bwb/bwbCalculatePolarConfig.cpp index 16bc85617ff595bc1f94f22ed7d9b529a174a4ae..999288ab05701668470df33512f45f7d7dde0025 100644 --- a/aerodynamic_analysis/src/bwb/bwbCalculatePolarConfig.cpp +++ b/aerodynamic_analysis/src/bwb/bwbCalculatePolarConfig.cpp @@ -46,7 +46,7 @@ bwbCalculatePolarConfig::bwbCalculatePolarConfig(const node& config) pathToLiftingLine(EndnodeReadOnly<std::string>("program_settings/LiftingLine/FolderPath")), stepWidthCL(EndnodeReadOnly<double>("LiftingLineForTAW/stepWidthCL")), // 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 delta_CM0(EndnodeReadOnly<double>("LiftingLineForTAW/PitchingMoment/delta_CM0")), delta_dCMdCL(EndnodeReadOnly<double>("LiftingLineForTAW/PitchingMoment/delta_dCMdCL")), @@ -80,7 +80,6 @@ bwbCalculatePolarConfig::bwbCalculatePolarConfig(const node& config) factorDragHL(EndnodeReadOnly<double>("program_settings/SemiEmpiricalHighLiftAdaptions/factorDrag")) { CLModeAirfoilSelection.read(config); stepWidthCL.read(config); - setFlightConditionsMode.read(config); pathToLiftingLine.read(config); manualTransition.read(config); manualTransitionWing.read(config); @@ -110,13 +109,13 @@ bwbCalculatePolarConfig::bwbCalculatePolarConfig(const node& config) deltaTotalDragHL.read(config); factorDragHL.read(config); myRuntimeInfo->out << "config: " << liftingLineFolderPath << endl; - if (setFlightConditionsMode.value() == "mode_0") { + if (setFlightConditionsMode == false) { myRuntimeInfo->info << "set flight conditions from config xml" << endl; size_t numberFlightConditions(config.getVector(("program_settings/FlightConditions/FlightCondition"), 2).size()); for (size_t i(0); i < numberFlightConditions; i++) { readFlightConditions(config, i); } - } else if (setFlightConditionsMode.value() == "mode_1") { + } else if (setFlightConditionsMode == true) { myRuntimeInfo->info << "Hab vergessen was hier rein sollte" << endl; } CGPositions = {"design", "forward", "aft"}; diff --git a/aerodynamic_analysis/src/bwb/bwbCalculatePolarConfig.h b/aerodynamic_analysis/src/bwb/bwbCalculatePolarConfig.h index b1186c45792016c41aab196ea53166cbf197e963..d57d47fc97bb6b6cd8670632251c86e465fe4b99 100644 --- a/aerodynamic_analysis/src/bwb/bwbCalculatePolarConfig.h +++ b/aerodynamic_analysis/src/bwb/bwbCalculatePolarConfig.h @@ -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<double> stepWidthCL; // fligt condition parameters - EndnodeReadOnly<std::string> setFlightConditionsMode; + bool setFlightConditionsMode; // lifting line pitching moment parameters EndnodeReadOnly<double> delta_CM0; EndnodeReadOnly<double> delta_dCMdCL;