Skip to content
Snippets Groups Projects

Implemented changes to correct faulty imports due to old template

Merged Implemented changes to correct faulty imports due to old template
feature/cost_estimation_update into develop
2 unresolved threads
Merged s-roscher requested to merge feature/cost_estimation_update into develop
2 unresolved threads
  • usermethoddatapreparation.py: Corrected some acXML paths to read from
  • _02_calculatecrewcosts.py: Hard-coded number of cockpit crew members since information not given atm (set to 2)
  • methodkerosene.py: First merge acXML and module config file dicts, than check for missing values

Merge request reports

Merged by AndiAndi 4 months ago (Dec 6, 2024 11:44am UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
cost_estimation/src/tube_and_wing/empirical/operating_cost_estimation_tu_berlin/general/call_functions/_02_calculatecrewcosts.py
29 29 # Extract necessary variables from 'dict_ac_data'.
30 30 depreciation_period = dict_ac_data['depreciation_period']
31 31 n_cabin_crew_members = dict_ac_data['n_cabin_crew_members']['n_cabin_crew_members_ID0']
32 n_cockpit_crew_members = dict_ac_data['n_cockpit_crew_members']
32 n_cockpit_crew_members = 2
  • Andi @AndiGob started a thread on an old version of the diff
    • cost_estimation/src/tube_and_wing/empirical/operating_cost_estimation_tu_berlin/usermethoddatapreparation.py
    42 'm_payload_study': [mission_path + 'study_mission/payload_mass', float],
    41 # 'm_payload_study': [mission_path + 'study_mission/payload_mass', float],
    43 42 'm_payload_at_max_fuel': [assessment_path + 'performance/range/payload_maximum_fuel_at_maximum_takeoff_mass',
    44 43 float],
    45 44 'm_takeoff_max': [masses_and_cg_path + 'maximum_takeoff_mass/mass_properties/mass', float],
    46 'm_takeoff_design': [mission_path + 'design_mission/takeoff_mass', float],
    47 'm_takeoff_study': [mission_path + 'study_mission/takeoff_mass', float],
    45 'm_takeoff_design': [masses_and_cg_path + 'design_mass/mass_properties/mass', float],
    46 'm_takeoff_study': [masses_and_cg_path + 'study_mass/mass_properties/mass', float],
    48 47 'mach_cruise_design': [requirements_path + 'design_mission/initial_cruise_mach_number', float], # new
    49 48 'mach_cruise_study': [requirements_path + 'study_mission/initial_cruise_mach_number', float], # new
    50 49 'n_cabin_crew_members': [fuselage_path + 'specific/geometry/fuselage[@ID="0"]/number_of_required_cabin_crew',
    51 50 float],
    52 'n_cockpit_crew_members_design': [mission_path + 'design_mission/number_of_flight_crew', float],
    53 'n_cockpit_crew_members_study': [mission_path + 'study_mission/number_of_flight_crew', float],
    51 #'n_cockpit_crew_members_design': [mission_path + 'design_mission/number_of_flight_crew', float],
  • Andi requested changes

    requested changes

  • s-roscher added 2 commits

    added 2 commits

    • 0f48d780 - readlayertext.py:
    • 457110d7 - Did some formatting to comply with max. line length and deleted some dead code.

    Compare with previous version

  • s-roscher added 1 commit

    added 1 commit

    Compare with previous version

  • Andi approved this merge request

    approved this merge request

  • Andi mentioned in commit 12d52ee4

    mentioned in commit 12d52ee4

  • Andi merged

    merged

    • Please register or sign in to reply