From e25db373bb0a8a553673bb46db3c2cbb8af9d507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CKatrinBistreck=E2=80=9D?= <“katrin.bistreck@tuhh.de”> Date: Wed, 19 Feb 2025 11:05:07 +0100 Subject: [PATCH 1/2] fix/updateHeaderEcoAssessment --- .../ecological_assessment_conf.xml | 18 ++++----- .../src/ecological_assessment.cpp | 2 +- .../src/ecological_assessment.h | 2 +- .../src/main_ecological_assessment.cpp | 2 +- .../emission_calculation/ecoDatabase.cpp | 2 +- .../emission_calculation/ecoDatabase.h | 2 +- .../calculateEmissions_schaefer.cpp | 2 +- .../calculateEmissions_schaefer.h | 2 +- .../LCA_schaefer/development.cpp | 2 +- .../LCA_schaefer/development.h | 2 +- .../LCA_schaefer/endOfLife.cpp | 2 +- .../LCA_schaefer/endOfLife.h | 2 +- .../LCA_schaefer/operation.cpp | 2 +- .../LCA_schaefer/operation.h | 2 +- .../LCA_schaefer/production.cpp | 2 +- .../LCA_schaefer/production.h | 2 +- .../LCA_schaefer/schaeferConfig.cpp | 2 +- .../LCA_schaefer/schaeferConfig.h | 2 +- .../LCA_schaefer/schaeferIOData.cpp | 2 +- .../LCA_schaefer/schaeferIOData.h | 2 +- .../LCA_schaefer/schaeferPlot.cpp | 2 +- .../LCA_schaefer/schaeferReport.cpp | 2 +- .../mission_emissions/flightPath.cpp | 2 +- .../mission_emissions/flightPath.h | 2 +- .../hydrogen_combustion_emissions.cpp | 2 +- .../mission_emissions/kerosene_emissions.cpp | 2 +- .../mission_emissions/mission.cpp | 2 +- .../mission_emissions/mission.h | 2 +- .../mission_emissions/missionConfig.cpp | 2 +- .../mission_emissions/missionConfig.h | 2 +- .../mission_emissions/missionIOData.cpp | 2 +- .../mission_emissions/missionIOData.h | 2 +- .../mission_emissions/missionPlot.cpp | 2 +- .../mission_emissions/missionReport.cpp | 2 +- .../src/standard_strategy/emissionsClass.cpp | 2 +- .../src/standard_strategy/emissionsClass.h | 2 +- .../AQISchaeferIOData.cpp | 2 +- .../AQISchaeferIOData.h | 2 +- .../AQISchaeferReport.cpp | 2 +- .../AQI_schaefer.cpp | 2 +- .../air_quality_index_schaefer/AQI_schaefer.h | 2 +- .../climate_model_dallara/dallara.cpp | 2 +- .../climate_model_dallara/dallara.h | 2 +- .../climate_model_dallara/dallaraConfig.cpp | 4 +- .../climate_model_dallara/dallaraConfig.h | 2 +- .../climate_model_dallara/dallaraIOData.cpp | 2 +- .../climate_model_dallara/dallaraIOData.h | 2 +- .../climate_model_dallara/dallaraPlot.cpp | 2 +- .../climate_model_dallara/dallaraReport.cpp | 2 +- .../standard_strategy/standard_strategy.cpp | 2 +- .../standard_strategy.cpp.rej | 12 ++++++ .../src/standard_strategy/standard_strategy.h | 2 +- ecological_assessment/src/toolinfo.h | 2 +- .../test/blackbox_ecological_assessment.cpp | 40 +++++++++---------- 54 files changed, 92 insertions(+), 82 deletions(-) create mode 100644 ecological_assessment/src/standard_strategy/standard_strategy.cpp.rej diff --git a/ecological_assessment/ecological_assessment_conf.xml b/ecological_assessment/ecological_assessment_conf.xml index b333c4ba..17a341e5 100644 --- a/ecological_assessment/ecological_assessment_conf.xml +++ b/ecological_assessment/ecological_assessment_conf.xml @@ -61,7 +61,7 @@ <CO_method_selector description="Select method for calculation of carbon monoxide emission index. Selector: mode_0 (DLR Omega Method) / mode_1 (Boeing Fuel Flow Method 2) / mode_2 (ICAO Emission indices)"> <value>mode_0</value> </CO_method_selector> - <NOx_method_selector description="Select method for calculation of nitrogren oxide emission index. Selector: mode_0 (pressure and temperature dependend (P3T3) method by P.D.Norman) / mode_1 (Boeing Fuel Flow Method 2) / mode_2 (NOx values from GasTurb will be used)"> + <NOx_method_selector description="Select method for calculation of nitrogen oxide emission index. Selector: mode_0 (pressure and temperature dependend (P3T3) method by P.D.Norman) / mode_1 (Boeing Fuel Flow Method 2) / mode_2 (NOx values from GasTurb will be used)"> <value>mode_0</value> </NOx_method_selector> <soot_method_selector description="Select method for calculation of soot emission index. Selector: mode_0 (DLR correlation based on ICAO smoke number) / mode_1 (Correlation by R.B.Whyte) / mode_2 (Use constant factor defined in engine.xml)"> @@ -69,7 +69,7 @@ </soot_method_selector> </kerosene> <hydrogen_combustion description="Calculation methods for hydrogen combustion emission indices"> - <NOx_method_selector description="Select method for calculation of nitrogren oxide emission index. Selector: mode_0 (Use constant EI for different mission segments (Kossarev 2022)) / mode_1 (P3T3 correlation based on experiments by Marek 2005 and correction factor derived of kerosene P3T3 method)"> + <NOx_method_selector description="Select method for calculation of nitrogen oxide emission index. Selector: mode_0 (Use constant EI for different mission segments (Kossarev 2022)) / mode_1 (P3T3 correlation based on experiments by Marek 2005 and correction factor derived of kerosene P3T3 method)"> <value>mode_0</value> </NOx_method_selector> </hydrogen_combustion> @@ -81,8 +81,8 @@ <upper_boundary>1</upper_boundary> </relative_humidity> </mission_emissions> - <life_cycle_emissions_methods description="Settings for life cylce emission calculation"> - <method description="Sets method to calculate life cycle emissions ('NO': no calculation, 'SCHAFER': calculation according to K.Schäfer(2018)"> + <life_cycle_emissions_methods description="Settings for life cycle emission calculation"> + <method description="Sets method to calculate life cycle emissions ('NO': no calculation, 'SCHAEFER': calculation according to K.Schäfer(2018)"> <value>SCHAEFER</value> </method> <schaefer description="Settings for the emission calculations according to K.Schäfer(2018)"> @@ -229,14 +229,14 @@ <primary_material_recycling_switch description="Enables primary material recycling. Switch: true (primary material will be recycled) / false (no recyling)"> <value>true</value> </primary_material_recycling_switch> - <number_produced_aircraft description="Number of produced aircraft per programm"> + <number_produced_aircraft description="Number of produced aircraft per program"> <value>1500</value> <unit>1</unit> <lower_boundary>0</lower_boundary> <upper_boundary>10000</upper_boundary> </number_produced_aircraft> </production_phase> - <operating_phase description="Settings for the calculation of the opeerating phase"> + <operating_phase description="Settings for the calculation of the operating phase"> </operating_phase> <end_of_life_phase description="Settings for the calculation of the end of life phase"> <distance_to_end_of_life_site description="Distance to be flown to the demolition location"> @@ -272,12 +272,12 @@ <lower_boundary>0.67</lower_boundary> <upper_boundary>1.33</upper_boundary> </short_lived_ozone> - <methan_and_long_lived_ozone description="Variation of methan and long-live ozone forcing factor"> + <methane_and_long_lived_ozone description="Variation of methane and long-live ozone forcing factor"> <value>1</value> <unit>1</unit> <lower_boundary>0.67</lower_boundary> <upper_boundary>1.33</upper_boundary> - </methan_and_long_lived_ozone> + </methane_and_long_lived_ozone> </variations> </forcing_factors> <fuel_factor_AIC description="Set a factor to scale radiative forcing of aircraft induced cloudiness (AIC) relative to kerosene depending on fuel type. liquidHydrogen=0.3...0.8"> @@ -301,7 +301,7 @@ </dallara> </climate_model_methods> <air_quality_methods description="Settings for air quality calculation"> - <method description="Sets method for climate model('NO': no AQI calculation, 'SCHAEFR': AQI calculation according to K. Schaefer(2018))"> + <method description="Sets method for climate model('NO': no AQI calculation, 'SCHAEFER': AQI calculation according to K. Schäfer(2018))"> <value>SCHAEFER</value> </method> </air_quality_methods> diff --git a/ecological_assessment/src/ecological_assessment.cpp b/ecological_assessment/src/ecological_assessment.cpp index 91887046..bd5d419e 100644 --- a/ecological_assessment/src/ecological_assessment.cpp +++ b/ecological_assessment/src/ecological_assessment.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/ecological_assessment.h b/ecological_assessment/src/ecological_assessment.h index 119a1ef6..4cc73bce 100644 --- a/ecological_assessment/src/ecological_assessment.h +++ b/ecological_assessment/src/ecological_assessment.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/main_ecological_assessment.cpp b/ecological_assessment/src/main_ecological_assessment.cpp index 1aedd072..fbfabe3e 100644 --- a/ecological_assessment/src/main_ecological_assessment.cpp +++ b/ecological_assessment/src/main_ecological_assessment.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/ecoDatabase.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/ecoDatabase.cpp index 11cdc9eb..7f05c18e 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/ecoDatabase.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/ecoDatabase.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/ecoDatabase.h b/ecological_assessment/src/standard_strategy/emission_calculation/ecoDatabase.h index e78a189b..fd5ca4f8 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/ecoDatabase.h +++ b/ecological_assessment/src/standard_strategy/emission_calculation/ecoDatabase.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/calculateEmissions_schaefer.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/calculateEmissions_schaefer.cpp index 969eecda..16bcb1e1 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/calculateEmissions_schaefer.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/calculateEmissions_schaefer.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/calculateEmissions_schaefer.h b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/calculateEmissions_schaefer.h index 47d64cf4..24307cb6 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/calculateEmissions_schaefer.h +++ b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/calculateEmissions_schaefer.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/development.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/development.cpp index 80e4314b..6bd34b10 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/development.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/development.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/development.h b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/development.h index cd36d281..8a31df80 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/development.h +++ b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/development.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/endOfLife.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/endOfLife.cpp index f801888c..5b44ee82 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/endOfLife.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/endOfLife.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/endOfLife.h b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/endOfLife.h index 69c3f708..adf74b27 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/endOfLife.h +++ b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/endOfLife.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/operation.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/operation.cpp index 0d0e294b..22339ea5 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/operation.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/operation.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/operation.h b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/operation.h index 2e7d7715..193279cc 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/operation.h +++ b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/operation.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/production.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/production.cpp index 9971ad2b..b3749904 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/production.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/production.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/production.h b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/production.h index 62aba646..2d45190f 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/production.h +++ b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/production.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferConfig.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferConfig.cpp index de743e28..cb17538d 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferConfig.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferConfig.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferConfig.h b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferConfig.h index 59a8a840..67103954 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferConfig.h +++ b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferConfig.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferIOData.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferIOData.cpp index 8b9412eb..f53c68e5 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferIOData.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferIOData.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferIOData.h b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferIOData.h index 2affb8c0..97502f2b 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferIOData.h +++ b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferIOData.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferPlot.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferPlot.cpp index 8c69f80e..96b76ec2 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferPlot.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferPlot.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferReport.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferReport.cpp index 106de9fe..9323af58 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferReport.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/life_cycle_emissions/LCA_schaefer/schaeferReport.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/flightPath.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/flightPath.cpp index a34a8dde..867d3dfd 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/flightPath.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/flightPath.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/flightPath.h b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/flightPath.h index 30ade96d..7e978894 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/flightPath.h +++ b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/flightPath.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/hydrogen_combustion_emissions.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/hydrogen_combustion_emissions.cpp index b389dd50..abdd53a2 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/hydrogen_combustion_emissions.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/hydrogen_combustion_emissions.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/kerosene_emissions.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/kerosene_emissions.cpp index e178d419..87262647 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/kerosene_emissions.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/kerosene_emissions.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/mission.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/mission.cpp index 32940cd2..3c3b08be 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/mission.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/mission.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/mission.h b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/mission.h index 5871b86c..14748747 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/mission.h +++ b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/mission.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionConfig.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionConfig.cpp index 05853d77..43cfe479 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionConfig.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionConfig.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionConfig.h b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionConfig.h index 2d9c8586..a584cf83 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionConfig.h +++ b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionConfig.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionIOData.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionIOData.cpp index afe95535..d77c8afd 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionIOData.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionIOData.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionIOData.h b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionIOData.h index 41f7dbb1..a2ff82c6 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionIOData.h +++ b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionIOData.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionPlot.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionPlot.cpp index 72df81c1..fd072be8 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionPlot.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionPlot.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionReport.cpp b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionReport.cpp index 81036969..1e79fac3 100644 --- a/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionReport.cpp +++ b/ecological_assessment/src/standard_strategy/emission_calculation/mission_emissions/missionReport.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emissionsClass.cpp b/ecological_assessment/src/standard_strategy/emissionsClass.cpp index 9a2004d4..1d103736 100644 --- a/ecological_assessment/src/standard_strategy/emissionsClass.cpp +++ b/ecological_assessment/src/standard_strategy/emissionsClass.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/emissionsClass.h b/ecological_assessment/src/standard_strategy/emissionsClass.h index 564c1156..1c77cc12 100644 --- a/ecological_assessment/src/standard_strategy/emissionsClass.h +++ b/ecological_assessment/src/standard_strategy/emissionsClass.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQISchaeferIOData.cpp b/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQISchaeferIOData.cpp index 22e3431f..12172d54 100644 --- a/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQISchaeferIOData.cpp +++ b/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQISchaeferIOData.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQISchaeferIOData.h b/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQISchaeferIOData.h index bb3a3d95..b82a4c25 100644 --- a/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQISchaeferIOData.h +++ b/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQISchaeferIOData.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQISchaeferReport.cpp b/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQISchaeferReport.cpp index a3f02ae9..62f57b49 100644 --- a/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQISchaeferReport.cpp +++ b/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQISchaeferReport.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQI_schaefer.cpp b/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQI_schaefer.cpp index 02d643b9..b79599ba 100644 --- a/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQI_schaefer.cpp +++ b/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQI_schaefer.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQI_schaefer.h b/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQI_schaefer.h index 782dd15b..d77a581b 100644 --- a/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQI_schaefer.h +++ b/ecological_assessment/src/standard_strategy/impact_calculation/air_quality_index_schaefer/AQI_schaefer.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallara.cpp b/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallara.cpp index 4d7889dc..68e8fc7f 100644 --- a/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallara.cpp +++ b/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallara.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallara.h b/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallara.h index 3fe986ea..9f6d15d9 100644 --- a/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallara.h +++ b/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallara.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraConfig.cpp b/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraConfig.cpp index b981bd45..dcf7a1fd 100644 --- a/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraConfig.cpp +++ b/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraConfig.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -47,7 +47,7 @@ void DallaraConfig::read_all_config_data(const node& configXML) { void DallaraConfig::read_forcing_factor_config_data(const node& forcingFactor) { forcing_factor_variation_AIC = EndnodeReadOnly<double>("/variations/aircraft_induced_cloudiness").read(forcingFactor).value(); forcing_factor_variation_O3S = EndnodeReadOnly<double>("/variations/short_lived_ozone").read(forcingFactor).value(); - forcing_factor_variation_CH4O3L = EndnodeReadOnly<double>("/variations/methan_and_long_lived_ozone").read(forcingFactor).value(); + forcing_factor_variation_CH4O3L = EndnodeReadOnly<double>("/variations/methane_and_long_lived_ozone").read(forcingFactor).value(); forcing_factor_dataset = EndnodeReadOnly<std::string>("/data_set_selector").read(forcingFactor).value(); } diff --git a/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraConfig.h b/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraConfig.h index 1c862e10..2004592a 100644 --- a/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraConfig.h +++ b/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraConfig.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraIOData.cpp b/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraIOData.cpp index e1946d7d..71637646 100644 --- a/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraIOData.cpp +++ b/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraIOData.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraIOData.h b/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraIOData.h index 265fdb56..5d51a2c2 100644 --- a/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraIOData.h +++ b/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraIOData.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraPlot.cpp b/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraPlot.cpp index cb187d4d..f409af5f 100644 --- a/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraPlot.cpp +++ b/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraPlot.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraReport.cpp b/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraReport.cpp index 3dd9bb77..cceb1533 100644 --- a/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraReport.cpp +++ b/ecological_assessment/src/standard_strategy/impact_calculation/climate_model_dallara/dallaraReport.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/standard_strategy.cpp b/ecological_assessment/src/standard_strategy/standard_strategy.cpp index 4448033e..3340c208 100644 --- a/ecological_assessment/src/standard_strategy/standard_strategy.cpp +++ b/ecological_assessment/src/standard_strategy/standard_strategy.cpp @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/standard_strategy/standard_strategy.cpp.rej b/ecological_assessment/src/standard_strategy/standard_strategy.cpp.rej new file mode 100644 index 00000000..24113bde --- /dev/null +++ b/ecological_assessment/src/standard_strategy/standard_strategy.cpp.rej @@ -0,0 +1,12 @@ +diff a/ecological_assessment/src/standard_strategy/standard_strategy.cpp b/ecological_assessment/src/standard_strategy/standard_strategy.cpp (rejected hunks) +@@ -33,9 +33,7 @@ + myRuntimeInfo->out << " Method " << air_quality_method << " will be used for air quality calculation" << std::endl; + + /* Prepare ecological_assessment.xml */ +- std::string directory = rtIO->getIODir() + "/ecologicalData"; +- if (!std::filesystem::exists(directory)) std::filesystem::create_directories(directory); +- std::string filepath = directory + "/ecological_assessment_results.xml"; ++ std::string filepath = rtIO->getXmlDir() + FILESEPERATOR + TOOL_NAME + "_results.xml"; + if (fileExists(filepath)) { // Delete old calculation results of this phase + ecological_assessment_xml = aixml::openDocument(std::filesystem::path(filepath)); + node* node = ecological_assessment_xml->find("/ecological_data_file"); diff --git a/ecological_assessment/src/standard_strategy/standard_strategy.h b/ecological_assessment/src/standard_strategy/standard_strategy.h index 5ca266ff..b6c2b020 100644 --- a/ecological_assessment/src/standard_strategy/standard_strategy.h +++ b/ecological_assessment/src/standard_strategy/standard_strategy.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/src/toolinfo.h b/ecological_assessment/src/toolinfo.h index 1eddc02b..4e0bbae7 100644 --- a/ecological_assessment/src/toolinfo.h +++ b/ecological_assessment/src/toolinfo.h @@ -1,6 +1,6 @@ /* UNICADO - UNIversity Conceptual Aircraft Design and Optimization * - * Copyright (C) 2024 UNICADO consortium + * Copyright (C) 2025 UNICADO consortium * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/ecological_assessment/test/blackbox_ecological_assessment.cpp b/ecological_assessment/test/blackbox_ecological_assessment.cpp index ba84fb16..34dff4f4 100644 --- a/ecological_assessment/test/blackbox_ecological_assessment.cpp +++ b/ecological_assessment/test/blackbox_ecological_assessment.cpp @@ -1,24 +1,22 @@ -/* Copyright (C) 2024 Chair of Aircraft Design, Technical University Munich - This file is part of UNICADO. - - UNICADO is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - UNICADO is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with UNICADO. If not, see <http://www.gnu.org/licenses/>. -*/ -/** - * @file blackbox_ecological_assessment.cpp - * @brief The blackbox test for the ecological assessment module. - * @version 1.0.0 - * @date 2024-08-08 +/* UNICADO - UNIversity Conceptual Aircraft Design and Optimization + * + * Copyright (C) 2025 UNICADO consortium + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + * + * Description: + * This file is part of UNICADO. */ /* === Includes === */ -- GitLab From 968ba0cea6692a40a568d03ea1264c70715d4443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CKatrinBistreck=E2=80=9D?= <“katrin.bistreck@tuhh.de”> Date: Fri, 21 Feb 2025 17:36:56 +0100 Subject: [PATCH 2/2] removes .rej file --- .../src/standard_strategy/standard_strategy.cpp.rej | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 ecological_assessment/src/standard_strategy/standard_strategy.cpp.rej diff --git a/ecological_assessment/src/standard_strategy/standard_strategy.cpp.rej b/ecological_assessment/src/standard_strategy/standard_strategy.cpp.rej deleted file mode 100644 index 24113bde..00000000 --- a/ecological_assessment/src/standard_strategy/standard_strategy.cpp.rej +++ /dev/null @@ -1,12 +0,0 @@ -diff a/ecological_assessment/src/standard_strategy/standard_strategy.cpp b/ecological_assessment/src/standard_strategy/standard_strategy.cpp (rejected hunks) -@@ -33,9 +33,7 @@ - myRuntimeInfo->out << " Method " << air_quality_method << " will be used for air quality calculation" << std::endl; - - /* Prepare ecological_assessment.xml */ -- std::string directory = rtIO->getIODir() + "/ecologicalData"; -- if (!std::filesystem::exists(directory)) std::filesystem::create_directories(directory); -- std::string filepath = directory + "/ecological_assessment_results.xml"; -+ std::string filepath = rtIO->getXmlDir() + FILESEPERATOR + TOOL_NAME + "_results.xml"; - if (fileExists(filepath)) { // Delete old calculation results of this phase - ecological_assessment_xml = aixml::openDocument(std::filesystem::path(filepath)); - node* node = ecological_assessment_xml->find("/ecological_data_file"); -- GitLab