Merge branch 'enh/multi-variable-drag-fix' of https://github.com/RocketPy-Team/RocketPy into enh/multi-variable-drag-fix

Author: MateusStano

rocketpy/rocket/aero_surface/generic_surface.py

@@ -407,71 +407,6 @@ def __load_csv(self, file_path, coeff_name):
         columns can appear in any order. The last column must contain the
         coefficient values.
         """
-
-        try:
-            with open(file_path, mode="r") as file:
-                reader = csv.reader(file)
-                header = next(reader)
-        except (FileNotFoundError, IOError) as e:
-            raise ValueError(f"Error reading {coeff_name} CSV file: {e}") from e
-        except StopIteration as e:
-            raise ValueError(f"Invalid or empty CSV file for {coeff_name}.") from e
-
-        if not header:
-            raise ValueError(f"Invalid or empty CSV file for {coeff_name}.")
-
-        # TODO make header strings flexible (e.g. 'alpha', 'Alpha', 'ALPHA')
-        independent_vars = [
-            "alpha",
-            "beta",
-            "mach",
-            "reynolds",
-            "pitch_rate",
-            "yaw_rate",
-            "roll_rate",
-        ]
-        header = [column.strip() for column in header]
-        present_columns = [col for col in independent_vars if col in header]
-
-        invalid_columns = [col for col in header[:-1] if col not in independent_vars]
-        if invalid_columns:
-            raise ValueError(
-                f"Invalid independent variable(s) in {coeff_name} CSV: "
-                f"{invalid_columns}. Valid options are: {independent_vars}."
-            )
-
-        # Check that the last column is not an independent variable
-        if header[-1] in independent_vars:
-            raise ValueError(
-                f"Last column in {coeff_name} CSV must be the coefficient"
-                " value, not an independent variable."
-            )
-
-        # Ensure that at least one independent variable is present
-        if not present_columns:
-            raise ValueError(f"No independent variables found in {coeff_name} CSV.")
-
-        # Build ordered variable names as they appear in the CSV header.
-        # This guarantees argument order consistency with Function(file_path),
-        # which interprets columns positionally.
-        ordered_present_columns = [
-            col for col in header[:-1] if col in independent_vars
-        ]
-
-        # Initialize the CSV-based function
-        csv_func = create_regular_grid_function(
-            file_path,
-            ordered_present_columns,
-            coeff_name,
-            extrapolation="natural",
-        )
-        if csv_func is None:
-            csv_func = Function(
-                file_path,
-                interpolation="linear",
-                extrapolation="natural",
-            )
-
         # Generate a lambda that applies only the relevant arguments to csv_func
         def wrapper(alpha, beta, mach, reynolds, pitch_rate, yaw_rate, roll_rate):
             args_by_name = {

rocketpy/tools.py

@@ -143,10 +143,7 @@ def create_regular_grid_function(
     """
     from rocketpy.mathutils.function import Function
 
-    try:
-        data = np.loadtxt(csv_source, delimiter=",", skiprows=1, dtype=float)
-    except (OSError, ValueError):
-        return None
+    data = np.loadtxt(csv_source, delimiter=",", skiprows=1, dtype=float)
 
     data = np.atleast_2d(data)
     expected_columns = len(variable_names) + 1