renamed 2d to be compatible with main

Author: cassidymwagner

src/fluidsf/calculate_advection.py renamed to src/fluidsf/calculate_advection_2d.py

@@ -1,7 +1,7 @@
 import numpy as np
 
 
-def calculate_advection(  # noqa: D417
+def calculate_advection_2d(  # noqa: D417
     u,
     v,
     x=None,

src/fluidsf/calculate_structure_function.py renamed to src/fluidsf/calculate_structure_function_2d.py

@@ -3,7 +3,7 @@
 from .shift_array_2d import shift_array_2d
 
 
-def calculate_structure_function(  # noqa: D417, C901
+def calculate_structure_function_2d(  # noqa: D417, C901
     u,
     v,
     adv_x,

src/fluidsf/generate_structure_functions.py renamed to src/fluidsf/generate_structure_functions_2d.py

@@ -1,15 +1,15 @@
 import numpy as np
 
 from .bin_data import bin_data
-from .calculate_advection import calculate_advection
+from .calculate_advection_2d import calculate_advection_2d
 from .calculate_separation_distances import calculate_separation_distances
-from .calculate_structure_function import (
-    calculate_structure_function,
+from .calculate_structure_function_2d import (
+    calculate_structure_function_2d,
 )
 from .shift_array_1d import shift_array_1d
 
 
-def generate_structure_functions(  # noqa: C901, D417
+def generate_structure_functions_2d(  # noqa: C901, D417
     u,
     v,
     x=None,
@@ -195,7 +195,7 @@ def generate_structure_functions(  # noqa: C901, D417
     if "ASF_V" in sf_type:
         SF_adv_x = np.zeros(len(sep_x) + 1)
         SF_adv_y = np.zeros(len(sep_y) + 1)
-        adv_x, adv_y = calculate_advection(
+        adv_x, adv_y = calculate_advection_2d(
             u,
             v,
             x,
@@ -211,7 +211,7 @@ def generate_structure_functions(  # noqa: C901, D417
     if "ASF_S" in sf_type:
         SF_x_scalar = np.zeros(len(sep_x) + 1)
         SF_y_scalar = np.zeros(len(sep_y) + 1)
-        adv_scalar = calculate_advection(
+        adv_scalar = calculate_advection_2d(
             u, v, x, y, lats, lons, dx, dy, grid_type, scalar, sphere_circumference
         )
     if "LL" in sf_type:
@@ -243,7 +243,7 @@ def generate_structure_functions(  # noqa: C901, D417
             else:
                 xroll = shift_array_1d(x, shift_by=x_shift, boundary=None)
 
-        SF_dicts = calculate_structure_function(
+        SF_dicts = calculate_structure_function_2d(
             u,
             v,
             adv_x,
@@ -301,7 +301,7 @@ def generate_structure_functions(  # noqa: C901, D417
             else:
                 yroll = shift_array_1d(y, shift_by=y_shift, boundary=None)
 
-        SF_dicts = calculate_structure_function(
+        SF_dicts = calculate_structure_function_2d(
             u,
             v,
             adv_x,