Merge remote-tracking branch 'origin/test_merge' into test_merge

ImperialCollegeLondon · Sep 19, 2023 · 6ae2156 · 6ae2156
2 parents a18a5e7 + d8d7780
commit 6ae2156
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/UVLM b/lib/UVLM
diff --git a/sharpy/aero/utils/uvlmlib.py b/sharpy/aero/utils/uvlmlib.py
@@ -242,15 +242,15 @@ def vlm_solver(ts_info, options):
     ts_info.remove_ctypes_pointers()
 
 def vlm_solver_nonlifting_body(ts_info, options):
-    run_VLM_nonlifting = UvlmLib.run_VLM_nonlifting_body
+    run_linear_source_panel_method = UvlmLib.run_linear_source_panel_method_body
 
     vmopts = VMopts()
     vmopts.set_options(options, n_surfaces_nonlifting = ts_info.n_surf)
 
     flightconditions = FlightConditions(options['rho'], ts_info.u_ext[0][:, 0, 0])
 
     ts_info.generate_ctypes_pointers()
-    run_VLM_nonlifting(ct.byref(vmopts),
+    run_linear_source_panel_method(ct.byref(vmopts),
                        ct.byref(flightconditions),
                        ts_info.ct_p_dimensions,
                        ts_info.ct_p_zeta,
@@ -261,7 +261,7 @@ def vlm_solver_nonlifting_body(ts_info, options):
     ts_info.remove_ctypes_pointers()
 
 def vlm_solver_lifting_and_nonlifting_bodies(ts_info_lifting, ts_info_nonlifting, options):
-    run_VLM_lifting_and_nonlifting = UvlmLib.run_VLM_lifting_and_nonlifting_bodies
+    run_VLM_coupled_with_LSPM = UvlmLib.run_VLM_coupled_with_LSPM_bodies
 
     vmopts = VMopts()    
     vmopts.set_options(options, n_surfaces = ts_info_lifting.n_surf, n_surfaces_nonlifting = ts_info_nonlifting.n_surf)
@@ -272,7 +272,7 @@ def vlm_solver_lifting_and_nonlifting_bodies(ts_info_lifting, ts_info_nonlifting
     p_centre_rot = options['centre_rot_g'].ctypes.data_as(ct.POINTER(ct.c_double))
     ts_info_lifting.generate_ctypes_pointers()
     ts_info_nonlifting.generate_ctypes_pointers()
-    run_VLM_lifting_and_nonlifting(ct.byref(vmopts),
+    run_VLM_coupled_with_LSPM(ct.byref(vmopts),
             ct.byref(flightconditions),
             ts_info_lifting.ct_p_dimensions,
             ts_info_lifting.ct_p_dimensions_star,
@@ -354,7 +354,7 @@ def uvlm_solver_lifting_and_nonlifting(i_iter, ts_info, ts_info_nonlifting, stru
                         convect_wake = convect_wake, 
                         n_span_panels_wo_u_ind=4)
     uvmopts.only_lifting = ct.c_bool(False)
-    run_UVLM = UvlmLib.run_UVLM_lifting_and_nonlifting
+    run_UVLM = UvlmLib.run_UVLM_coupled_with_LSPM
 
     flightconditions = FlightConditions(options['rho'], ts_info.u_ext[0][:, 0, 0])
+23 −6		include/constants.h
+48 −17		include/cpp_interface.h
+68 −21		include/debugutils.h
+343 −65		include/geometry.h
+93 −21		include/mapping.h
+205 −142		include/matrix.h
+111 −12		include/phantom.h
+1 −1		include/postproc.h
+151 −71		include/sources.h
+152 −35		include/steady.h
+279 −113		include/struct_utils.h
+39 −15		include/timing.h
+90 −45		include/triads.h
+163 −47		include/types.h
+50 −11		include/typeutils.h
+4 −20		include/unsteady.h
+48 −13		include/unsteady_utils.h
+141 −9		src/cpp_interface.cpp