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

transition to using new bucket model version #117

Merged
merged 1 commit into from
Sep 16, 2022
Merged

Conversation

kmdeck
Copy link
Contributor

@kmdeck kmdeck commented Sep 8, 2022

PULL REQUEST

Purpose and Content

This PR updates the coupler driver file and other helper files so that the coupled runs work with the new version of the bucket model (with snow, and with a multi layer heat equation).

To do: followup on CliMA/ClimaCore.jl#943

Benefits and Risks

The benefit of this is that our AMIP model will be slightly more realistic.

Linked Issues

(Provide references to any link issues. Use closes #issuenum to automatically close an open issue)

PR Checklist

  • This PR has a corresponding issue OR is linked to an SDI.
  • I have followed CliMA's codebase contribution and style guidelines OR N/A.
  • I have followed CliMA's documentation policy.
  • I have checked all issues and PRs and I certify that this PR does not duplicate an open PR.
  • I linted my code on my local machine prior to submission OR N/A.
  • Unit tests are included OR N/A.
  • Code used in an integration test OR N/A.
  • All tests ran successfully on my local machine OR N/A.
  • All classes, modules, and function contain docstrings OR N/A.
  • Documentation has been added/updated OR N/A.

@kmdeck kmdeck mentioned this pull request Sep 12, 2022
10 tasks
@kmdeck kmdeck changed the title began transition to using new bucket model version transition to using new bucket model version Sep 13, 2022
anomaly = true
hs_sfc = false
Y.bucket.T_sfc = map(coords) do coord
Y.bucket.T = map(coords.subsurface) do coord
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@LenkaNovak right now the anomaly is 0 - do we want to change this?

@kmdeck kmdeck marked this pull request as ready for review September 14, 2022 21:35
@kmdeck
Copy link
Contributor Author

kmdeck commented Sep 14, 2022

FWIW, longer runs seem to run into this now (at ~7 days)

maxiter reached in saturation_adjustment:
Method=NewtonsMethod, e_int=-5.53005e6, ρ=-0.0005846755, q_tot=0.0, T=-7435.205, maxiter=8, tol=71.7506
ERROR: TaskFailedException

Copy link
Collaborator

@LenkaNovak LenkaNovak left a comment

Choose a reason for hiding this comment

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

Looks good. Only a small comment left in the code. Thanks!

@@ -47,11 +47,12 @@ function calculate_surface_fluxes_atmos_grid!(integrator, info_sfc)
FT = eltype(integrator.u.c.ρ)
thermo_params = CAP.thermodynamics_params(integrator.p.params)
surface_flux_params = CAP.surface_fluxes_params(integrator.p.params)
uₕ_int = Geometry.UVVector.(Spaces.level(Y.c.uₕ, 1))
Copy link
Collaborator

Choose a reason for hiding this comment

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

Doesn't this allocate more than previously?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ill revert it back

issue with atmos u

bugs fixed but not well

formatting and should run, psnow zero

swap boundary space for horizontal space

updated utils

revert change cli

typo

cleanup

review comment
@kmdeck
Copy link
Contributor Author

kmdeck commented Sep 16, 2022

bors r+

@bors
Copy link
Contributor

bors bot commented Sep 16, 2022

@bors bors bot merged commit 176f1be into main Sep 16, 2022
@bors bors bot deleted the enhanced_bucket_amip branch September 16, 2022 18:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update coupler AMIP files to work with newer version of Bucket model
2 participants