diff --git a/aerodynamic_analysis/aerodynamic_analysis_conf.xml b/aerodynamic_analysis/aerodynamic_analysis_conf.xml index 54606aa3a7c3e54f187cdf3adc210c89eb9f4697..327d3d1b905403025cd142d90e7ce8d834c07ad6 100644 --- a/aerodynamic_analysis/aerodynamic_analysis_conf.xml +++ b/aerodynamic_analysis/aerodynamic_analysis_conf.xml @@ -2,10 +2,10 @@ <module_configuration_file name="aerodynamic_analysis_conf.xml"> <control_settings description="General control settings for this tool"> <aircraft_exchange_file_name description="Specify the name of the exchange file"> - <value>CSMR-2020.xml</value> + <value>UNICADO-SMR-180-TF.xml</value> </aircraft_exchange_file_name> <aircraft_exchange_file_directory description="Specify the direction in which the aircraft exchange file can be found"> - <value>../projects/CSMR/CSMR-2020/</value> + <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value> </aircraft_exchange_file_directory> <own_tool_level description="Specify the tool level of this tool"> <value>3</value> diff --git a/aerodynamic_analysis/src/resources.rc b/aerodynamic_analysis/src/resources.rc index 593637b544c2b23d2d88150bba00fc9df262820a..699984dfcc8ee5136ed47b46c91bb8e62c84a5bc 100644 --- a/aerodynamic_analysis/src/resources.rc +++ b/aerodynamic_analysis/src/resources.rc @@ -11,10 +11,10 @@ VS_VERSION_INFO VERSIONINFO { BLOCK "040904b0" { - VALUE "CompanyName", "RWTH Aachen University" + VALUE "CompanyName", "UNICADO consortium" VALUE "FileDescription", TOOL_NAME VALUE "FileVersion", TOOL_VERSION - VALUE "LegalCopyright", "(C) 2008-2022 Institute of Aerospace Systems, RWTH Aachen University - All rights reserved." + VALUE "LegalCopyright", "(C) 2025 UNICADO consortium - All rights reserved." VALUE "OriginalFilename", "aerodynamic_analysis.exe" VALUE "ProductName", TOOL_NAME VALUE "ProductVersion", TOOL_VERSION diff --git a/aerodynamic_analysis/src/toolinfo.h b/aerodynamic_analysis/src/toolinfo.h index 2240e3cde3379c047e7de5a26c35b45b53902a1d..c6d2780f80be3617618f88f68361e35ccfcfa94b 100644 --- a/aerodynamic_analysis/src/toolinfo.h +++ b/aerodynamic_analysis/src/toolinfo.h @@ -20,11 +20,11 @@ * This file is part of UNICADO. */ -#ifndef CALCULATEPOLAR_SRC_TOOLINFO_H_ -#define CALCULATEPOLAR_SRC_TOOLINFO_H_ +#ifndef AERODYNAMICANALYSIS_SRC_TOOLINFO_H_ +#define AERODYNAMICANALYSIS_SRC_TOOLINFO_H_ #define TOOL_NAME "aerodynamic_analysis" -#define TOOL_VERSION "3.0.0" -#define PRODUCT_VERSION 3,0,0 +#define TOOL_VERSION "0.5.0" +#define PRODUCT_VERSION 0,5,0 -#endif // CALCULATEPOLAR_SRC_TOOLINFO_H_ +#endif // AERODYNAMICANALYSIS_SRC_TOOLINFO_H_ diff --git a/constraint_analysis/CMakeLists.txt b/constraint_analysis/CMakeLists.txt index 2007843ec2117e97d74975d37146c2a673f59bbf..e6fe31ddb52562c9ddec31da4424301484751454 100644 --- a/constraint_analysis/CMakeLists.txt +++ b/constraint_analysis/CMakeLists.txt @@ -14,6 +14,7 @@ set(MODULE_SOURCES add_executable(${MODULE_NAME} ${MODULE_SOURCES} src/main.cpp + src/resources.rc ) # Set compile options specific to this module diff --git a/constraint_analysis/constraint_analysis_conf.xml b/constraint_analysis/constraint_analysis_conf.xml index 5d9132019a9ab853c4ce25e24523cd936b5e8ee8..aadc82ef674421cafd1c3cbd2a55e1600c4674d3 100644 --- a/constraint_analysis/constraint_analysis_conf.xml +++ b/constraint_analysis/constraint_analysis_conf.xml @@ -2,10 +2,10 @@ <module_configuration_file name="constraint_analysis.xml"> <control_settings description="General control settings for this tool"> <aircraft_exchange_file_name description="Specify the name of the exchange file"> - <value>CSMR-2020.xml</value> + <value>UNICADO-SMR-180-TF.xml</value> </aircraft_exchange_file_name> <aircraft_exchange_file_directory description="Specify the direction in which the aircraft exchange file can be found"> - <value>../projects2/</value> + <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value> </aircraft_exchange_file_directory> <own_tool_level description="Specify the tool level of this tool"> <value>3</value> diff --git a/constraint_analysis/src/io/aircraft_xml.cpp b/constraint_analysis/src/io/aircraft_xml.cpp index 97e4c4b6b8f6fe7cdec8b1da9954276d28b9a864..c1018dfc8f3c2c232b94053512d3ca5456d8fe8f 100644 --- a/constraint_analysis/src/io/aircraft_xml.cpp +++ b/constraint_analysis/src/io/aircraft_xml.cpp @@ -1,19 +1,24 @@ -/* Copyright (C) 2023 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/>. -*/ +/* + * 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. + */ /** * @file aircraft_xml.cpp * @author Sebastian Oberschwendtner (sebastian.oberschwendtner@tum.de) diff --git a/constraint_analysis/src/resources.rc b/constraint_analysis/src/resources.rc new file mode 100644 index 0000000000000000000000000000000000000000..d092b0ae78cd298bbb9bb272623c01807fabb648 --- /dev/null +++ b/constraint_analysis/src/resources.rc @@ -0,0 +1,27 @@ +#include "toolinfo.h" +#ifdef _WIN32 + #include <windows.h> +#endif // _WIN32 + +VS_VERSION_INFO VERSIONINFO + FILEVERSION PRODUCT_VERSION + PRODUCTVERSION PRODUCT_VERSION +{ + BLOCK "StringFileInfo" + { + BLOCK "040904b0" + { + VALUE "CompanyName", "UNICADO consortium" + VALUE "FileDescription", TOOL_NAME + VALUE "FileVersion", TOOL_VERSION + VALUE "LegalCopyright", "(C) 2025 UNICADO consortium - All rights reserved." + VALUE "OriginalFilename", "constraint_analysis.exe" + VALUE "ProductName", TOOL_NAME + VALUE "ProductVersion", TOOL_VERSION + } + } + BLOCK "VarFileInfo" + { + VALUE "Translation", 0x409, 1200 + } +} diff --git a/constraint_analysis/src/toolinfo.h b/constraint_analysis/src/toolinfo.h index 848a94dd48020006907f0792c406295db5a934de..ed3eaf4d791d43a641d09923630c8c78efa83f53 100644 --- a/constraint_analysis/src/toolinfo.h +++ b/constraint_analysis/src/toolinfo.h @@ -24,7 +24,7 @@ #define SRC_TOOLINFO_H_ #define TOOL_NAME "constraint_analysis" -#define TOOL_VERSION "3.0.0" -#define PRODUCT_VERSION 3, 0, 0 +#define TOOL_VERSION "0.5.0" +#define PRODUCT_VERSION 0,5,0 #endif // SRC_TOOLINFO_H_ diff --git a/cost_estimation/cost_estimation_conf.xml b/cost_estimation/cost_estimation_conf.xml index 37766f7984f2feabd2a4e4c359f279bda45f12b6..16eb98773bd400968b538e4af52c4ab97cdc23bb 100644 --- a/cost_estimation/cost_estimation_conf.xml +++ b/cost_estimation/cost_estimation_conf.xml @@ -2,10 +2,10 @@ <module_configuration_file Name="Cost Estimation Runtime Configuration"> <!-- Change naming according to module name --> <control_settings description="General control settings for this tool"> <aircraft_exchange_file_name description="Specify the name of the exchange file"> - <value>CSMR-2020.xml</value> + <value>UNICADO-SMR-180-TF.xml</value> </aircraft_exchange_file_name> <aircraft_exchange_file_directory description="Specify the direction in which the aircraft exchange file can be found"> - <value>../projects/CSMR/CSMR-2020/</value> + <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value> </aircraft_exchange_file_directory> <own_tool_level description="Specify the tool level of this tool"> <value>2</value> diff --git a/create_mission_xml/create_mission_xml_conf.xml b/create_mission_xml/create_mission_xml_conf.xml index 09f8ce0a16fe88905d8df72bf0919467ec2ee472..d669c805456e152a624a13f9b6da4ed6001d4dd0 100644 --- a/create_mission_xml/create_mission_xml_conf.xml +++ b/create_mission_xml/create_mission_xml_conf.xml @@ -2,10 +2,10 @@ <module_configuration_file name="createMissionXML_conf.xml"> <control_settings description="General control settings for this tool"> <aircraft_exchange_file_name description="Specify the name of the exchange file"> - <value>CSMR-2020.xml</value> + <value>UNICADO-SMR-180-TF.xml</value> </aircraft_exchange_file_name> <aircraft_exchange_file_directory description="Specify the direction in which the aircraft exchange file can be found"> - <value>../projects/CSMR/CSMR-2020/</value> + <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value> </aircraft_exchange_file_directory> <own_tool_level description="Specify the tool level of this tool"> <value>3</value> diff --git a/create_mission_xml/src/resources.rc b/create_mission_xml/src/resources.rc index 415aa5afe9781326fffe97302c30962f9e11e9e2..38cb89a235fe1497b7093c9c799fcbae36d67be9 100644 --- a/create_mission_xml/src/resources.rc +++ b/create_mission_xml/src/resources.rc @@ -11,10 +11,10 @@ VS_VERSION_INFO VERSIONINFO { BLOCK "040904b0" { - VALUE "CompanyName", "RWTH Aachen University" + VALUE "CompanyName", "UNICADO consortium" VALUE "FileDescription", TOOL_NAME VALUE "FileVersion", TOOL_VERSION - VALUE "LegalCopyright", "(C) 2008-2022 Institute of Aerospace Systems, RWTH Aachen University - All rights reserved." + VALUE "LegalCopyright", "(C) 2025 UNICADO consortium - All rights reserved." VALUE "OriginalFilename", "create_mission_xml.exe" VALUE "ProductName", TOOL_NAME VALUE "ProductVersion", TOOL_VERSION diff --git a/create_mission_xml/src/toolinfo.h b/create_mission_xml/src/toolinfo.h index b06addbd3eaeaf95f7aad31adfdc457c3722556d..56f73de9fd71da87ae33511b5315a70ac21e3343 100644 --- a/create_mission_xml/src/toolinfo.h +++ b/create_mission_xml/src/toolinfo.h @@ -24,7 +24,7 @@ #define CREATE_MISSION_XML_SRC_TOOLINFO_H_ #define TOOL_NAME "create_mission_xml" -#define TOOL_VERSION "2.0.0" -#define PRODUCT_VERSION 2,0,0 +#define TOOL_VERSION "0.5.0" +#define PRODUCT_VERSION 0,5,0 #endif // CREATE_MISSION_XML_SRC_TOOLINFO_H_ diff --git a/ecological_assessment/ecological_assessment_conf.xml b/ecological_assessment/ecological_assessment_conf.xml index 57118786523d362b278f97995802a03c219b00f8..e6887e6cda5331c96b1e9b772ab4d14e8d20fdfc 100644 --- a/ecological_assessment/ecological_assessment_conf.xml +++ b/ecological_assessment/ecological_assessment_conf.xml @@ -2,10 +2,10 @@ <module_configuration_file name="ecological_assessment_conf.xml"> <control_settings description="General control settings for this tool"> <aircraft_exchange_file_name description="Specify the name of the exchange file"> - <value>CSMR-2020.xml</value> + <value>UNICADO-SMR-180-TF.xml</value> </aircraft_exchange_file_name> <aircraft_exchange_file_directory description="Specify the direction in which the aircraft exchange file can be found"> - <value>../projects/CSMR/CSMR-2020/</value> + <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value> </aircraft_exchange_file_directory> <own_tool_level description="Specify the tool level of this tool"> <value>3</value> diff --git a/ecological_assessment/src/resources.rc b/ecological_assessment/src/resources.rc index 90119afb1d59a8ed09643b52d041e5ac20ee7924..7ea11edf3cb7228d684401a100b494a98ac7f007 100644 --- a/ecological_assessment/src/resources.rc +++ b/ecological_assessment/src/resources.rc @@ -11,10 +11,10 @@ VS_VERSION_INFO VERSIONINFO { BLOCK "040904b0" { - VALUE "CompanyName", "RWTH Aachen University" + VALUE "CompanyName", "UNICADO consortium" VALUE "FileDescription", TOOL_NAME VALUE "FileVersion", TOOL_VERSION - VALUE "LegalCopyright", "(C) 2008-2022 Institute of Aerospace Systems, RWTH Aachen University - All rights reserved." + VALUE "LegalCopyright", "(C) 2025 UNICADO consortium - All rights reserved." VALUE "OriginalFilename", "ecological_assessment.exe" VALUE "ProductName", TOOL_NAME VALUE "ProductVersion", TOOL_VERSION diff --git a/ecological_assessment/src/toolinfo.h b/ecological_assessment/src/toolinfo.h index 4e0bbae73f806d49cfdc8ac04afc51475a52513d..3e4e9b35dbbeccc2e1b736eede81a36d0406868f 100644 --- a/ecological_assessment/src/toolinfo.h +++ b/ecological_assessment/src/toolinfo.h @@ -23,7 +23,7 @@ #define ECOLOGICAL_ASSESSMENT_SRC_TOOLINFO_H_ #define TOOL_NAME "ecological_assessment" -#define TOOL_VERSION "1.0.0" -#define PRODUCT_VERSION 1,0,0 +#define TOOL_VERSION "0.5.0" +#define PRODUCT_VERSION 0,5,0 #endif // ECOLOGICAL_ASSESSMENT_SRC_TOOLINFO_H_ diff --git a/empennage_design/CMakeLists.txt b/empennage_design/CMakeLists.txt index 61496a00d588f4bec2dc9077517f3d4e88ec6feb..f67040a50ab30dc9e78b2fb15077cb559786db26 100644 --- a/empennage_design/CMakeLists.txt +++ b/empennage_design/CMakeLists.txt @@ -52,6 +52,7 @@ set(MODULE_SOURCES add_executable(${MODULE_NAME} ${MODULE_SOURCES} src/mainEmpennageDesign.cpp + src/resources.rc ) find_package(Eigen3 3.3 REQUIRED NO_MODULE) diff --git a/empennage_design/empennage_design_conf.xml b/empennage_design/empennage_design_conf.xml index 69bd9bee8aee78fa66f79dd038439fdcc7561b62..3c46af7b57a203d6c568048f40f125104b247768 100644 --- a/empennage_design/empennage_design_conf.xml +++ b/empennage_design/empennage_design_conf.xml @@ -2,10 +2,10 @@ <module_configuration_file name="empennage_design_conf.xml"> <control_settings description="General control settings for this tool"> <aircraft_exchange_file_name description="Specify the name of the exchange file"> - <value>CSMR-2020.xml</value> + <value>UNICADO-SMR-180-TF.xml</value> </aircraft_exchange_file_name> <aircraft_exchange_file_directory description="Specify the direction in which the aircraft exchange file can be found"> - <value>../projects/CSMR/CSMR-2020/</value> + <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value> </aircraft_exchange_file_directory> <own_tool_level description="Specify the tool level of this tool"> <value>1</value> diff --git a/empennage_design/src/resources.rc b/empennage_design/src/resources.rc new file mode 100644 index 0000000000000000000000000000000000000000..1c0f7c756ce41e7e21cfe0724edc8445723dbe76 --- /dev/null +++ b/empennage_design/src/resources.rc @@ -0,0 +1,27 @@ +#include "toolinfo.h" +#ifdef _WIN32 + #include <windows.h> +#endif // _WIN32 + +VS_VERSION_INFO VERSIONINFO + FILEVERSION PRODUCT_VERSION + PRODUCTVERSION PRODUCT_VERSION +{ + BLOCK "StringFileInfo" + { + BLOCK "040904b0" + { + VALUE "CompanyName", "UNICADO consortium" + VALUE "FileDescription", TOOL_NAME + VALUE "FileVersion", TOOL_VERSION + VALUE "LegalCopyright", "(C) 2025 UNICADO consortium - All rights reserved." + VALUE "OriginalFilename", "empennage_design.exe" + VALUE "ProductName", TOOL_NAME + VALUE "ProductVersion", TOOL_VERSION + } + } + BLOCK "VarFileInfo" + { + VALUE "Translation", 0x409, 1200 + } +} diff --git a/empennage_design/src/toolinfo.h b/empennage_design/src/toolinfo.h index a22085f876ef1162dd1d34c7e4745ffde6848738..c4ccad079b0398da3671d331751ddf020819cb54 100644 --- a/empennage_design/src/toolinfo.h +++ b/empennage_design/src/toolinfo.h @@ -24,7 +24,7 @@ #define EMPENNAGEDESIGN_SRC_TOOLINFO_H_ #define TOOL_NAME "empennage_design" -#define TOOL_VERSION "3.0.0" -#define PRODUCT_VERSION 3,0,0 +#define TOOL_VERSION "0.5.0" +#define PRODUCT_VERSION 0,5,0 #endif // EMPENNAGEDESIGN_SRC_TOOLINFO_H_ diff --git a/fuselage_design/fuselage_design_conf.xml b/fuselage_design/fuselage_design_conf.xml index 819ec54359de1fad75ae2a3093a7787f98eafba4..d8763b9288640e853ed3cafab94306371dbb15ee 100644 --- a/fuselage_design/fuselage_design_conf.xml +++ b/fuselage_design/fuselage_design_conf.xml @@ -2,10 +2,10 @@ <module_configuration_file Name="Fuselage Design Runtime Configuration."> <control_settings description="General control settings for this tool"> <aircraft_exchange_file_name description="Specify the name of the exchange file"> - <value>csmr-2020.xml</value> + <value>UNICADO-SMR-180-TF.xml</value> </aircraft_exchange_file_name> <aircraft_exchange_file_directory description="Specify the direction in which the aircraft exchange file can be found"> - <value>../projects/csmr/csmr-2020</value> + <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value> </aircraft_exchange_file_directory> <own_tool_level description="Specify the tool level of this tool"> <value>1</value> diff --git a/initial_sizing/initial_sizing_conf.xml b/initial_sizing/initial_sizing_conf.xml index a24e1993b985e45358b4d04aa2042734ef6fcb5d..46c0485d8c204f9ae420e6e22b76ef67e64dd014 100644 --- a/initial_sizing/initial_sizing_conf.xml +++ b/initial_sizing/initial_sizing_conf.xml @@ -2,10 +2,10 @@ <module_configuration_file name="initial_sizing_conf.xml"> <control_settings description="General control settings for this tool"> <aircraft_exchange_file_name description="Specify the name of the exchange file"> - <value>CSMR-2020.xml</value> + <value>UNICADO-SMR-180-TF.xml</value> </aircraft_exchange_file_name> <aircraft_exchange_file_directory description="Specify the direction in which the aircraft exchange file can be found"> - <value>../projects/CSMR/CSMR-2020/</value> + <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value> </aircraft_exchange_file_directory> <own_tool_level description="Specify the tool level of this tool"> <value>1</value> diff --git a/initial_sizing/src/resources.rc b/initial_sizing/src/resources.rc index 2ea6f70a361a06a41db6afa3191379f0e349d691..b16dae3b23d8ac1e87203052c4a4c6041370e316 100644 --- a/initial_sizing/src/resources.rc +++ b/initial_sizing/src/resources.rc @@ -11,10 +11,10 @@ VS_VERSION_INFO VERSIONINFO { BLOCK "040904b0" { - VALUE "CompanyName", "RWTH Aachen University" + VALUE "CompanyName", "UNICADO consortium" VALUE "FileDescription", TOOL_NAME VALUE "FileVersion", TOOL_VERSION - VALUE "LegalCopyright", "(C) 2008-2022 Institute of Aerospace Systems, RWTH Aachen University - All rights reserved." + VALUE "LegalCopyright", "(C) 2025 UNICADO consortium - All rights reserved." VALUE "OriginalFilename", "initial_sizing.exe" VALUE "ProductName", TOOL_NAME VALUE "ProductVersion", TOOL_VERSION diff --git a/initial_sizing/src/toolinfo.h b/initial_sizing/src/toolinfo.h index 38e726ace6631ccbb7e6defc79c45fe48ca17901..c4bd5ba3d89b2f336736e989e5160b6a92a0843d 100644 --- a/initial_sizing/src/toolinfo.h +++ b/initial_sizing/src/toolinfo.h @@ -24,7 +24,7 @@ #define INITIALSIZING_SRC_TOOLINFO_H_ #define TOOL_NAME "initial_sizing" -#define TOOL_VERSION "3.0.0" -#define PRODUCT_VERSION 3,0,0 +#define TOOL_VERSION "0.5.0" +#define PRODUCT_VERSION 0,5,0 #endif // INITIALSIZING_SRC_TOOLINFO_H_ diff --git a/landing_gear_design/landing_gear_design.py b/landing_gear_design/landing_gear_design.py index f3a50e4cb5535d2a96315322a5c051852a8e42ea..a4348ba8d8991cf49ab89554cd8dd602802ce3f6 100644 --- a/landing_gear_design/landing_gear_design.py +++ b/landing_gear_design/landing_gear_design.py @@ -51,12 +51,13 @@ def main(): # Initialize exception string and runtime output logger. tool_name = 'landing gear design' + tool_version = '0.5.0' runtime_output = logging.getLogger('module_logger') try: """Preprocessing: Acquire necessary data and paths.""" # Run 'data_preprocessing' function from 'datapreprocessing.py'. - paths_and_names, routing_dict, runtime_output = data_preprocessing('landing_gear_design_conf.xml', argv) + paths_and_names, routing_dict, runtime_output = data_preprocessing('landing_gear_design_conf.xml', tool_version, argv) runtime_output.print('Landing gear design started...') """Run: Execute code depending on method layers.""" diff --git a/landing_gear_design/landing_gear_design_conf.xml b/landing_gear_design/landing_gear_design_conf.xml index b977c19a8435f96bc446425f6d06837920333fbf..aee8566e33c151933a1c005e5e1963f872842106 100644 --- a/landing_gear_design/landing_gear_design_conf.xml +++ b/landing_gear_design/landing_gear_design_conf.xml @@ -2,10 +2,10 @@ <module_configuration_file Name="Landing Gear Design Runtime Configuration"> <!-- Change naming according to module name --> <control_settings description="General control settings for this tool"> <aircraft_exchange_file_name description="Specify the name of the exchange file"> - <value>CSMR-2020.xml</value> + <value>UNICADO-SMR-180-TF.xml</value> </aircraft_exchange_file_name> <aircraft_exchange_file_directory description="Specify the direction in which the aircraft exchange file can be found"> - <value>../projects/CSMR/CSMR-2020/</value> + <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value> </aircraft_exchange_file_directory> <own_tool_level description="Specify the tool level of this tool"> <value>3</value> diff --git a/landing_gear_design/src/datapreprocessing.py b/landing_gear_design/src/datapreprocessing.py index 805a72aa2f4f5e55072f0a98d2d54d41ab43617e..a856648ef8735b1c4f1095763f08fce51e9bcaea 100644 --- a/landing_gear_design/src/datapreprocessing.py +++ b/landing_gear_design/src/datapreprocessing.py @@ -29,7 +29,7 @@ from datapreprocessingmodule import get_paths_and_names from datapreprocessingmodule import read_routing_values_from_xml -def data_preprocessing(module_configuration_file, argv): +def data_preprocessing(module_configuration_file, tool_version, argv): """Conduct data preprocessing. This function provides data preprocessing functionalities. It sets up the necessary data and imports @@ -60,6 +60,7 @@ def data_preprocessing(module_configuration_file, argv): """Get paths, names, and xml trees for module configuration and aircraft exchange file.""" # Call 'get_paths_and_names' function to obtain various paths and names. paths_and_names, runtime_output = get_paths_and_names(module_configuration_file, argv) + paths_and_names['tool_version'] = tool_version # Note: It is the exclusive responsibility of the module manager to modify the following information! # Create layer description dictionary according to the number of individual layers. The dictionary associates # layers with their respective XML paths and expected data types according to the following scheme: diff --git a/landing_gear_design/src/wing_mounted/empirical/landing_gear_design_tu_berlin/general/call_functions/_00_estimatepositions.py b/landing_gear_design/src/wing_mounted/empirical/landing_gear_design_tu_berlin/general/call_functions/_00_estimatepositions.py index 38fad55dfcc32e3eb936dc0ea0292e871e6f74ae..de31e4dc3125e5cdbfb8a5843de961dbf363ac94 100644 --- a/landing_gear_design/src/wing_mounted/empirical/landing_gear_design_tu_berlin/general/call_functions/_00_estimatepositions.py +++ b/landing_gear_design/src/wing_mounted/empirical/landing_gear_design_tu_berlin/general/call_functions/_00_estimatepositions.py @@ -87,10 +87,8 @@ def estimate_positions(dict_ac_exchange, dict_mod_config, landing_gear_descripti not ('main_gear_x_position' in landing_gear_positions): _, landing_gear_position_value = \ next(reversed(list(dict_ac_exchange['landing_gear_positions_in_x_direction'].items())), (None, None)) - _, wing_reference_point_value = \ - next(reversed(list(dict_ac_exchange['wing_section_position_in_x'].items())), (None, None)) - _, wing_chord_length_value = \ - next(reversed(list(dict_ac_exchange['wing_chord_length_on_section'].items())), (None, None)) + wing_reference_point_value = next(iter(dict_ac_exchange['wing_section_position_in_x'].values())) + wing_chord_length_value = next(iter(dict_ac_exchange['wing_chord_length_on_section'].values())) # Check if the main gear position and the wing center reference point # and the o most aft CoG position in x direction are None. # -> if true: -> Check which kind of fuselage type is selected and set type specific start values. diff --git a/landing_gear_design/src/wing_mounted/empirical/landing_gear_design_tu_berlin/general/call_functions/_02_estimateloads.py b/landing_gear_design/src/wing_mounted/empirical/landing_gear_design_tu_berlin/general/call_functions/_02_estimateloads.py index 2890d7bcb1c4607f481a7026969064243b5683e3..eade1cfcc142350b23473a7883fdbba86ef68df5 100644 --- a/landing_gear_design/src/wing_mounted/empirical/landing_gear_design_tu_berlin/general/call_functions/_02_estimateloads.py +++ b/landing_gear_design/src/wing_mounted/empirical/landing_gear_design_tu_berlin/general/call_functions/_02_estimateloads.py @@ -54,7 +54,7 @@ def estimate_loads(dict_ac_exchange, dict_mod_config, landing_gear_description, # set maximum aft position of nose landing gear if not ('landing_gear_limitations' in landing_gear_description) \ and not ('maximum_aft_position_of_nose_gear' in landing_gear_limitations): - landing_gear_limitations['maximum_aft_position_of_nose_gear'] = 6.5 + landing_gear_limitations['maximum_aft_position_of_nose_gear'] = 7.5 else: landing_gear_limitations['maximum_aft_position_of_nose_gear'] = \ landing_gear_description['landing_gear_limitations']['maximum_aft_position_of_nose_gear'] @@ -62,7 +62,7 @@ def estimate_loads(dict_ac_exchange, dict_mod_config, landing_gear_description, # set minimum foremost position of nose landing gear if not ('landing_gear_limitations' in landing_gear_description) \ and not ('minimum_forward_position_of_nose_gear' in landing_gear_limitations): - landing_gear_limitations['minimum_forward_position_of_nose_gear'] = 4.5 + landing_gear_limitations['minimum_forward_position_of_nose_gear'] = 4.0 else: landing_gear_limitations['minimum_forward_position_of_nose_gear'] = \ landing_gear_description['landing_gear_limitations']['minimum_forward_position_of_nose_gear'] @@ -168,7 +168,7 @@ def estimate_loads(dict_ac_exchange, dict_mod_config, landing_gear_description, # -> if true: -> Move the x-position of the nose landing gear forward by 0.05 meter. if percentage_of_nose_gear_minimum_load > 6 \ and landing_gear_description['landing_gear_positions']['nose_gear_x_position'] \ - > landing_gear_limitations['minimum_forward_position_of_nose_gear']: + >= landing_gear_limitations['minimum_forward_position_of_nose_gear']: landing_gear_description['landing_gear_positions']['nose_gear_x_position'] -= 0.05 # Else condition: Most forward x-position of nose gear is reached. -> No further movement possible. else: @@ -193,7 +193,7 @@ def estimate_loads(dict_ac_exchange, dict_mod_config, landing_gear_description, # -> if true: -> Move the x-position of the nose landing gear backward by 0.05 meter. if percentage_of_nose_gear_minimum_load < 20 \ and landing_gear_description['landing_gear_positions']['nose_gear_x_position'] \ - < landing_gear_limitations['maximum_aft_position_of_nose_gear']: + <= landing_gear_limitations['maximum_aft_position_of_nose_gear']: landing_gear_description['landing_gear_positions']['nose_gear_x_position'] += 0.05 # Else condition: Most backward x-position of nose gear is reached. -> No further movement possible. else: @@ -203,7 +203,7 @@ def estimate_loads(dict_ac_exchange, dict_mod_config, landing_gear_description, # -> if true: -> Raise an error and abort program. if maximum_nose_gear_position_reached: runtime_output.critical( - 'Error: The maximum nose gear position is reached but the minimum allowed percentage of ' + 'Error: The maximum aft nose gear position is reached but the minimum allowed percentage of ' 'the nose gear load is greater lower than 6 \n ' ' Load estimation for landing gear ' 'design not possible. Program aborted!') diff --git a/landing_gear_design/src/wing_mounted/empirical/landing_gear_design_tu_berlin/general/methodhtmlreport.py b/landing_gear_design/src/wing_mounted/empirical/landing_gear_design_tu_berlin/general/methodhtmlreport.py index 650f944b78b4186d220753267bfce4d56f0fcedf..6aeb54743d7364b3e166db99b12a36c87dadc39c 100644 --- a/landing_gear_design/src/wing_mounted/empirical/landing_gear_design_tu_berlin/general/methodhtmlreport.py +++ b/landing_gear_design/src/wing_mounted/empirical/landing_gear_design_tu_berlin/general/methodhtmlreport.py @@ -40,6 +40,7 @@ def method_html_report(paths_and_names, routing_dict, data_dict, method_specific """ Preparation and data extraction.""" # Extract tool and project name. tool_name = paths_and_names['tool_name'] + tool_version = paths_and_names['tool_version'] report_title = (tool_name.replace('_', ' ')).capitalize() project_name = paths_and_names['name_of_project'] root_of_module_config_tree = paths_and_names['root_of_module_config_tree'] @@ -230,8 +231,13 @@ def method_html_report(paths_and_names, routing_dict, data_dict, method_specific with tag('div', klass="content"): with tag('h1'): text(f"Report - {report_title} of {project_name}") + with tag('br'): # Line break for formatting + pass + with tag('span'): + with tag('font', size="2"): + text(f"All outputs of the program '{tool_name}' were created with version {tool_version}") + with tag('div', klass="container"): - # Data on the left side. with tag('div', klass="box data"): @@ -394,7 +400,6 @@ def generate_report_header(doc, tool_name): doc.stag('meta', name="viewport", content="width=device-width, initial-scale=1.0") doc.stag('meta', charset="UTF-8") with doc.tag('title'): - doc.text(tool_name) + doc.text(tool_name) doc.stag('link', rel="stylesheet", href="style.css") - return diff --git a/libs b/libs index 89f0b30f7835b7be4b8edef43d9eb2c1764cb6d0..e54c7d79b2c56699fac9fcaf807fa89d6cf90a1e 160000 --- a/libs +++ b/libs @@ -1 +1 @@ -Subproject commit 89f0b30f7835b7be4b8edef43d9eb2c1764cb6d0 +Subproject commit e54c7d79b2c56699fac9fcaf807fa89d6cf90a1e diff --git a/mission_analysis/mission_analysis_conf.xml b/mission_analysis/mission_analysis_conf.xml index 0fcc0bdbdba0a3943b4013f6e6281871eaaf6055..3df8a7eaeadda1e409a381560456abd47b9d71b2 100644 --- a/mission_analysis/mission_analysis_conf.xml +++ b/mission_analysis/mission_analysis_conf.xml @@ -2,10 +2,10 @@ <module_configuration_file name="mission_analysis_conf.xml"> <control_settings description="General control settings for this tool"> <aircraft_exchange_file_name description="Specify the name of the exchange file"> - <value>CSMR-2020.xml</value> + <value>UNICADO-SMR-180-TF.xml</value> </aircraft_exchange_file_name> <aircraft_exchange_file_directory description="Specify the direction in which the aircraft exchange file can be found"> - <value>../projects/CSMR/CSMR-2020/</value> + <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value> </aircraft_exchange_file_directory> <own_tool_level description="Specify the tool level of this tool"> <value>3</value> diff --git a/mission_analysis/src/resources.rc b/mission_analysis/src/resources.rc index 6167b32d62a0280846ba4e966a6d49d055d6b263..2546901c36ad03ca862f8901b603987bf30857f0 100644 --- a/mission_analysis/src/resources.rc +++ b/mission_analysis/src/resources.rc @@ -11,10 +11,10 @@ VS_VERSION_INFO VERSIONINFO { BLOCK "040904b0" { - VALUE "CompanyName", "RWTH Aachen University" + VALUE "CompanyName", "UNICADO consortium" VALUE "FileDescription", TOOL_NAME VALUE "FileVersion", TOOL_VERSION - VALUE "LegalCopyright", "(C) 2008-2022 Institute of Aerospace Systems, RWTH Aachen University - All rights reserved." + VALUE "LegalCopyright", "(C) 2025 UNICADO consortium - All rights reserved." VALUE "OriginalFilename", "mission_analysis.exe" VALUE "ProductName", TOOL_NAME VALUE "ProductVersion", TOOL_VERSION diff --git a/mission_analysis/src/toolinfo.h b/mission_analysis/src/toolinfo.h index 3484e7dfa75bcdb516a0380822c3402950e75b2e..093be18d58b1ce4153b7dad8d262063051b1dfbb 100644 --- a/mission_analysis/src/toolinfo.h +++ b/mission_analysis/src/toolinfo.h @@ -24,7 +24,7 @@ #define MISSION_ANALYSIS_SRC_TOOLINFO_H_ #define TOOL_NAME "mission_analysis" -#define TOOL_VERSION "2.0.0" -#define PRODUCT_VERSION 2,0,0 +#define TOOL_VERSION "0.5.0" +#define PRODUCT_VERSION 0,5,0 #endif // MISSION_ANALYSIS_SRC_TOOLINFO_H_ diff --git a/performance_assessment/performance_assessment_conf.xml b/performance_assessment/performance_assessment_conf.xml index d47c2fc1efbb50a465bf3e6e7a264d86ca2ed2b5..1bb0d0e4c1e4e19fc1513a75dbc908240ec92550 100644 --- a/performance_assessment/performance_assessment_conf.xml +++ b/performance_assessment/performance_assessment_conf.xml @@ -1,10 +1,10 @@ <module_configuration_file Name="performance_assessment_conf.xml"> <control_settings description="General control settings for this tool"> <aircraft_exchange_file_name description="Specify the name of the exchange file"> - <value>CSMR-2020.xml</value> + <value>UNICADO-SMR-180-TF.xml</value> </aircraft_exchange_file_name> <aircraft_exchange_file_directory description="Specify the direction in which the aircraft exchange file can be found"> - <value>../projects/CSMR/CSMR-2020/</value> + <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value> </aircraft_exchange_file_directory> <own_tool_level description="Specify the tool level of this tool"> <value>2</value> diff --git a/performance_assessment/src/resources.rc b/performance_assessment/src/resources.rc index b238335474ab44e75cd377e45918cbe0073f960c..4feebd308493df10cd03489138e56c7639826489 100644 --- a/performance_assessment/src/resources.rc +++ b/performance_assessment/src/resources.rc @@ -11,10 +11,10 @@ VS_VERSION_INFO VERSIONINFO { BLOCK "040904b0" { - VALUE "CompanyName", "RWTH Aachen University" + VALUE "CompanyName", "UNICADO consortium" VALUE "FileDescription", TOOL_NAME VALUE "FileVersion", TOOL_VERSION - VALUE "LegalCopyright", "(C) 2008-2022 Institute of Aerospace Systems, RWTH Aachen University - All rights reserved." + VALUE "LegalCopyright", "(C) 2025 UNICADO consortium - All rights reserved." VALUE "OriginalFilename", "calculatePerformance.exe" VALUE "ProductName", TOOL_NAME VALUE "ProductVersion", TOOL_VERSION diff --git a/performance_assessment/src/toolinfo.h b/performance_assessment/src/toolinfo.h index 9ea7a76d4a2880d1ff9a55e161d1900f2b694195..5f1394116ec72ce5c40ff31a52bf3526771874db 100644 --- a/performance_assessment/src/toolinfo.h +++ b/performance_assessment/src/toolinfo.h @@ -23,7 +23,7 @@ #define PERFORMANCE_ASSESSMENT_SRC_TOOLINFO_H_ #define TOOL_NAME "performance_assessment" -#define TOOL_VERSION "2.0.0" -#define PRODUCT_VERSION 2,0,0 +#define TOOL_VERSION "0.5.0" +#define PRODUCT_VERSION 0,5,0 #endif // PERFORMANCE_ASSESSMENT_SRC_TOOLINFO_H_ diff --git a/propulsion_design/propulsion_design_conf.xml b/propulsion_design/propulsion_design_conf.xml index 776f3ce2ab342d9c144c8454bb0c59664d02b4f0..82ac2cd4c41ccaabfef603dba8dcc6bd71e7863d 100644 --- a/propulsion_design/propulsion_design_conf.xml +++ b/propulsion_design/propulsion_design_conf.xml @@ -2,10 +2,10 @@ <module_configuration_file name="propulsion_design_conf.xml"> <control_settings description="General control settings for this tool"> <aircraft_exchange_file_name description="Specify the name of the exchange file"> - <value>CSMR-2020.xml</value> + <value>UNICADO-SMR-180-TF.xml</value> </aircraft_exchange_file_name> <aircraft_exchange_file_directory description="Specify the direction in which the aircraft exchange file can be found"> - <value>../projects/CSMR/CSMR-2020/</value> + <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value> </aircraft_exchange_file_directory> <own_tool_level description="Specify the tool level of this tool"> <value>3</value> diff --git a/propulsion_design/src/resources.rc b/propulsion_design/src/resources.rc index bf648243827fdb1c17fe2afd74aec52e16bbfb6b..01c7e6f9dc0fd4949db81854d9b4f4f94d1d602c 100644 --- a/propulsion_design/src/resources.rc +++ b/propulsion_design/src/resources.rc @@ -11,10 +11,10 @@ VS_VERSION_INFO VERSIONINFO { BLOCK "040904b0" { - VALUE "CompanyName", "Technical University Munich" + VALUE "CompanyName", "UNICADO consortium" VALUE "FileDescription", TOOL_NAME VALUE "FileVersion", TOOL_VERSION - VALUE "LegalCopyright", "(C) 2023 Chair of Aircraft Design, Technical University Munich" + VALUE "LegalCopyright", "(C) 2025 UNICADO consortium - All rights reserved." VALUE "OriginalFilename", "propulsion_design.exe" VALUE "ProductName", TOOL_NAME VALUE "ProductVersion", TOOL_VERSION diff --git a/propulsion_design/src/toolinfo.h b/propulsion_design/src/toolinfo.h index 4dbbe51ad1dbc2c5d49acaff8d75a77edb4c1f16..0f5f1a62358b22d6f57adfb49d73957fec0e9b0c 100644 --- a/propulsion_design/src/toolinfo.h +++ b/propulsion_design/src/toolinfo.h @@ -24,7 +24,7 @@ #define SRC_TOOLINFO_H_ #define TOOL_NAME "propulsion_design" -#define TOOL_VERSION "3.0.0" -#define PRODUCT_VERSION 3, 0, 0 +#define TOOL_VERSION "0.5.0" +#define PRODUCT_VERSION 0,5,0 #endif // SRC_TOOLINFO_H_ diff --git a/systems_design/src/resources.rc b/systems_design/src/resources.rc index 1068a5b1891a17ffd2c322db31c1b9ad0b3bf779..1a5716ef0f04ce98c47ea5ae103b4a753d8356b7 100644 --- a/systems_design/src/resources.rc +++ b/systems_design/src/resources.rc @@ -11,10 +11,10 @@ VS_VERSION_INFO VERSIONINFO { BLOCK "040904b0" { - VALUE "CompanyName", "RWTH Aachen University" + VALUE "CompanyName", "UNICADO consortium" VALUE "FileDescription", TOOL_NAME VALUE "FileVersion", TOOL_VERSION - VALUE "LegalCopyright", "(C) 2008-2022 Institute of Aerospace Systems, RWTH Aachen University - All rights reserved." + VALUE "LegalCopyright", "(C) 2025 UNICADO consortium - All rights reserved." VALUE "OriginalFilename", "systems_design.exe" VALUE "ProductName", TOOL_NAME VALUE "ProductVersion", TOOL_VERSION diff --git a/systems_design/src/toolinfo.h b/systems_design/src/toolinfo.h index b5250908953ad921b5aa7335446ecf6fedcaaeaa..d0a5dd241f2d877487e7ed7c136745cf62860510 100644 --- a/systems_design/src/toolinfo.h +++ b/systems_design/src/toolinfo.h @@ -24,7 +24,7 @@ #define SYSTEMS_DESIGN_SRC_TOOLINFO_H_ #define TOOL_NAME "systems_design" -#define TOOL_VERSION "3.0.0" -#define PRODUCT_VERSION 3, 0, 0 +#define TOOL_VERSION "0.5.0" +#define PRODUCT_VERSION 0,5,0 #endif // SYSTEMS_DESIGN_SRC_TOOLINFO_H_ diff --git a/systems_design/systems_design_conf.xml b/systems_design/systems_design_conf.xml index b730358c38ee533f371ed8c7ce109846da16d466..0705df486b3d3318c62c09c9f2a6df4274340b5a 100644 --- a/systems_design/systems_design_conf.xml +++ b/systems_design/systems_design_conf.xml @@ -2,10 +2,10 @@ <module_configuration_file name="systems_design_conf.xml"> <control_settings description="General control settings for this tool"> <aircraft_exchange_file_name description="Specify the name of the exchange file"> - <value>CSMR-2020.xml</value> + <value>UNICADO-SMR-180-TF.xml</value> </aircraft_exchange_file_name> <aircraft_exchange_file_directory description="Specify the direction in which the aircraft exchange file can be found"> - <value>..\projects\</value> + <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value> </aircraft_exchange_file_directory> <own_tool_level description="Specify the tool level of this tool"> <value>1</value> diff --git a/tank_design/tank_design_conf.xml b/tank_design/tank_design_conf.xml index 65abc7117a589d6f6ec29694260efab50910beb3..05d58fc9f93b184262b90ab8242eecfa9268afa0 100644 --- a/tank_design/tank_design_conf.xml +++ b/tank_design/tank_design_conf.xml @@ -2,10 +2,10 @@ <module_configuration_file Name="Tank Design Runtime Configuration"> <control_settings description="General control settings for this tool"> <aircraft_exchange_file_name description="Specify the name of the exchange file"> - <value>CSMR-2020.xml</value> + <value>UNICADO-SMR-180-TF.xml</value> </aircraft_exchange_file_name> <aircraft_exchange_file_directory description="Specify the direction in which the aircraft exchange file can be found"> - <value>../projects/CSMR/CSMR-2020/</value> + <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value> </aircraft_exchange_file_directory> <own_tool_level description="Specify the tool level of this tool"> <value>2</value> diff --git a/weight_and_balance_analysis/weight_and_balance_analysis_conf.xml b/weight_and_balance_analysis/weight_and_balance_analysis_conf.xml index c6456ef7ca6f677c3019a673eaecf5d94f63a7f6..e2f463e9a29a94e5a4d0fb5b41cea4747b74525b 100644 --- a/weight_and_balance_analysis/weight_and_balance_analysis_conf.xml +++ b/weight_and_balance_analysis/weight_and_balance_analysis_conf.xml @@ -2,10 +2,10 @@ <module_configuration_file Name="weight_and_balance_analysis_conf.xml"> <control_settings description="General control settings for this tool"> <aircraft_exchange_file_name description="Specify the name of the exchange file"> - <value>CSMR-2020.xml</value> + <value>UNICADO-SMR-180-TF.xml</value> </aircraft_exchange_file_name> <aircraft_exchange_file_directory description="Specify the direction in which the aircraft exchange file can be found"> - <value>../projects/CSMR/CSMR-2020/</value> + <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value> </aircraft_exchange_file_directory> <own_tool_level description="Specify the tool level of this tool"> <value>3</value> diff --git a/wing_design/CMakeLists.txt b/wing_design/CMakeLists.txt index 3179e5a643bc1d2211ab7fdb9d9630b8c09a69b2..b55af78b4419158eb283ce463684973ec8785852 100644 --- a/wing_design/CMakeLists.txt +++ b/wing_design/CMakeLists.txt @@ -47,6 +47,7 @@ set(MODULE_SOURCES add_executable(${MODULE_NAME} ${MODULE_SOURCES} src/mainWingDesign.cpp + src/resources.rc ) find_package(Eigen3 3.3 REQUIRED NO_MODULE) diff --git a/wing_design/src/resources.rc b/wing_design/src/resources.rc new file mode 100644 index 0000000000000000000000000000000000000000..4a1c00a2634c47052f3d1c49884194d614e9ea23 --- /dev/null +++ b/wing_design/src/resources.rc @@ -0,0 +1,27 @@ +#include "toolinfo.h" +#ifdef _WIN32 + #include <windows.h> +#endif // _WIN32 + +VS_VERSION_INFO VERSIONINFO + FILEVERSION PRODUCT_VERSION + PRODUCTVERSION PRODUCT_VERSION +{ + BLOCK "StringFileInfo" + { + BLOCK "040904b0" + { + VALUE "CompanyName", "UNICADO consortium" + VALUE "FileDescription", TOOL_NAME + VALUE "FileVersion", TOOL_VERSION + VALUE "LegalCopyright", "(C) 2025 UNICADO consortium - All rights reserved." + VALUE "OriginalFilename", "wing_design.exe" + VALUE "ProductName", TOOL_NAME + VALUE "ProductVersion", TOOL_VERSION + } + } + BLOCK "VarFileInfo" + { + VALUE "Translation", 0x409, 1200 + } +} diff --git a/wing_design/src/toolinfo.h b/wing_design/src/toolinfo.h index d46fcd2b4d7b2f964aae71d0187b190e77b3f587..3fe0709aac701eecf0569e45809cc3e8b206ba79 100644 --- a/wing_design/src/toolinfo.h +++ b/wing_design/src/toolinfo.h @@ -20,11 +20,11 @@ * This file is part of UNICADO. */ -#ifndef WINGDESIGN_SRC_TOOLINFO_H_ -#define WINGDESIGN_SRC_TOOLINFO_H_ +#ifndef WING_DESIGN_SRC_TOOLINFO_H_ +#define WING_DESIGN_SRC_TOOLINFO_H_ #define TOOL_NAME "wing_design" -#define TOOL_VERSION "3.0.0" -#define PRODUCT_VERSION 3, 0, 0 +#define TOOL_VERSION "0.5.0" +#define PRODUCT_VERSION 0,5,0 -#endif // WINGDESIGN_SRC_TOOLINFO_H_ \ No newline at end of file +#endif // WING_DESIGN_SRC_TOOLINFO_H_ diff --git a/wing_design/wing_design_conf.xml b/wing_design/wing_design_conf.xml index 0b48a4885fb32394ac68fe6679a21bebf8bf86b1..480d1dad4c7694018f612950025900b4da33c486 100644 --- a/wing_design/wing_design_conf.xml +++ b/wing_design/wing_design_conf.xml @@ -2,10 +2,10 @@ <module_configuration_file name="wing_design_conf.xml"> <control_settings description="General control settings for this tool"> <aircraft_exchange_file_name description="Specify the name of the exchange file"> - <value>CSMR-2020.xml</value> + <value>UNICADO-SMR-180-TF.xml</value> </aircraft_exchange_file_name> <aircraft_exchange_file_directory description="Specify the direction in which the aircraft exchange file can be found"> - <value>../projects/CSMR/CSMR-2020/</value> + <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value> </aircraft_exchange_file_directory> <own_tool_level description="Specify the tool level of this tool"> <value>1</value>