pyBADA 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

pyBADA/TCL.py

@@ -1,19 +1,12 @@
-# -*- coding: utf-8 -*-
-"""
-pyBADA
-Trajectory Computation Light (TCL) for BADAH/BADAE/BADA3/BADA4 aircraft performance module
-Developped @EUROCONTROL (EIH)
-2024
-"""
-
-import os
+"""Trajectory Computation Light (TCL) for BADAH/BADAE/BADA3/BADA4 aircraft
+performance module."""
+
 import numpy as np
 from pyBADA.geodesic import Vincenty as vincenty
 from pyBADA.geodesic import RhumbLine as rhumb
 from pyBADA.geodesic import Turn as turn
 
 from dataclasses import dataclass
-import importlib.util
 import itertools
 import warnings
 
@@ -60,10 +53,9 @@ def constantSpeedLevel(
     magneticDeclinationGrid=None,
     **kwargs,
 ):
-    """
-    Calculates the time, fuel consumption, and other parameters for a level flight
-    segment at a constant speed for a given aircraft in the BADA model. It supports step-climb,
-    constant heading (true or magnetic), and turns.
+    """Calculates the time, fuel consumption, and other parameters for a level
+    flight segment at a constant speed for a given aircraft in the BADA model.
+    It supports step-climb, constant heading (true or magnetic), and turns.
 
     The function handles different BADA families (BADA3, BADA4, BADAH, BADAE), and computes various
     parameters such as altitude, speed, fuel consumption, power, heading, and mass based on aircraft
@@ -96,13 +88,12 @@ def constantSpeedLevel(
     :param magneticDeclinationGrid: Optional magnetic declination grid to correct headings. Default is None.
     :param kwargs: Additional optional parameters:
 
-        - mass_const: Boolean. If True, keeps the aircraft mass constant during the segment. Default is False.
         - SOC_init: Initial battery state of charge for electric aircraft [%]. Default is 100 for BADAE.
         - speedBrakes: Dictionary defining whether speed brakes are deployed and their drag coefficient {deployed: False, value: 0.03}.
         - ROCD_min: Minimum rate of climb/descent threshold to identify service ceiling [ft/min]. Default varies by aircraft type.
         - config: Default aerodynamic configuration. Values: TO, IC, CR, AP, LD.
         - HpStep: Altitude step for step climb [ft]. Default is 2000 ft.
-        - m_iter: Number of iterations for mass integration. Default is 1 for BADAE, 2 for others.
+        - calculationType: String indicating whether calculation is performed as INTEGRATED or POINT. Default is INTEGRATED.
         - step_length: The step length for each iteration in [NM] or [s], depending on the lengthType. Default is 100 NM for BADA3/4 and 10 NM for BADAH/BADAE.
 
     :returns: A pandas DataFrame containing the flight trajectory with columns such as:
@@ -180,7 +171,7 @@ def constantSpeedLevel(
             magneticHeading = trueHeading - magneticDeclination
         elif magneticHeading is not None and trueHeading is None:
             # fly MAGNETIC Heading
-            if constantHeading == True:
+            if constantHeading is True:
                 headingToFly = "MAGNETIC"
                 trueHeading = magneticHeading + magneticDeclination
             else:
@@ -190,7 +181,12 @@ def constantSpeedLevel(
             raise Exception("Undefined Heading value combination")
 
     # calculation with constant mass (True) or integrated (False)
-    mass_const = kwargs.get("mass_const", False)
+    calculationType = kwargs.get("calculationType", "INTEGRATED")
+
+    if calculationType == "INTEGRATED":
+        mass_const = False
+    if calculationType == "POINT":
+        mass_const = True
 
     # optional parameter to define initial Baterry State of Charge (SOC)
     if AC.BADAFamily.BADAE:
@@ -535,7 +531,6 @@ def constantSpeedLevel(
                     and Lon_i is not None
                     and (HDGMagnetic_i is not None or HDGTrue is not None)
                 ):
-
                     if headingToFly == "TRUE":
                         if not turnFlight:
                             if not constantHeading:
@@ -1166,6 +1161,7 @@ def constantSpeedLevel(
     }
 
     flightTrajectory = FT.createFlightTrajectoryDataframe(flightData)
+
     return flightTrajectory
 
 
@@ -1188,9 +1184,10 @@ def constantSpeedROCD(
     magneticDeclinationGrid=None,
     **kwargs,
 ):
-    """
-    Computes the time, fuel consumption, and other parameters required for an aircraft to climb or descend
-    from a given initial altitude (Hp_init) to a final altitude (Hp_final) at a constant speed and rate of climb/descent (ROCD).
+    """Computes the time, fuel consumption, and other parameters required for
+    an aircraft to climb or descend from a given initial altitude (Hp_init) to
+    a final altitude (Hp_final) at a constant speed and rate of climb/descent
+    (ROCD).
 
     The function handles multiple BADA families (BADA3, BADA4, BADAH, BADAE), computing various parameters
     such as altitude, speed, fuel consumption, power, heading, and mass based on the aircraft's performance
@@ -1228,7 +1225,7 @@ def constantSpeedROCD(
         - speedBrakes: Dictionary specifying whether speed brakes are deployed and their drag coefficient {deployed: False, value: 0.03}.
         - ROCD_min: Minimum ROCD to identify the service ceiling [ft/min]. Default varies by aircraft type.
         - config: Default aerodynamic configuration. Values: TO, IC, CR, AP, LD. Default is None.
-        - mass_const: Boolean specifying whether to keep the mass constant during the segment. Default is False.
+        - calculationType: String indicating whether calculation is performed as INTEGRATED or POINT. Default is INTEGRATED.
         - m_iter: Number of iterations for the mass integration loop. Default is 5.
 
     :returns: A pandas DataFrame containing the flight trajectory with columns such as:
@@ -1307,7 +1304,7 @@ def constantSpeedROCD(
             magneticHeading = trueHeading - magneticDeclination
         elif magneticHeading is not None and trueHeading is None:
             # fly MAGNETIC Heading
-            if constantHeading == True:
+            if constantHeading is True:
                 headingToFly = "MAGNETIC"
                 trueHeading = magneticHeading + magneticDeclination
             else:
@@ -1317,7 +1314,12 @@ def constantSpeedROCD(
             raise Exception("Undefined Heading value combination")
 
     # calculation with constant mass (True) or integrated (False)
-    mass_const = kwargs.get("mass_const", False)
+    calculationType = kwargs.get("calculationType", "INTEGRATED")
+
+    if calculationType == "INTEGRATED":
+        mass_const = False
+    if calculationType == "POINT":
+        mass_const = True
 
     # optional parameter to define initial Baterry State of Charge (SOC)
     if AC.BADAFamily.BADAE:
@@ -1479,6 +1481,25 @@ def constantSpeedROCD(
         )
 
         # aircraft speed
+        if calculationType == "POINT" and AC.BADAFamily.BADAH:
+            [
+                Pav_POINT,
+                Peng_POINT,
+                Preq_POINT,
+                tas_POINT,
+                ROCD_POINT,
+                ESF_POINT,
+                limitation_POINT,
+            ] = AC.ARPM.ARPMProcedure(
+                phase=phase,
+                h=H_m,
+                DeltaTemp=DeltaTemp,
+                mass=mass[-1],
+                rating="ARPM",
+            )
+            v = conv.ms2kt(tas_POINT)
+            speedType = "TAS"
+
         [M_i, CAS_i, TAS_i] = atm.convertSpeed(
             v=v, speedType=speedType, theta=theta, delta=delta, sigma=sigma
         )
@@ -2180,6 +2201,7 @@ def constantSpeedROCD(
     }
 
     flightTrajectory = FT.createFlightTrajectoryDataframe(flightData)
+
     return flightTrajectory
 
 
@@ -2202,10 +2224,10 @@ def constantSpeedROCD_time(
     magneticDeclinationGrid=None,
     **kwargs,
 ):
-    """
-    Computes the time, fuel consumption, and performance parameters required for an aircraft to
-    perform a climb or descent based on a set amount of time, while maintaining a constant speed and constant
-    rate of climb/descent (ROCD).
+    """Computes the time, fuel consumption, and performance parameters
+    required for an aircraft to perform a climb or descent based on a set
+    amount of time, while maintaining a constant speed and constant rate of
+    climb/descent (ROCD).
 
     The function supports various BADA families (BADA3, BADA4, BADAH, BADAE), with different handling for mass changes,
     aerodynamic configurations, and energy consumption. It calculates parameters such as fuel consumption, power
@@ -2242,7 +2264,7 @@ def constantSpeedROCD_time(
         - speedBrakes: Dictionary specifying whether speed brakes are deployed and their drag coefficient {deployed: False, value: 0.03}.
         - ROCD_min: Minimum ROCD to identify the service ceiling [ft/min]. Default varies by aircraft type.
         - config: Default aerodynamic configuration. Values: TO, IC, CR, AP, LD. Default is None.
-        - mass_const: Boolean specifying whether to keep the mass constant during the segment. Default is False.
+        - calculationType: String indicating whether calculation is performed as INTEGRATED or POINT. Default is INTEGRATED.
         - m_iter: Number of iterations for the mass integration loop. Default is 5.
 
     :returns: A pandas DataFrame containing the flight trajectory with columns such as:
@@ -2316,7 +2338,7 @@ def constantSpeedROCD_time(
             magneticHeading = trueHeading - magneticDeclination
         elif magneticHeading is not None and trueHeading is None:
             # fly MAGNETIC Heading
-            if constantHeading == True:
+            if constantHeading is True:
                 headingToFly = "MAGNETIC"
                 trueHeading = magneticHeading + magneticDeclination
             else:
@@ -2326,7 +2348,12 @@ def constantSpeedROCD_time(
             raise Exception("Undefined Heading value combination")
 
     # calculation with constant mass (True) or integrated (False)
-    mass_const = kwargs.get("mass_const", False)
+    calculationType = kwargs.get("calculationType", "INTEGRATED")
+
+    if calculationType == "INTEGRATED":
+        mass_const = False
+    if calculationType == "POINT":
+        mass_const = True
 
     # optional parameter to define initial Baterry State of Charge (SOC)
     if AC.BADAFamily.BADAE:
@@ -2482,6 +2509,25 @@ def constantSpeedROCD_time(
             )
 
             # aircraft speed
+            if calculationType == "POINT" and AC.BADAFamily.BADAH:
+                [
+                    Pav_POINT,
+                    Peng_POINT,
+                    Preq_POINT,
+                    tas_POINT,
+                    ROCD_POINT,
+                    ESF_POINT,
+                    limitation_POINT,
+                ] = AC.ARPM.ARPMProcedure(
+                    phase=phase,
+                    h=H_m,
+                    DeltaTemp=DeltaTemp,
+                    mass=mass[-1],
+                    rating="ARPM",
+                )
+                v = conv.ms2kt(tas_POINT)
+                speedType = "TAS"
+
             [M_i, CAS_i, TAS_i] = atm.convertSpeed(
                 v=v, speedType=speedType, theta=theta, delta=delta, sigma=sigma
             )
@@ -3172,6 +3218,7 @@ def constantSpeedROCD_time(
     }
 
     flightTrajectory = FT.createFlightTrajectoryDataframe(flightData)
+
     return flightTrajectory
 
 
@@ -3194,9 +3241,10 @@ def constantSpeedSlope(
     magneticDeclinationGrid=None,
     **kwargs,
 ):
-    """
-    Calculates time, fuel consumption, and other parameters required for an aircraft to perform a climb or descent
-    from an initial altitude (Hp_init) to a final altitude (Hp_final) while maintaining a constant speed and a constant slope.
+    """Calculates time, fuel consumption, and other parameters required for an
+    aircraft to perform a climb or descent from an initial altitude (Hp_init)
+    to a final altitude (Hp_final) while maintaining a constant speed and a
+    constant slope.
 
     It uses different models for BADA (Base of Aircraft Data) families (BADA3, BADA4, BADAH, BADAE) to compute key flight parameters
     such as energy consumption, rate of climb/descent (ROCD), fuel burn, mass changes, and power requirements. The function also supports
@@ -3233,7 +3281,7 @@ def constantSpeedSlope(
         - speedBrakes: A dictionary specifying whether speed brakes are deployed and the additional drag coefficient {deployed: False, value: 0.03}.
         - ROCD_min: Minimum rate of climb/descent used to determine service ceiling [ft/min]. Default varies based on aircraft type.
         - config: Default aerodynamic configuration (TO, IC, CR, AP, LD). Default is None.
-        - mass_const: Boolean indicating whether mass remains constant during the flight segment. Default is False.
+        - calculationType: String indicating whether calculation is performed as INTEGRATED or POINT. Default is INTEGRATED.
         - m_iter: Number of iterations for the mass integration loop. Default is 5.
 
     :returns: A pandas DataFrame containing the flight trajectory with columns such as:
@@ -3307,7 +3355,7 @@ def constantSpeedSlope(
             magneticHeading = trueHeading - magneticDeclination
         elif magneticHeading is not None and trueHeading is None:
             # fly MAGNETIC Heading
-            if constantHeading == True:
+            if constantHeading is True:
                 headingToFly = "MAGNETIC"
                 trueHeading = magneticHeading + magneticDeclination
             else:
@@ -3317,7 +3365,12 @@ def constantSpeedSlope(
             raise Exception("Undefined Heading value combination")
 
     # calculation with constant mass (True) or integrated (False)
-    mass_const = kwargs.get("mass_const", False)
+    calculationType = kwargs.get("calculationType", "INTEGRATED")
+
+    if calculationType == "INTEGRATED":
+        mass_const = False
+    if calculationType == "POINT":
+        mass_const = True
 
     # optional parameter to define initial Baterry State of Charge (SOC)
     if AC.BADAFamily.BADAE:
@@ -3473,6 +3526,25 @@ def constantSpeedSlope(
         )
 
         # aircraft speed
+        if calculationType == "POINT" and AC.BADAFamily.BADAH:
+            [
+                Pav_POINT,
+                Peng_POINT,
+                Preq_POINT,
+                tas_POINT,
+                ROCD_POINT,
+                ESF_POINT,
+                limitation_POINT,
+            ] = AC.ARPM.ARPMProcedure(
+                phase=phase,
+                h=H_m,
+                DeltaTemp=DeltaTemp,
+                mass=mass[-1],
+                rating="ARPM",
+            )
+            v = conv.ms2kt(tas_POINT)
+            speedType = "TAS"
+
         [M_i, CAS_i, TAS_i] = atm.convertSpeed(
             v=v, speedType=speedType, theta=theta, delta=delta, sigma=sigma
         )
@@ -4178,6 +4250,7 @@ def constantSpeedSlope(
     }
 
     flightTrajectory = FT.createFlightTrajectoryDataframe(flightData)
+
     return flightTrajectory
 
 
@@ -4200,8 +4273,9 @@ def constantSpeedSlope_time(
     magneticDeclinationGrid=None,
     **kwargs,
 ):
-    """
-    Computes the time, fuel, and trajectory parameters required by an aircraft to climb or descend at constant speed and slope over a given duration.
+    """Computes the time, fuel, and trajectory parameters required by an
+    aircraft to climb or descend at constant speed and slope over a given
+    duration.
 
     This function models a trajectory with constant speed (either CAS, TAS, or Mach) and a specified slope (degrees). The aircraft's dynamics are modeled based on BADA family data (BADA3, BADA4, BADAH, BADAE), supporting various aircraft types including electric models. It also accounts for turns, heading changes, and wind effects.
 
@@ -4237,7 +4311,7 @@ def constantSpeedSlope_time(
         - config: Default aerodynamic configuration {TO, IC, CR, AP, LD}. If not provided, configuration is calculated automatically.
         - speedBrakes: Dictionary specifying if speed brakes are deployed and additional drag coefficient {deployed: False, value: 0.03}.
         - ROCD_min: Minimum Rate of Climb/Descent to determine service ceiling [ft/min]. Defaults depend on aircraft type and engine.
-        - mass_const: Boolean indicating whether mass remains constant during the flight. Default is False.
+        - calculationType: String indicating whether calculation is performed as INTEGRATED or POINT. Default is INTEGRATED.
         - m_iter: Number of iterations for mass integration. Default is 5.
 
     :returns: A pandas DataFrame containing the flight trajectory with columns such as:
@@ -4311,7 +4385,7 @@ def constantSpeedSlope_time(
             magneticHeading = trueHeading - magneticDeclination
         elif magneticHeading is not None and trueHeading is None:
             # fly MAGNETIC Heading
-            if constantHeading == True:
+            if constantHeading is True:
                 headingToFly = "MAGNETIC"
                 trueHeading = magneticHeading + magneticDeclination
             else:
@@ -4321,7 +4395,12 @@ def constantSpeedSlope_time(
             raise Exception("Undefined Heading value combination")
 
     # calculation with constant mass (True) or integrated (False)
-    mass_const = kwargs.get("mass_const", False)
+    calculationType = kwargs.get("calculationType", "INTEGRATED")
+
+    if calculationType == "INTEGRATED":
+        mass_const = False
+    if calculationType == "POINT":
+        mass_const = True
 
     # optional parameter to define initial Baterry State of Charge (SOC)
     if AC.BADAFamily.BADAE:
@@ -4473,6 +4552,25 @@ def constantSpeedSlope_time(
             )
 
             # aircraft speed
+            if calculationType == "POINT" and AC.BADAFamily.BADAH:
+                [
+                    Pav_POINT,
+                    Peng_POINT,
+                    Preq_POINT,
+                    tas_POINT,
+                    ROCD_POINT,
+                    ESF_POINT,
+                    limitation_POINT,
+                ] = AC.ARPM.ARPMProcedure(
+                    phase=phase,
+                    h=H_m,
+                    DeltaTemp=DeltaTemp,
+                    mass=mass[-1],
+                    rating="ARPM",
+                )
+                v = conv.ms2kt(tas_POINT)
+                speedType = "TAS"
+
             [M_i, CAS_i, TAS_i] = atm.convertSpeed(
                 v=v, speedType=speedType, theta=theta, delta=delta, sigma=sigma
             )
@@ -5175,6 +5273,7 @@ def constantSpeedSlope_time(
     }
 
     flightTrajectory = FT.createFlightTrajectoryDataframe(flightData)
+
     return flightTrajectory
 
 
@@ -5198,9 +5297,10 @@ def constantSpeedRating(
     initRating=None,
     **kwargs,
 ):
-    """
-    Calculates time, fuel consumption, and other parameters required for an aircraft to perform a climb or descent
-    from an initial altitude (Hp_init) to a final altitude (Hp_final) while maintaining a constant speed and engine rating.
+    """Calculates time, fuel consumption, and other parameters required for an
+    aircraft to perform a climb or descent from an initial altitude (Hp_init)
+    to a final altitude (Hp_final) while maintaining a constant speed and
+    engine rating.
 
     It uses different models for BADA (Base of Aircraft Data) families (BADA3, BADA4, BADAH, BADAE) to compute key flight parameters
     such as fuel burn, rate of climb/descent (ROCD), thrust, drag, and energy requirements. The function also supports
@@ -5237,7 +5337,7 @@ def constantSpeedRating(
         - speedBrakes: A dictionary specifying whether speed brakes are deployed and the additional drag coefficient {deployed: False, value: 0.03}.
         - ROCD_min: Minimum rate of climb/descent used to determine service ceiling [ft/min]. Default varies based on aircraft type.
         - config: Default aerodynamic configuration (TO, IC, CR, AP, LD). Default is None.
-        - mass_const: Boolean indicating whether mass remains constant during the flight segment. Default is False.
+        - calculationType: String indicating whether calculation is performed as INTEGRATED or POINT. Default is INTEGRATED.
         - m_iter: Number of iterations for the mass integration loop. Default is 5.
 
     :returns: A pandas DataFrame containing the flight trajectory with columns such as:
@@ -5311,7 +5411,7 @@ def constantSpeedRating(
             magneticHeading = trueHeading - magneticDeclination
         elif magneticHeading is not None and trueHeading is None:
             # fly MAGNETIC Heading
-            if constantHeading == True:
+            if constantHeading is True:
                 headingToFly = "MAGNETIC"
                 trueHeading = magneticHeading + magneticDeclination
             else:
@@ -5321,7 +5421,12 @@ def constantSpeedRating(
             raise Exception("Undefined Heading value combination")
 
     # calculation with constant mass (True) or integrated (False)
-    mass_const = kwargs.get("mass_const", False)
+    calculationType = kwargs.get("calculationType", "INTEGRATED")
+
+    if calculationType == "INTEGRATED":
+        mass_const = False
+    if calculationType == "POINT":
+        mass_const = True
 
     # optional parameter to define initial Baterry State of Charge (SOC)
     if AC.BADAFamily.BADAE:
@@ -5504,6 +5609,25 @@ def constantSpeedRating(
         )
 
         # aircraft speed
+        if calculationType == "POINT" and AC.BADAFamily.BADAH:
+            [
+                Pav_POINT,
+                Peng_POINT,
+                Preq_POINT,
+                tas_POINT,
+                ROCD_POINT,
+                ESF_POINT,
+                limitation_POINT,
+            ] = AC.ARPM.ARPMProcedure(
+                phase=phase,
+                h=H_m,
+                DeltaTemp=DeltaTemp,
+                mass=mass[-1],
+                rating=rating,
+            )
+            v = conv.ms2kt(tas_POINT)
+            speedType = "TAS"
+
         [M_i, CAS_i, TAS_i] = atm.convertSpeed(
             v=v, speedType=speedType, theta=theta, delta=delta, sigma=sigma
         )
@@ -5580,9 +5704,12 @@ def constantSpeedRating(
                 M=M_i,
                 DeltaTemp=DeltaTemp,
             )  # [N]
-            CT = AC.CT(Thrust=THR_i, delta=delta)
             FUEL_i = AC.ff(
-                CT=CT, delta=delta, theta=theta, M=M_i, DeltaTemp=DeltaTemp
+                rating=rating,
+                delta=delta,
+                theta=theta,
+                M=M_i,
+                DeltaTemp=DeltaTemp,
             )
 
         # BADA3
@@ -5616,12 +5743,7 @@ def constantSpeedRating(
                 DeltaTemp=DeltaTemp,
             )
             FUEL_i = AC.ff(
-                flightPhase=phase,
-                v=TAS_i,
-                h=H_m,
-                T=THR_i,
-                config=config_i,
-                adapted=True,
+                flightPhase=phase, v=TAS_i, h=H_m, T=THR_i, config=config_i
             )
 
         if Hp_i != Hp_init:  # exclude first point: initial m already known
@@ -5689,7 +5811,12 @@ def constantSpeedRating(
                 CL = AC.CL(M=M_i, delta=delta, mass=mass_i, nz=nz)
                 # compute drag coefficient
                 CD = AC.CD(
-                    M=M_i, CL=CL, HLid=HLid_i, LG=LG_i, speedBrakes=speedBrakes
+                    M=M_i,
+                    CL=CL,
+                    HLid=HLid_i,
+                    LG=LG_i,
+                    speedBrakes=speedBrakes,
+                    expedite=expedite,
                 )
                 # compute drag force
                 Drag = AC.D(M=M_i, delta=delta, CD=CD)
@@ -6095,6 +6222,7 @@ def constantSpeedRating(
     }
 
     flightTrajectory = FT.createFlightTrajectoryDataframe(flightData)
+
     return flightTrajectory
 
 
@@ -6119,9 +6247,9 @@ def constantSpeedRating_time(
     initRating=None,
     **kwargs,
 ):
-    """
-    Calculates the time, fuel consumption, and other flight parameters required for an aircraft to perform
-    a climb or descent at constant speed and engine rating for a specified duration.
+    """Calculates the time, fuel consumption, and other flight parameters
+    required for an aircraft to perform a climb or descent at constant speed
+    and engine rating for a specified duration.
 
     It uses different models for BADA (Base of Aircraft Data) families (BADA3, BADA4, BADAH, BADAE) to compute key parameters
     such as rate of climb/descent (ROCD), thrust, drag, fuel burn, and power requirements. The function also supports complex
@@ -6160,7 +6288,7 @@ def constantSpeedRating_time(
         - speedBrakes: A dictionary specifying whether speed brakes are deployed and the additional drag coefficient {deployed: False, value: 0.03}.
         - ROCD_min: Minimum rate of climb/descent to determine service ceiling [ft/min]. Default varies by aircraft type.
         - config: Default aerodynamic configuration (TO, IC, CR, AP, LD). Default is None.
-        - mass_const: Boolean indicating whether mass remains constant during the flight segment. Default is False.
+        - calculationType: String indicating whether calculation is performed as INTEGRATED or POINT. Default is INTEGRATED.
         - m_iter: Number of iterations for the mass integration loop. Default is 5.
 
     :returns: A pandas DataFrame containing the flight trajectory with columns such as:
@@ -6234,7 +6362,7 @@ def constantSpeedRating_time(
             magneticHeading = trueHeading - magneticDeclination
         elif magneticHeading is not None and trueHeading is None:
             # fly MAGNETIC Heading
-            if constantHeading == True:
+            if constantHeading is True:
                 headingToFly = "MAGNETIC"
                 trueHeading = magneticHeading + magneticDeclination
             else:
@@ -6244,7 +6372,12 @@ def constantSpeedRating_time(
             raise Exception("Undefined Heading value combination")
 
     # calculation with constant mass (True) or integrated (False)
-    mass_const = kwargs.get("mass_const", False)
+    calculationType = kwargs.get("calculationType", "INTEGRATED")
+
+    if calculationType == "INTEGRATED":
+        mass_const = False
+    if calculationType == "POINT":
+        mass_const = True
 
     # optional parameter to define initial Baterry State of Charge (SOC)
     if AC.BADAFamily.BADAE:
@@ -6430,6 +6563,25 @@ def constantSpeedRating_time(
             )
 
             # aircraft speed
+            if calculationType == "POINT" and AC.BADAFamily.BADAH:
+                [
+                    Pav_POINT,
+                    Peng_POINT,
+                    Preq_POINT,
+                    tas_POINT,
+                    ROCD_POINT,
+                    ESF_POINT,
+                    limitation_POINT,
+                ] = AC.ARPM.ARPMProcedure(
+                    phase=phase,
+                    h=H_m,
+                    DeltaTemp=DeltaTemp,
+                    mass=mass[-1],
+                    rating=rating,
+                )
+                v = conv.ms2kt(tas_POINT)
+                speedType = "TAS"
+
             [M_i, CAS_i, TAS_i] = atm.convertSpeed(
                 v=v, speedType=speedType, theta=theta, delta=delta, sigma=sigma
             )
@@ -6508,9 +6660,12 @@ def constantSpeedRating_time(
                     M=M_i,
                     DeltaTemp=DeltaTemp,
                 )  # [N]
-                CT = AC.CT(Thrust=THR_i, delta=delta)
                 FUEL_i = AC.ff(
-                    CT=CT, delta=delta, theta=theta, M=M_i, DeltaTemp=DeltaTemp
+                    rating=rating,
+                    delta=delta,
+                    theta=theta,
+                    M=M_i,
+                    DeltaTemp=DeltaTemp,
                 )
 
             # BADA3
@@ -6544,12 +6699,7 @@ def constantSpeedRating_time(
                     DeltaTemp=DeltaTemp,
                 )
                 FUEL_i = AC.ff(
-                    flightPhase=phase,
-                    v=TAS_i,
-                    h=H_m,
-                    T=THR_i,
-                    config=config_i,
-                    adapted=False,
+                    flightPhase=phase, v=TAS_i, h=H_m, T=THR_i, config=config_i
                 )  # MCMB(climb) or IDLE(descent)
 
             # BADAH or BADAE
@@ -6603,7 +6753,12 @@ def constantSpeedRating_time(
                 CL = AC.CL(M=M_i, delta=delta, mass=mass_i, nz=nz)
                 # compute drag coefficient
                 CD = AC.CD(
-                    M=M_i, CL=CL, HLid=HLid_i, LG=LG_i, speedBrakes=speedBrakes
+                    M=M_i,
+                    CL=CL,
+                    HLid=HLid_i,
+                    LG=LG_i,
+                    speedBrakes=speedBrakes,
+                    expedite=expedite,
                 )
                 # compute drag force
                 Drag = AC.D(M=M_i, delta=delta, CD=CD)
@@ -7008,6 +7163,7 @@ def constantSpeedRating_time(
     }
 
     flightTrajectory = FT.createFlightTrajectoryDataframe(flightData)
+
     return flightTrajectory
 
 
@@ -7030,10 +7186,10 @@ def accDec(
     magneticDeclinationGrid=None,
     **kwargs,
 ):
-    """
-    Calculates the time, fuel consumption, and other key flight parameters required for an aircraft
-    to perform an acceleration or deceleration from an initial speed (v_init) to a final speed (v_final)
-    during the climb, cruise, or descent phases of flight.
+    """Calculates the time, fuel consumption, and other key flight parameters
+    required for an aircraft to perform an acceleration or deceleration from
+    an initial speed (v_init) to a final speed (v_final) during the climb,
+    cruise, or descent phases of flight.
 
     The flight parameters are calculated using different models for the BADA (Base of Aircraft Data) families (BADA3, BADA4, BADAH, BADAE).
     The function can also accommodate different control laws, vertical evolution phases, wind conditions, and complex flight dynamics like turns.
@@ -7082,7 +7238,7 @@ def accDec(
         - speed_step: Speed step size for the iterative calculation [-] for M, [kt] for TAS/CAS. Default is 0.01 Mach, 5 kt for TAS/CAS.
         - SOC_init: Initial battery state of charge for electric aircraft (BADAE) [%]. Default is 100.
         - config: Default aerodynamic configuration (TO, IC, CR, AP, LD). Default is None.
-        - mass_const: Boolean indicating whether mass remains constant during the flight segment. Default is False.
+        - calculationType: String indicating whether calculation is performed as INTEGRATED or POINT. Default is INTEGRATED.
         - m_iter: Number of iterations for the mass integration loop. Default is 10 for BADA3/4/H, 5 for BADAE.
 
     :returns: A pandas DataFrame containing the flight trajectory with columns such as:
@@ -7156,7 +7312,7 @@ def accDec(
             magneticHeading = trueHeading - magneticDeclination
         elif magneticHeading is not None and trueHeading is None:
             # fly MAGNETIC Heading
-            if constantHeading == True:
+            if constantHeading is True:
                 headingToFly = "MAGNETIC"
                 trueHeading = magneticHeading + magneticDeclination
             else:
@@ -7166,7 +7322,12 @@ def accDec(
             raise Exception("Undefined Heading value combination")
 
     # calculation with constant mass (True) or integrated (False)
-    mass_const = kwargs.get("mass_const", False)
+    calculationType = kwargs.get("calculationType", "INTEGRATED")
+
+    if calculationType == "INTEGRATED":
+        mass_const = False
+    if calculationType == "POINT":
+        mass_const = True
 
     # optional parameter to define initial Baterry State of Charge (SOC)
     if AC.BADAFamily.BADAE:
@@ -8283,6 +8444,7 @@ def accDec(
     }
 
     flightTrajectory = FT.createFlightTrajectoryDataframe(flightData)
+
     return flightTrajectory
 
 
@@ -8306,10 +8468,10 @@ def accDec_time(
     magneticDeclinationGrid=None,
     **kwargs,
 ):
-    """
-    Calculates the time, fuel consumption, and other key flight parameters required for an aircraft
-    to perform an acceleration or deceleration from an initial speed (v_init) over a set period of time
-    during the climb, cruise, or descent phases of flight.
+    """Calculates the time, fuel consumption, and other key flight parameters
+    required for an aircraft to perform an acceleration or deceleration from
+    an initial speed (v_init) over a set period of time during the climb,
+    cruise, or descent phases of flight.
 
     The flight parameters are calculated using different models for the BADA (Base of Aircraft Data) families (BADA3, BADA4, BADAH, BADAE).
     The function can also accommodate different control laws, vertical evolution phases, wind conditions, and complex flight dynamics like turns.
@@ -8359,7 +8521,7 @@ def accDec_time(
         - step_length: Length of each time step in the calculation [s]. Default is 1 second.
         - SOC_init: Initial battery state of charge for electric aircraft (BADAE) [%]. Default is 100.
         - config: Default aerodynamic configuration (TO, IC, CR, AP, LD). Default is None.
-        - mass_const: Boolean indicating whether mass remains constant during the flight segment. Default is False.
+        - calculationType: String indicating whether calculation is performed as INTEGRATED or POINT. Default is INTEGRATED.
         - m_iter: Number of iterations for the mass integration loop. Default is 10 for BADA3/4/H, 5 for BADAE.
 
     :returns: A pandas DataFrame containing the flight trajectory with columns such as:
@@ -8433,7 +8595,7 @@ def accDec_time(
             magneticHeading = trueHeading - magneticDeclination
         elif magneticHeading is not None and trueHeading is None:
             # fly MAGNETIC Heading
-            if constantHeading == True:
+            if constantHeading is True:
                 headingToFly = "MAGNETIC"
                 trueHeading = magneticHeading + magneticDeclination
             else:
@@ -8443,7 +8605,12 @@ def accDec_time(
             raise Exception("Undefined Heading value combination")
 
     # calculation with constant mass (True) or integrated (False)
-    mass_const = kwargs.get("mass_const", False)
+    calculationType = kwargs.get("calculationType", "INTEGRATED")
+
+    if calculationType == "INTEGRATED":
+        mass_const = False
+    if calculationType == "POINT":
+        mass_const = True
 
     # optional parameter to define initial Baterry State of Charge (SOC)
     if AC.BADAFamily.BADAE:
@@ -8819,7 +8986,6 @@ def accDec_time(
                     if P_i < Pmin:
                         P_i = Pmin
                         if ESFc is not None:
-
                             ROCD_i = (
                                 conv.m2ft(
                                     AC.ROCD(
@@ -9554,4 +9720,5 @@ def accDec_time(
     }
 
     flightTrajectory = FT.createFlightTrajectoryDataframe(flightData)
+
     return flightTrajectory