diff --git a/weight_and_balance_analysis/src/datapostprocessing.py b/weight_and_balance_analysis/src/datapostprocessing.py
index fab2d9acccfe8318bb1672c87108e62188130cab..ec3012eddda67ba309052f6fede10d164e62796e 100644
--- a/weight_and_balance_analysis/src/datapostprocessing.py
+++ b/weight_and_balance_analysis/src/datapostprocessing.py
@@ -53,16 +53,16 @@ def data_postprocessing(paths_and_names, routing_dict, data_dict, runtime_output
if switch == "study_mode":
paths_to_key_parameters_list = [
- './analysis/masses_cg_inertia/study_mission/study_cg_shift/cg_point[@ID="0"]/center_of_gravity',
- './analysis/masses_cg_inertia/study_mission/study_cg_shift/cg_point[@ID="0"]/total_mass']
+ './analysis/masses_cg_inertia/study_mission/cg_shift/cg_point[@ID="0"]/center_of_gravity',
+ './analysis/masses_cg_inertia/study_mission/cg_shift/cg_point[@ID="0"]/total_mass']
paths_to_key_parameters_list.extend(
MassPropertiesIO().key_parameters_paths_mission(switch, "most_forward_mass"))
paths_to_key_parameters_list.extend(
MassPropertiesIO().key_parameters_paths_mission(switch, "most_afterward_mass"))
paths_to_key_parameters_list.extend(
- MassPropertiesIO().key_parameters_paths_mission(switch, "study_mass"))
+ MassPropertiesIO().key_parameters_paths_mission(switch, "takeoff_mass"))
paths_to_key_parameters_list.extend(
- MassPropertiesIO().key_parameters_paths_mission(switch, "study_fuel_mass"))
+ MassPropertiesIO().key_parameters_paths_mission(switch, "fuel_mass"))
child_key_parameters_dict = {}
child_key_parameters_dict.update(
@@ -70,21 +70,21 @@ def data_postprocessing(paths_and_names, routing_dict, data_dict, runtime_output
child_key_parameters_dict.update(
MassPropertiesIO().key_parameters_dicts("most_afterward_mass", "Mass at the most aft CG position."))
child_key_parameters_dict.update(
- MassPropertiesIO().key_parameters_dicts("study_mass", "Mass of the aircraft at takeoff."))
+ MassPropertiesIO().key_parameters_dicts("takeoff_mass", "Mass of the aircraft at takeoff."))
child_key_parameters_dict.update(
- MassPropertiesIO().key_parameters_dicts("study_fuel_mass", "Mass of the fuel at takeoff."))
+ MassPropertiesIO().key_parameters_dicts("fuel_mass", "Mass of the fuel at takeoff."))
else:
paths_to_key_parameters_list = [
- './analysis/masses_cg_inertia/design_mission/design_cg_shift/cg_point[@ID="0"]/center_of_gravity',
- './analysis/masses_cg_inertia/design_mission/design_cg_shift/cg_point[@ID="0"]/total_mass']
+ './analysis/masses_cg_inertia/design_mission/cg_shift/cg_point[@ID="0"]/center_of_gravity',
+ './analysis/masses_cg_inertia/design_mission/cg_shift/cg_point[@ID="0"]/total_mass']
paths_to_key_parameters_list.extend(
MassPropertiesIO().key_parameters_paths_mission(switch, "most_forward_mass"))
paths_to_key_parameters_list.extend(
MassPropertiesIO().key_parameters_paths_mission(switch, "most_afterward_mass"))
paths_to_key_parameters_list.extend(
- MassPropertiesIO().key_parameters_paths_mission(switch, "design_mass"))
+ MassPropertiesIO().key_parameters_paths_mission(switch, "takeoff_mass"))
paths_to_key_parameters_list.extend(
- MassPropertiesIO().key_parameters_paths_mission(switch, "design_fuel_mass"))
+ MassPropertiesIO().key_parameters_paths_mission(switch, "fuel_mass"))
child_key_parameters_dict = {}
child_key_parameters_dict.update(
@@ -92,9 +92,9 @@ def data_postprocessing(paths_and_names, routing_dict, data_dict, runtime_output
child_key_parameters_dict.update(
MassPropertiesIO().key_parameters_dicts("most_afterward_mass", "Mass at the most aft CG position."))
child_key_parameters_dict.update(
- MassPropertiesIO().key_parameters_dicts("design_mass", "Mass of the aircraft at takeoff."))
+ MassPropertiesIO().key_parameters_dicts("takeoff_mass", "Mass of the aircraft at takeoff."))
child_key_parameters_dict.update(
- MassPropertiesIO().key_parameters_dicts("design_fuel_mass", "Mass of the fuel at takeoff."))
+ MassPropertiesIO().key_parameters_dicts("fuel_mass", "Mass of the fuel at takeoff."))
paths_to_key_parameters_list.extend(
MassPropertiesIO().key_parameters_paths("manufacturer_mass_empty"))
@@ -141,7 +141,7 @@ def data_postprocessing(paths_and_names, routing_dict, data_dict, runtime_output
"study_mission": {
"attributes": {"description": "Masses, Center of Gravity, Inertias for the study mission."},
**child_key_parameters_dict,
- "study_cg_shift": {
+ "cg_shift": {
'attributes': {
'description': 'Point cloud describing the center of gravity for a specific total aircraft mass while defueling.'},
'cg_point': {
@@ -178,7 +178,7 @@ def data_postprocessing(paths_and_names, routing_dict, data_dict, runtime_output
"design_mission": {
"attributes": {"description": "Masses, Center of Gravity, Inertias for the design mission."},
**child_key_parameters_dict,
- "design_cg_shift": {
+ "cg_shift": {
'attributes': {
'description': 'Point cloud describing the center of gravity for a specific total aircraft mass while defueling.'},
'cg_point': {
diff --git a/weight_and_balance_analysis/src/tube_and_wing/standard/basic/methodbasic.py b/weight_and_balance_analysis/src/tube_and_wing/standard/basic/methodbasic.py
index 60591a69a4f9e12c9a163076f8ba31d78c0e9b0d..9906e329bacbfa8f48ac1c79fb6433e459024c75 100644
--- a/weight_and_balance_analysis/src/tube_and_wing/standard/basic/methodbasic.py
+++ b/weight_and_balance_analysis/src/tube_and_wing/standard/basic/methodbasic.py
@@ -173,7 +173,7 @@ def method_basic(paths_and_names, routing_dict, dict_ac_exchange, dict_mod_confi
mission_fuel_mass.path_to_element = "./analysis/masses_cg_inertia/mission_fuel_mass"
mission_fuel_mass.print("Mission fuel mass")
- design_fuel_mass_takeoff.path_to_element = "./analysis/masses_cg_inertia/design_mission/design_fuel_mass"
+ design_fuel_mass_takeoff.path_to_element = "./analysis/masses_cg_inertia/design_mission/fuel_mass"
design_fuel_mass_takeoff.print("Design fuel mass (at takeoff)")
# Maximum zero fuel mass
@@ -193,7 +193,7 @@ def method_basic(paths_and_names, routing_dict, dict_ac_exchange, dict_mod_confi
[operating_mass_empty, design_payload_mass,
design_fuel_mass_takeoff], inertia_method
).print("Design mass takeoff")
- design_mass_takeoff.path_to_element = "./analysis/masses_cg_inertia/design_mission/design_mass"
+ design_mass_takeoff.path_to_element = "./analysis/masses_cg_inertia/design_mission/takeoff_mass"
design_mass_takeoff.cg_mac = (
design_mass.center_of_gravity['x'] - x_leading_edge_mac) / mac * 100
@@ -497,8 +497,8 @@ def method_basic(paths_and_names, routing_dict, dict_ac_exchange, dict_mod_confi
}
if switch == "study_mode":
- design_fuel_mass_takeoff.path_to_element = "./analysis/masses_cg_inertia/study_mission/study_fuel_mass"
- design_mass_takeoff.path_to_element = "./analysis/masses_cg_inertia/study_mission/study_mass"
+ design_fuel_mass_takeoff.path_to_element = "./analysis/masses_cg_inertia/study_mission/fuel_mass"
+ design_mass_takeoff.path_to_element = "./analysis/masses_cg_inertia/study_mission/takeoff_mass"
most_afterward_mass.path_to_element = "./analysis/masses_cg_inertia/study_mission/most_afterward_mass"
most_forward_mass.path_to_element = "./analysis/masses_cg_inertia/study_mission/most_forward_mass"
diff --git a/weight_and_balance_analysis/src/tube_and_wing/standard/general/methodhtmlreport.py b/weight_and_balance_analysis/src/tube_and_wing/standard/general/methodhtmlreport.py
index ae9bd5eb745abc8755bb1943647da8cca22d016c..14ce5a1cb3e061d9e4906856a0b80f6dcd42ac85 100644
--- a/weight_and_balance_analysis/src/tube_and_wing/standard/general/methodhtmlreport.py
+++ b/weight_and_balance_analysis/src/tube_and_wing/standard/general/methodhtmlreport.py
@@ -43,7 +43,7 @@ def method_html_report(paths_and_names, routing_dict, data_dict, method_specific
project_name = paths_and_names['name_of_project']
switch = "study_mode"
- switch = "design_mode"
+ # switch = "design_mode"
if switch == "study_mode":
tool_name = tool_name + f"_study_mission"
diff --git a/weight_and_balance_analysis/src/tube_and_wing/standard/usermethoddatapreparation.py b/weight_and_balance_analysis/src/tube_and_wing/standard/usermethoddatapreparation.py
index 0adbaafaf87e0159202fe29de8041b49e32dd765..f1d55cb37b6d30e445092580ca48dd926aede94f 100644
--- a/weight_and_balance_analysis/src/tube_and_wing/standard/usermethoddatapreparation.py
+++ b/weight_and_balance_analysis/src/tube_and_wing/standard/usermethoddatapreparation.py
@@ -182,13 +182,13 @@ def user_method_data_output_preparation(data_dict):
switch = "study_mode"
# switch = "design_mode"
- while j < len(data_dict["Defueling xCG"])-1:
+ while j < len(data_dict["Defueling xCG"]) - 1:
if switch == "study_mode":
- shift_path_id = './analysis/masses_cg_inertia/study_mission/study_cg_shift/cg_point[@ID="' + str(
+ shift_path_id = './analysis/masses_cg_inertia/study_mission/cg_shift/cg_point[@ID="' + str(
j) + '"]/'
else:
- shift_path_id = './analysis/masses_cg_inertia/design_mission/design_cg_shift/cg_point[@ID="' + str(
+ shift_path_id = './analysis/masses_cg_inertia/design_mission/cg_shift/cg_point[@ID="' + str(
j) + '"]/'
shift_dict = {