major cleanup and reorganization. Cleaned out deprecated functions, e…

…xtraneous function inputs, fixed some style items, cleaned out old commented code that is not longer needed, moved some functions and files and names around, etc.

src/DuctAPE.jl

@@ -69,10 +69,13 @@ export c4b
 
 ##### ----- UTILITIES ----- #####
 # general utility functions
-include("utilities/utils.jl")
-include("utilities/types.jl")
+include("utilities/misc.jl")
+include("utilities/options.jl")
 include("utilities/package_states.jl")
-include("utilities/caches.jl")
+include("utilities/caching/caches.jl")
+include("utilities/caching/allocate_caches.jl")
+include("utilities/caching/reshape_caches.jl")
+include("utilities/caching/integration_caches.jl")
 include("utilities/bookkeeping.jl")
 
 # Airfoil utility functions
@@ -99,12 +102,13 @@ include("preprocess/geometry/elliptic_grid_residuals.jl")
 include("preprocess/velocities/unit_induced_velocities.jl")
 include("preprocess/velocities/induced_velocity_matrices.jl")
 include("preprocess/velocities/body_aic.jl")
+
 # Quadrature
-include("preprocess/velocities/integrands.jl")
-include("preprocess/velocities/out_of_place_integrals.jl")
-include("preprocess/velocities/gausslegendre_integrals.jl")
-include("preprocess/velocities/romberg_integrals.jl")
-include("preprocess/velocities/gausskronrod_integrals.jl")
+include("preprocess/velocities/quadrature/integrands.jl")
+include("preprocess/velocities/quadrature/out_of_place_integrals.jl")
+include("preprocess/velocities/quadrature/gausslegendre_integrals.jl")
+include("preprocess/velocities/quadrature/romberg_integrals.jl")
+include("preprocess/velocities/quadrature/gausskronrod_integrals.jl")
 
 ##### ----- PROCESS ----- #####
 # Solve and Residual Functions
@@ -125,4 +129,6 @@ include("postprocess/pressures.jl")
 include("postprocess/rotor_performance.jl")
 include("postprocess/utils.jl")
 
+##### ----- DEBUGGING ----- #####
+include("../test/test_utils.jl")
 end

src/postprocess/pressures.jl

@@ -218,7 +218,6 @@ function get_body_cps!(
         centerbody_zpts,
         cp_in,
         controlpoints,
-        endpanelidxs,
     )
     split_bodies!(
         cp_casing_out,
@@ -229,7 +228,6 @@ function get_body_cps!(
         centerbody_zpts,
         cp_out,
         controlpoints,
-        endpanelidxs,
     )
 
     return cp_tuple

src/postprocess/velocities.jl

@@ -216,7 +216,6 @@ function get_body_tangential_velocities!(
         centerbody_zpts,
         Vtan_out,
         controlpoints,
-        endpanelidxs,
     )
     split_bodies!(
         vtan_casing_in,
@@ -227,7 +226,6 @@ function get_body_tangential_velocities!(
         centerbody_zpts,
         Vtan_in,
         controlpoints,
-        endpanelidxs,
     )
 
     return vtan_tuple

src/preprocess/geometry/body_geometry.jl

@@ -1,27 +1,3 @@
-#"""
-#"""
-#function reinterpolate_bodies(
-#    duct_coordinates,
-#    centerbody_coordinates,
-#    zwake,
-#    ncenterbody_inlet,
-#    nduct_inlet;
-#    finterp=FLOWMath.akima,
-#)
-
-##TODO: initialize repaneled coordinates
-
-#return  reinterpolate_bodies!(
-#    duct_coordinates,
-#    centerbody_coordinates,
-#    zwake,
-#    ncenterbody_inlet,
-#    nduct_inlet;
-#    finterp=FLOWMath.akima,
-#)
-
-#end
-
 """
 """
 function reinterpolate_bodies!(
@@ -62,23 +38,13 @@ function reinterpolate_bodies!(
     new_zcenterbody_grid = @view(zwake[1:centerbody_trailing_index])
     new_rcenterbody_grid = finterp(zcenterbody, rcenterbody, new_zcenterbody_grid)
 
-    # - update centerbody geometry between leading edge and rotor - #
-    # interpolate centerbody geometry between leading edge and rotor
-    # new_zcenterbody = range(zcenterbody[1, 1], new_zcenterbody_grid[1], ncenterbody_inlet + 1)
-
     scale = new_zcenterbody_grid[1] - zcenterbody[1]
     transform = zcenterbody[1]
     new_zcenterbody = scaled_cosine_spacing(
         ncenterbody_inlet + 1, 2 * scale, transform; mypi=pi / 2
     )
     new_rcenterbody = finterp(zcenterbody, rcenterbody, new_zcenterbody)
 
-    # - update inner duct geometry between leading edge and rotor - #
-    # interpolate inner duct geometry between leading edge and rotor
-    # new_zduct_inner = range(
-    #     duct_coordinates[dleidx, 1], new_zduct_grid[1], nduct_inlet + 1
-    # )
-
     scale = new_zduct_grid[1] - duct_coordinates[dleidx, 1]
     transform = duct_coordinates[dleidx, 1]
     new_zduct_inner = scaled_cosine_spacing(