-
Notifications
You must be signed in to change notification settings - Fork 50
ventilation: new example based on fig. 1 from Stewart 1975 (and including data from Kinzer & Gunn 1951) #1556
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 20 commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
8cb5d55
new example Stewart 1975 - add description and citations to example f…
AgnieszkaZaba 4f5cc71
add formulae for sqrt_re_times_cbrt_sc (still need repopulating); add…
AgnieszkaZaba 4f88c0d
populate tables for K&G'51
AgnieszkaZaba 9cfbc26
add plot
AgnieszkaZaba 5e7c6ea
create Kinzer and Gunn example
AgnieszkaZaba 3611c98
update plot from Stewart
AgnieszkaZaba cc294d0
add Kinzer & Gunn 1951 to bibliography
AgnieszkaZaba 11638f0
Merge branch 'main' into example-stewart
AgnieszkaZaba b92a09e
add one more citation K&G51 to docs
AgnieszkaZaba 545efe4
distinguish between vent. factor and coeff.
AgnieszkaZaba 23cc77d
fix line too long in init
AgnieszkaZaba a6d98bf
update url for K&G to not contain "<", ">"
AgnieszkaZaba a7692ec
update bibliography for Stewart 75
AgnieszkaZaba f1d3d00
update bibliography for Stewart 75 once again
AgnieszkaZaba ae863db
add test for Stewart example
AgnieszkaZaba 40faa43
add tests to Stewart; remove fig_7 from K&G due to results in Stewart…
AgnieszkaZaba 2dd027e
clean up bibliography
AgnieszkaZaba 379df00
clean up bibliography again
AgnieszkaZaba 17dfee0
address pylint hints
AgnieszkaZaba f07c420
add new files to conftest
AgnieszkaZaba cc39aee
fix typo, ALLCAPS and missing space
AgnieszkaZaba 219fb28
add init file
AgnieszkaZaba c3188bc
update bibliography
AgnieszkaZaba 55685e5
fix line-too-long
AgnieszkaZaba a3f9c51
Merge branch 'main' into example-stewart
AgnieszkaZaba 6ffbab9
change docstring for test_fig 1
AgnieszkaZaba 02a9dac
Merge branch 'main' into example-stewart
slayoo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
192 changes: 192 additions & 0 deletions
192
examples/PySDM_examples/Kinzer_And_Gunn_1951/table_1_and_2.py
This file contains hidden or 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,192 @@ | ||
| """ | ||
AgnieszkaZaba marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| from [Kinzer & Gunn 1951](https://doi.org/10.1175/1520-0469(1951)008%3C0071:TETATR%3E2.0.CO;2) | ||
| Table1 represents factor 4*pi*radius(1 + F*radius/s_prim) for several drop diameters | ||
| and temperatures (0, 10, 20, 40 deg. Celsius). | ||
| Table2 contains factor D(rho_a - rho_b) for the same temperatures as in Table1 | ||
| but for different relative humidities (from 10% to 100%). | ||
| """ | ||
|
|
||
| table1 = { | ||
| "Diameter [cm]": ( | ||
| 0.01, | ||
| 0.02, | ||
| 0.03, | ||
| 0.04, | ||
| 0.05, | ||
| 0.06, | ||
| 0.07, | ||
| 0.08, | ||
| 0.09, | ||
| 0.1, | ||
| 0.12, | ||
| 0.14, | ||
| 0.16, | ||
| 0.18, | ||
| 0.20, | ||
| 0.22, | ||
| 0.24, | ||
| 0.26, | ||
| 0.28, | ||
| 0.30, | ||
| 0.32, | ||
| 0.34, | ||
| 0.36, | ||
| 0.38, | ||
| 0.4, | ||
| 0.42, | ||
| 0.44, | ||
| ), | ||
| "0 [deg C]": ( | ||
| 0.086, | ||
| 0.29, | ||
| 0.49, | ||
| 0.73, | ||
| 1.01, | ||
| 1.31, | ||
| 1.66, | ||
| 2.03, | ||
| 2.5, | ||
| 2.9, | ||
| 3.9, | ||
| 4.9, | ||
| 6.0, | ||
| 7.3, | ||
| 8.8, | ||
| 10.5, | ||
| 12.4, | ||
| 14.7, | ||
| 17.2, | ||
| 20.1, | ||
| 23.0, | ||
| 27.0, | ||
| 31.0, | ||
| 35.0, | ||
| 0.0, | ||
| 0.0, | ||
| 0.0, | ||
| ), | ||
| "10 [deg C]": ( | ||
| 0.082, | ||
| 0.29, | ||
| 0.48, | ||
| 0.72, | ||
| 0.99, | ||
| 1.29, | ||
| 1.63, | ||
| 2.0, | ||
| 2.4, | ||
| 2.8, | ||
| 3.8, | ||
| 4.8, | ||
| 5.9, | ||
| 7.2, | ||
| 8.5, | ||
| 10.1, | ||
| 12.0, | ||
| 14.2, | ||
| 16.6, | ||
| 19.3, | ||
| 22.0, | ||
| 26.0, | ||
| 30.0, | ||
| 34.0, | ||
| 0.0, | ||
| 0.0, | ||
| 0.0, | ||
| ), | ||
| "20 [deg C]": ( | ||
| 0.079, | ||
| 0.29, | ||
| 0.48, | ||
| 0.71, | ||
| 0.97, | ||
| 1.27, | ||
| 1.61, | ||
| 1.97, | ||
| 2.4, | ||
| 2.8, | ||
| 3.7, | ||
| 4.7, | ||
| 5.8, | ||
| 7.0, | ||
| 8.3, | ||
| 9.9, | ||
| 11.7, | ||
| 13.8, | ||
| 16.0, | ||
| 18.5, | ||
| 21, | ||
| 25, | ||
| 28, | ||
| 32, | ||
| 36, | ||
| 0, | ||
| 0, | ||
| ), | ||
| "30 [deg C]": ( | ||
| 0.079, | ||
| 0.28, | ||
| 0.47, | ||
| 0.7, | ||
| 0.96, | ||
| 1.25, | ||
| 1.58, | ||
| 1.94, | ||
| 2.3, | ||
| 2.7, | ||
| 3.6, | ||
| 4.6, | ||
| 5.7, | ||
| 6.9, | ||
| 8.1, | ||
| 9.6, | ||
| 11.3, | ||
| 13.3, | ||
| 15.4, | ||
| 17.8, | ||
| 21, | ||
| 24, | ||
| 27, | ||
| 31, | ||
| 35, | ||
| 39, | ||
| 0, | ||
| ), | ||
| "40 [deg C]": ( | ||
| 0.073, | ||
| 0.28, | ||
| 0.47, | ||
| 0.69, | ||
| 0.94, | ||
| 1.24, | ||
| 1.55, | ||
| 1.91, | ||
| 2.3, | ||
| 2.7, | ||
| 3.6, | ||
| 4.5, | ||
| 5.6, | ||
| 6.8, | ||
| 8.0, | ||
| 9.4, | ||
| 11.0, | ||
| 12.8, | ||
| 14.9, | ||
| 17.2, | ||
| 20, | ||
| 23, | ||
| 26, | ||
| 29, | ||
| 33, | ||
| 37, | ||
| 0, | ||
| ), | ||
| } | ||
|
|
||
| table2 = { | ||
| "relative humidity [percent]": (10, 20, 30, 40, 50, 60, 70, 80, 90, 100), | ||
| "0 [deg C]": (0.61, 0.54, 0.48, 0.41, 0.34, 0.27, 0.2, 0.135, 0.067, 0), | ||
| "20 [deg C]": (1.47, 1.29, 1.12, 0.95, 0.78, 0.63, 0.46, 0.31, 0.159, 0), | ||
| "30 [deg C]": (2.06, 1.79, 1.55, 1.32, 1.09, 0.86, 0.64, 0.42, 0.21, 0), | ||
| "40 [deg C]": (2.68, 2.36, 2.05, 1.75, 1.45, 1.15, 0.85, 0.56, 0.28, 0), | ||
| } | ||
This file contains hidden or 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,7 @@ | ||
| """ | ||
| based on Stewart 1975 (J. Geophys. Res.) | ||
| https://doi.org/10.1029/JC080i009p01133 | ||
|
|
||
| fig_1.ipynb: | ||
| .. include:: ./fig_1.ipynb.badges.md | ||
| """ |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.