-
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.
Jensen & Nugent 2017 example updates (incl. new smoke tests, Fig 7, 8…
… and Tab 4 notebooks); GrabowskiEtAl2011 diffusion thermics coefficient fix; Bolton1980 & Wexler1976 svp formulae; (#1283) Co-authored-by: Sanket Bhiogade <[email protected]> Co-authored-by: Sylwester Arabas <[email protected]> Co-authored-by: Kaitlyn Loftus <[email protected]>
- Loading branch information
1 parent
ddf07df
commit 181284e
Showing
24 changed files
with
8,450 additions
and
8,608 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -215,7 +215,7 @@ jobs: | |
test-suite: [ "chemistry_freezing_isotopes", "condensation_a", "condensation_b", "coagulation", "breakup", "multi-process_a", "multi-process_b"] | ||
fail-fast: false | ||
runs-on: ${{ matrix.platform }} | ||
timeout-minutes: 45 | ||
timeout-minutes: 50 | ||
steps: | ||
- uses: actions/[email protected] | ||
with: | ||
|
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
14 changes: 0 additions & 14 deletions
14
PySDM/physics/diffusion_kinetics/jensen_and_nugent_2017.py
This file was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
""" | ||
[Bolton 1980](https://doi.org/10.1175/1520-0493(1980)108<1046:TCOEPT>2.0.CO;2) | ||
""" | ||
|
||
import numpy as np | ||
|
||
|
||
class Bolton1980: | ||
def __init__(self, _): | ||
pass | ||
|
||
@staticmethod | ||
def pvs_Celsius(const, T): | ||
"""valid for -30 <= T <= 35 C, eq (10)""" | ||
return const.B80W_G0 * np.exp((const.B80W_G1 * T) / (T + const.B80W_G2)) | ||
|
||
@staticmethod | ||
def ice_Celsius(const, T): | ||
"""NaN with unit of pressure and correct dimension""" | ||
return np.nan * T / const.B80W_G2 * const.B80W_G0 |
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,31 @@ | ||
""" | ||
[Wexler 1976](https://nvlpubs.nist.gov/nistpubs/jres/80A/jresv80An5-6p775_A1b.pdf) | ||
""" | ||
|
||
import numpy as np | ||
|
||
|
||
class Wexler1976: | ||
def __init__(self, _): | ||
pass | ||
|
||
@staticmethod | ||
def pvs_Celsius(const, T): | ||
return ( | ||
np.exp( | ||
const.W76W_G0 / (T + const.T0) ** 2 | ||
+ const.W76W_G1 / (T + const.T0) | ||
+ const.W76W_G2 | ||
+ const.W76W_G3 * (T + const.T0) | ||
+ const.W76W_G4 * (T + const.T0) ** 2 | ||
+ const.W76W_G5 * (T + const.T0) ** 3 | ||
+ const.W76W_G6 * (T + const.T0) ** 4 | ||
+ const.W76W_G7 * np.log((T + const.T0) / const.one_kelvin) | ||
) | ||
* const.W76W_G8 | ||
) | ||
|
||
@staticmethod | ||
def ice_Celsius(const, T): | ||
"""NaN with unit of pressure and correct dimension""" | ||
return np.nan * T / const.B80W_G2 * const.B80W_G0 |
Oops, something went wrong.