MNT: Fix rebasing problems

Author: Gui-FernandesBR

rocketpy/mathutils/function.py

@@ -804,29 +804,7 @@ def set_discrete(
                 func, lower, upper, samples, interpolation, extrapolation, one_by_one
             )
         elif func.__dom_dim__ == 2:
-            # Determine boundaries
-            domain = [[0, 10], [0, 10]]
-            if self.__cropped_domain__ is not None:
-                for i in range(0, 2):
-                    if self.__cropped_domain__[i] is not None:
-                        if self.__cropped_domain__[i][0] > domain[i][0]:
-                            domain[i][0] = self.__cropped_domain__[i][0]
-                        if self.__cropped_domain__[i][1] < domain[i][1]:
-                            domain[i][1] = self.__cropped_domain__[i][1]
-            lower = lower or [domain[0][0], domain[1][0]]
-            lower = 2 * [lower] if isinstance(lower, NUMERICAL_TYPES) else lower
-            upper = [domain[0][1], domain[1][1]] if upper is None else upper
-            upper = 2 * [upper] if isinstance(upper, NUMERICAL_TYPES) else upper
-            sam = 2 * [samples] if isinstance(samples, NUMERICAL_TYPES) else samples
-            # Create nodes to evaluate function
-            xs = np.linspace(lower[0], upper[0], sam[0])
-            ys = np.linspace(lower[1], upper[1], sam[1])
-            xs, ys = np.array(np.meshgrid(xs, ys)).reshape(2, xs.size * ys.size)
-            # Evaluate function at all mesh nodes and convert it to matrix
-            zs = np.array(func.get_value(xs, ys))
-            func.set_source(np.concatenate(([xs], [ys], [zs])).transpose())
-            func.__interpolation__ = "shepard"
-            func.__extrapolation__ = "natural"
+            self.__discretize_2d_function(func, lower, upper, samples)
         else:
             raise ValueError(
                 "Discretization is only supported for 1-D and 2-D Functions."
@@ -2006,7 +1984,7 @@ def plot_2d(  # pylint: disable=too-many-statements
                             domain[i][0] = self.__cropped_domain__[i][0]
                         if self.__cropped_domain__[i][1] < domain[i][1]:
                             domain[i][1] = self.__cropped_domain__[i][1]
-            lower = lower or [domain[0][0], domain[1][0]]
+            lower = [domain[0][0], domain[1][0]] if lower is None else lower
             lower = 2 * [lower] if isinstance(lower, NUMERICAL_TYPES) else lower
             upper = [domain[0][1], domain[1][1]] if upper is None else upper
             upper = 2 * [upper] if isinstance(upper, NUMERICAL_TYPES) else upper