refactor names of terminal velocity method functions for droplets

Author: tluettm

PySDM/backends/impl_numba/methods/terminal_velocity_methods.py

@@ -10,9 +10,9 @@
 
 
 class TerminalVelocityMethods(BackendMethods):
-    # TODO #1603 give terminal velocity functions name of the parametrisation
+
     @cached_property
-    def _interpolation_body(self):
+    def _gunn_and_kinzer_interpolation_body(self):
         @numba.njit(**self.default_jit_flags)
         def body(output, radius, factor, b, c):
             for i in numba.prange(len(radius)):  # pylint: disable=not-an-iterable
@@ -25,15 +25,13 @@ def body(output, radius, factor, b, c):
 
         return body
 
-    # TODO #1603 give terminal velocity functions name of the parametrisation
-    def interpolation(self, *, output, radius, factor, b, c):
-        return self._interpolation_body(
+    def gunn_and_kinzer_interpolation(self, *, output, radius, factor, b, c):
+        return self._gunn_and_kinzer_interpolation_body(
             output.data, radius.data, factor, b.data, c.data
         )
 
-    # TODO #1603 give terminal velocity functions name of the parametrisation
     @cached_property
-    def _terminal_velocity_body(self):
+    def _rogers_and_yau_terminal_velocity_body(self):
         v_term = self.formulae.terminal_velocity.v_term
 
         @numba.njit(**self.default_jit_flags)
@@ -44,9 +42,8 @@ def body(*, values, radius):
 
         return body
 
-    # TODO #1603 give terminal velocity functions name of the parametrisation
-    def terminal_velocity(self, *, values, radius):
-        self._terminal_velocity_body(values=values, radius=radius)
+    def rogers_and_yau_terminal_velocity(self, *, values, radius):
+        self._rogers_and_yau_terminal_velocity_body(values=values, radius=radius)
 
     @cached_property
     def _power_series_body(self):

PySDM/backends/impl_thrust_rtc/methods/terminal_velocity_methods.py

@@ -69,7 +69,7 @@ def __linear_collection_efficiency_body(self):
         )
 
     @cached_property
-    def __interpolation_body(self):
+    def __gunn_and_kinzer_interpolation_body(self):
         # TODO #599 r<0
         return trtc.For(
             ("output", "radius", "factor", "a", "b"),
@@ -126,9 +126,9 @@ def linear_collection_efficiency(
         )
 
     @nice_thrust(**NICE_THRUST_FLAGS)
-    def interpolation(self, *, output, radius, factor, b, c):
+    def gunn_and_kinzer_interpolation(self, *, output, radius, factor, b, c):
         factor_device = trtc.DVInt64(factor)
-        self.__interpolation_body.launch_n(
+        self.__gunn_and_kinzer_interpolation_body.launch_n(
             len(radius), (output.data, radius.data, factor_device, b.data, c.data)
         )
 
@@ -157,7 +157,7 @@ def power_series(self, *, values, radius, num_terms, prefactors, powers):
         )
 
     @cached_property
-    def __terminal_velocity_body(self):
+    def __rogers_and_yau_terminal_velocity_body(self):
         return trtc.For(
             param_names=("values", "radius"),
             name_iter="i",
@@ -171,5 +171,5 @@ def __terminal_velocity_body(self):
         )
 
     @nice_thrust(**NICE_THRUST_FLAGS)
-    def terminal_velocity(self, *, values, radius):
-        self.__terminal_velocity_body.launch_n(n=values.size(), args=[values, radius])
+    def rogers_and_yau_terminal_velocity(self, *, values, radius):
+        self.__rogers_and_yau_terminal_velocity_body.launch_n(n=values.size(), args=[values, radius])

PySDM/dynamics/terminal_velocity/gunn_and_kinzer.py

@@ -131,7 +131,7 @@ def __call__(self, output, radius):
                 f"Radii can be interpolated up to {self.maximum_radius} m"
                 + f" (max value of {r_max} m within input data)"
             )
-        self.particulator.backend.interpolation(
+        self.particulator.backend.gunn_and_kinzer_interpolation(
             output=output, radius=radius, factor=self.factor, b=self.a, c=self.b
         )
 

PySDM/dynamics/terminal_velocity/rogers_and_yau.py

@@ -8,7 +8,7 @@ def __init__(self, particulator):
         self.particulator = particulator
 
     def __call__(self, output, radius):
-        self.particulator.backend.terminal_velocity(
+        self.particulator.backend.rogers_and_yau_terminal_velocity(
             values=output.data,
             radius=radius.data,
         )