-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #712 from slayoo/freezing
adding test_freezing for ICMW (with both singular & time-dependent runs and an assert for non-zero ice-water content)
- Loading branch information
Showing
39 changed files
with
404 additions
and
259 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
PySDM/backends/impl_numba/methods/terminal_velocity_methods.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| """ | ||
| CPU implementation of backend methods for terminal velocities | ||
| """ | ||
| import numba | ||
| from PySDM.backends.impl_numba import conf | ||
| from PySDM.backends.impl_common.backend_methods import BackendMethods | ||
|
|
||
|
|
||
| class TerminalVelocityMethods(BackendMethods): | ||
| @staticmethod | ||
| @numba.njit(**conf.JIT_FLAGS) | ||
| # pylint: disable=too-many-arguments,too-many-locals | ||
| def linear_collection_efficiency_body( | ||
| params, output, radii, is_first_in_pair, idx, length, unit | ||
| ): | ||
| A, B, D1, D2, E1, E2, F1, F2, G1, G2, G3, Mf, Mg = params | ||
| output[:] = 0 | ||
| for i in numba.prange(length - 1): # pylint: disable=not-an-iterable | ||
| if is_first_in_pair[i]: | ||
| if radii[idx[i]] > radii[idx[i + 1]]: | ||
| r = radii[idx[i]] / unit | ||
| r_s = radii[idx[i + 1]] / unit | ||
| else: | ||
| r = radii[idx[i + 1]] / unit | ||
| r_s = radii[idx[i]] / unit | ||
| p = r_s / r | ||
| if p not in (0, 1): | ||
| G = (G1 / r) ** Mg + G2 + G3 * r | ||
| Gp = (1 - p) ** G | ||
| if Gp != 0: | ||
| D = D1 / r ** D2 | ||
| E = E1 / r ** E2 | ||
| F = (F1 / r) ** Mf + F2 | ||
| output[i // 2] = A + B * p + D / p ** F + E / Gp | ||
| output[i // 2] = max(0, output[i // 2]) | ||
|
|
||
| def linear_collection_efficiency(self, params, output, radii, is_first_in_pair, unit): | ||
| return self.linear_collection_efficiency_body( | ||
| params, output.data, radii.data, is_first_in_pair.indicator.data, | ||
| radii.idx.data, len(is_first_in_pair), unit) | ||
|
|
||
| @staticmethod | ||
| @numba.njit(**conf.JIT_FLAGS) | ||
| def interpolation_body(output, radius, factor, b, c): | ||
| for i in numba.prange(len(radius)): # pylint: disable=not-an-iterable | ||
| if radius[i] < 0: | ||
| output[i] = 0 | ||
| else: | ||
| r_id = int(factor * radius[i]) | ||
| r_rest = ((factor * radius[i]) % 1) / factor | ||
| output[i] = b[r_id] + r_rest * c[r_id] | ||
|
|
||
| def interpolation(self, output, radius, factor, b, c): | ||
| return self.interpolation_body( | ||
| output.data, radius.data, factor, b.data, c.data | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
PySDM/backends/impl_thrust_rtc/methods/terminal_velocity_methods.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| """ | ||
| GPU implementation of backend methods for terminal velocities | ||
| """ | ||
| from PySDM.backends.impl_thrust_rtc.conf import NICE_THRUST_FLAGS | ||
| from PySDM.backends.impl_thrust_rtc.nice_thrust import nice_thrust | ||
| from ..conf import trtc | ||
| from ..methods.thrust_rtc_backend_methods import ThrustRTCBackendMethods | ||
|
|
||
|
|
||
| class TerminalVelocityMethods(ThrustRTCBackendMethods): | ||
| def __init__(self): | ||
| super().__init__() | ||
| self.__linear_collection_efficiency_body = trtc.For( | ||
| ( | ||
| 'A', 'B', 'D1', 'D2', 'E1', 'E2', 'F1', 'F2', 'G1', 'G2', 'G3', 'Mf', 'Mg', | ||
| 'output', 'radii', 'is_first_in_pair', 'idx', 'unit' | ||
| ), | ||
| "i", | ||
| ''' | ||
| if (is_first_in_pair[i]) { | ||
| real_type r = 0; | ||
| real_type r_s = 0; | ||
| if (radii[idx[i]] > radii[idx[i + 1]]) { | ||
| r = radii[idx[i]] / unit; | ||
| r_s = radii[idx[i + 1]] / unit; | ||
| } | ||
| else { | ||
| r = radii[idx[i + 1]] / unit; | ||
| r_s = radii[idx[i]] / unit; | ||
| } | ||
| real_type p = r_s / r; | ||
| if (p != 0 && p != 1) { | ||
| real_type G = pow((G1 / r), Mg) + G2 + G3 * r; | ||
| real_type Gp = pow((1 - p), G); | ||
| if (Gp != 0) { | ||
| real_type D = D1 / pow(r, D2); | ||
| real_type E = E1 / pow(r, E2); | ||
| real_type F = pow((F1 / r), Mf) + F2; | ||
| output[int(i / 2)] = A + B * p + D / pow(p, F) + E / Gp; | ||
| if (output[int(i / 2)] < 0) { | ||
| output[int(i / 2)] = 0; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| '''.replace("real_type", self._get_c_type())) | ||
|
|
||
| # TODO #599 r<0 | ||
| self.__interpolation_body = trtc.For( | ||
| ('output', 'radius', 'factor', 'a', 'b'), | ||
| 'i', | ||
| ''' | ||
| auto r_id = (int64_t)(factor * radius[i]); | ||
| auto r_rest = (factor * radius[i] - r_id) / factor; | ||
| output[i] = a[r_id] + r_rest * b[r_id]; | ||
| ''' | ||
| ) | ||
|
|
||
| def linear_collection_efficiency(self, params, output, radii, is_first_in_pair, unit): | ||
| A, B, D1, D2, E1, E2, F1, F2, G1, G2, G3, Mf, Mg = params | ||
| dA = self._get_floating_point(A) | ||
| dB = self._get_floating_point(B) | ||
| dD1 = self._get_floating_point(D1) | ||
| dD2 = self._get_floating_point(D2) | ||
| dE1 = self._get_floating_point(E1) | ||
| dE2 = self._get_floating_point(E2) | ||
| dF1 = self._get_floating_point(F1) | ||
| dF2 = self._get_floating_point(F2) | ||
| dG1 = self._get_floating_point(G1) | ||
| dG2 = self._get_floating_point(G2) | ||
| dG3 = self._get_floating_point(G3) | ||
| dMf = self._get_floating_point(Mf) | ||
| dMg = self._get_floating_point(Mg) | ||
| dunit = self._get_floating_point(unit) | ||
| trtc.Fill(output.data, trtc.DVDouble(0)) | ||
| self.__linear_collection_efficiency_body.launch_n( | ||
| len(is_first_in_pair) - 1, | ||
| [dA, dB, dD1, dD2, dE1, dE2, dF1, dF2, dG1, dG2, dG3, dMf, dMg, | ||
| output.data, radii.data, is_first_in_pair.indicator.data, radii.idx.data, dunit]) | ||
|
|
||
| @nice_thrust(**NICE_THRUST_FLAGS) | ||
| def interpolation(self, output, radius, factor, b, c): | ||
| factor_device = trtc.DVInt64(factor) | ||
| self.__interpolation_body.launch_n( | ||
| len(radius), | ||
| (output.data, radius.data, factor_device, b.data, c.data) | ||
| ) |
Oops, something went wrong.