Skip to content
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

Add advective edmf #2213

Merged
merged 1 commit into from
Oct 19, 2023
Merged

Add advective edmf #2213

merged 1 commit into from
Oct 19, 2023

Conversation

szy21
Copy link
Member

@szy21 szy21 commented Oct 8, 2023

Purpose

Adds advective form EDMF. It uses h_tot and q_tot as prognostic variables. Currently we didn't add any other tracers.

We use ConstantCoefficient for entrainment. For detrainment, I changed the current ConstantCoefficient to BOverW, which is something like w * (coeff1 + coeff2 * b/w^2), so we can do either the old constant coefficient or the new w * (b/w^2 + const) detrainment. I think this is better as we don't need to include too many options. I wanted to change the names of current entrainment and detrainment closures as it is somewhat confusing. For example, ConstantCoefficient means const * w/z for entrainment, but const * w for detrainment. I will do that after this PR.

To-do

Content


  • I have read and checked the items on the review checklist.

toml/edmfx_box.toml Outdated Show resolved Hide resolved
@szy21 szy21 force-pushed the zs/advective_edmf branch from 259e876 to d48489b Compare October 16, 2023 23:31
@szy21 szy21 force-pushed the zs/advective_edmf branch 2 times, most recently from bac57de to fa8a633 Compare October 17, 2023 04:20
@szy21 szy21 changed the title try advective edmf Add advective edmf Oct 17, 2023
@szy21 szy21 requested a review from trontrytel October 17, 2023 04:25
@@ -723,6 +723,58 @@ steps:
julia --color=yes --project=examples examples/hybrid/driver.jl
--config_file $CONFIG_PATH/sphere_baroclinic_wave_rhoe_equilmoist_edmfx.yml
artifact_paths: "sphere_baroclinic_wave_rhoe_equilmoist_edmfx/*"
soft_fail: true
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know why I broke this sphere flux form edmfx :( But we will remove it anyway.

@szy21 szy21 force-pushed the zs/advective_edmf branch 2 times, most recently from 73d6da7 to d9f6a31 Compare October 17, 2023 16:43
@szy21 szy21 force-pushed the zs/advective_edmf branch 2 times, most recently from 1c14194 to 72ccded Compare October 17, 2023 23:01
Copy link
Member

@trontrytel trontrytel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good luck!

@szy21 szy21 force-pushed the zs/advective_edmf branch 2 times, most recently from 43ae7a5 to a34d052 Compare October 18, 2023 22:06
@szy21 szy21 force-pushed the zs/advective_edmf branch from a34d052 to c761d97 Compare October 18, 2023 22:41
@szy21
Copy link
Member Author

szy21 commented Oct 18, 2023

bors r+

@bors
Copy link
Contributor

bors bot commented Oct 19, 2023

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@bors bors bot merged commit 76be7f0 into main Oct 19, 2023
7 of 8 checks passed
@bors bors bot deleted the zs/advective_edmf branch October 19, 2023 00:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants