From 9be9cdd00f4c6ed811db2559428b929ccbdfb04b Mon Sep 17 00:00:00 2001
From: "ellen.seabrooke" <seabrooke@ifb.uni-stuttgart.de>
Date: Fri, 28 Mar 2025 07:06:33 +0100
Subject: [PATCH] further removal
---
systems_design/src/common/weightsAndCGs.cpp | 2 --
systems_design/src/standard/standardPlot.cpp | 4 +---
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/systems_design/src/common/weightsAndCGs.cpp b/systems_design/src/common/weightsAndCGs.cpp
index e895f5bc..77cfc5b2 100644
--- a/systems_design/src/common/weightsAndCGs.cpp
+++ b/systems_design/src/common/weightsAndCGs.cpp
@@ -157,7 +157,6 @@ void weightsAndCGs::getFurnishingsGroup() {
std::vector<std::string> includedATA;
includedATA.push_back("ATA-25"); //Furnishing
includedATA.push_back("ATA-33"); //Lighting
- includedATA.push_back("ATA-35"); //Oxygen
// Finder of the respective systems
for (size_t i = 0; i < includedATA.size(); i++) {
bool foundSystem{false};
@@ -258,7 +257,6 @@ void weightsAndCGs::getSystemsGroup() {
includedATA.push_back("ATA-29"); //Hydraulic
includedATA.push_back("ATA-30"); //Anti Ice
///includedATA.push_back( "ATA-33" ); //Lighting -> in Furnishings Group
- ///includedATA.push_back( "ATA-35" ); //Oxygen -> in Furnishings Group
includedATA.push_back("ATA-49"); //APU
includedATA.push_back("ATA-XX"); //Remaining consumers including AVIONICS
// Finder of the respective systems
diff --git a/systems_design/src/standard/standardPlot.cpp b/systems_design/src/standard/standardPlot.cpp
index 7eea6f16..3c8cfd00 100644
--- a/systems_design/src/standard/standardPlot.cpp
+++ b/systems_design/src/standard/standardPlot.cpp
@@ -72,7 +72,6 @@ void standardSystemsDesign::generatePlotSystemsMass() {
plot << "ATA-29;Hydraulic System;" << data_->Systems.allSystems.at(data_->Systems.getSpecificSystem("ATA-29"))->Mass << std::endl;
plot << "ATA-30;Anti-Icing;" << data_->Systems.allSystems.at(data_->Systems.getSpecificSystem("ATA-30"))->Mass << std::endl;
plot << "ATA-33;Lighting;" << data_->Systems.allSystems.at(data_->Systems.getSpecificSystem("ATA-33"))->Mass << std::endl;
- plot << "ATA-35;Oxygen;" << data_->Systems.allSystems.at(data_->Systems.getSpecificSystem("ATA-35"))->Mass << std::endl;
plot << "ATA-36;Bleed Air;" << data_->Systems.allSystems.at(data_->Systems.getSpecificSystem("ATA-36"))->Mass << std::endl;
if (data_->Systems.containsSystem("ATA-85") == true) {
plot << "ATA-85;FC;" << data_->Systems.allSystems.at(data_->Systems.getSpecificSystem("ATA-85"))->Mass << std::endl;
@@ -86,7 +85,7 @@ void standardSystemsDesign::generatePlotSystemsMass() {
// Prepare data for plotting
std::vector<std::string> components = {
"ATA-21", "ATA-24", "ATA-25", "ATA-26", "ATA-27", "ATA-28", "ATA-29",
- "ATA-30", "ATA-33", "ATA-35", "ATA-36", data_->Systems.containsSystem("ATA-85") ? "ATA-85" : "ATA-49", "ATA-XX", "not Alloc"
+ "ATA-30", "ATA-33", "ATA-36", data_->Systems.containsSystem("ATA-85") ? "ATA-85" : "ATA-49", "ATA-XX", "not Alloc"
};
std::vector<std::string> names = {
"Air Conditioning", "Electric System", "Furnishing", "Fire Protection",
@@ -104,7 +103,6 @@ void standardSystemsDesign::generatePlotSystemsMass() {
data_->Systems.allSystems.at(data_->Systems.getSpecificSystem("ATA-29"))->Mass,
data_->Systems.allSystems.at(data_->Systems.getSpecificSystem("ATA-30"))->Mass,
data_->Systems.allSystems.at(data_->Systems.getSpecificSystem("ATA-33"))->Mass,
- data_->Systems.allSystems.at(data_->Systems.getSpecificSystem("ATA-35"))->Mass,
data_->Systems.allSystems.at(data_->Systems.getSpecificSystem("ATA-36"))->Mass,
data_->Systems.containsSystem("ATA-85") ? data_->Systems.allSystems.at(data_->Systems.getSpecificSystem("ATA-85"))->Mass :
data_->Systems.allSystems.at(data_->Systems.getSpecificSystem("ATA-49"))->Mass,
--
GitLab