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

Update to ClimaAtmos v0.15.1 #306

Merged
merged 1 commit into from
Jun 27, 2023
Merged

Update to ClimaAtmos v0.15.1 #306

merged 1 commit into from
Jun 27, 2023

Conversation

valeriabarra
Copy link
Member

@valeriabarra valeriabarra commented May 11, 2023

Purpose

This PR attempts at updating the Coupler again, with the latest ClimaAtmos release: v0.15.1

Closes #308
Closes #231

Edit: we needed to update Insolation.jl in ClimaAtmos again (see this blocking PR CliMA/ClimaAtmos.jl#1674). Hence, once that is merged, we will tag new ClimaAtmos releases and then update the Coupler to that directly

To-do

  • Update compat entries in all environment
  • Update ClimaAtmos to v0.14.1
  • Apply API changes from ClimaLSM
  • Apply API changes from ClimaComms
  • Apply API changes from ClimaAtmos v0.14.1
  • Update ClimaAtmos to v0.15.1 and apply necessary API changes

Content

  • Updated compat entries in all environment

QA:

  • conservation satisfied
Screen Shot 2023-06-26 at 2 51 57 PM
  • AMIP physical run looks reasonable (this Atmos update solved the imprinting issue)
Screen Shot 2023-06-26 at 2 52 42 PM
  • no huge performance gains

Note

  • this is using ClimaAtmos 0.15.1, repo-rev = "e82764b9229629a4b12954ae8420e54f81a5f321", since we had to implement a fix that allowed prescription of surface fluxes from the coupler. We will update this for the ClimaAtmos0.15.2 tag during the next release cycle.
    • AssertSurfaceState type fix ClimaAtmos.jl#1803 introduces a fix for SurfaceState type. This is the functionality needed from the commit ClimaCoupler is currently pinned to. @valeriabarra plans to make a patch release of ClimaAtmos this week (10 July 2023) so we no longer need to pin to a specific commit.

Review checklist

I have:

In the Content, I have included

  • relevant unit tests, and integration tests,

  • appropriate docstrings on all functions, structs, and modules, and included relevant documentation.

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

@valeriabarra valeriabarra marked this pull request as draft May 11, 2023 02:14
@valeriabarra valeriabarra linked an issue May 15, 2023 that may be closed by this pull request
8 tasks
bors bot added a commit to CliMA/ClimaLand.jl that referenced this pull request May 16, 2023
195: Update Insolation to latest release r=valeriabarra a=valeriabarra

## Purpose 
The purpose of this PR is to update the `compat` entry for Insolation, given its latest release. 

This should fix compatibility issues downstream in the Coupler

## Todo / Related PRs
- [x] This is blocking this Coupler PR CliMA/ClimaCoupler.jl#306

## Content
- Updated Insolation compat entry in the top-level Project.toml file
- Applied necessary API changes


Review checklist

I have:
- followed the codebase contribution guide: https://clima.github.io/ClimateMachine.jl/latest/Contributing/
- followed the style guide: https://clima.github.io/ClimateMachine.jl/latest/DevDocs/CodeStyle/
- followed the documentation policy: https://github.com/CliMA/policies/wiki/Documentation-Policy
- checked that this PR does not duplicate an open PR.

In the Content, I have included 
- relevant unit tests, and integration tests, 
- appropriate docstrings on all functions, structs, and modules, and included relevant documentation.


- [x] I have read and checked the items on the review checklist.


Co-authored-by: Valeria Barra <[email protected]>
Co-authored-by: Charles Kawczynski <[email protected]>
@valeriabarra valeriabarra changed the title Update to ClimaAtmos v0.12.0 Update to ClimaAtmos v0.14.0 May 23, 2023
@valeriabarra valeriabarra force-pushed the valeria/atmos-v0.12 branch 2 times, most recently from 54e4f70 to 74f3f17 Compare May 24, 2023 02:07
@valeriabarra valeriabarra changed the title Update to ClimaAtmos v0.14.0 Update to ClimaAtmos v0.14.1 May 24, 2023
@valeriabarra valeriabarra self-assigned this May 24, 2023
@valeriabarra valeriabarra force-pushed the valeria/atmos-v0.12 branch 4 times, most recently from 71a4d24 to 97dbb84 Compare May 26, 2023 23:20
bors bot added a commit to CliMA/ClimaAtmos.jl that referenced this pull request Jun 16, 2023
1777: Add SurfaceSetup Field case r=valeriabarra a=valeriabarra

## Purpose 
The purpose of this PR is to allow SurfaceSetup to also be a Field. We found that this was needed for the Coupler (see PR #[306](CliMA/ClimaCoupler.jl#306))

Closes #1776 

## Content
- Added another `ifelse` case in `update_surface_conditions!`

Review checklist

I have:
- followed the codebase contribution guide: https://clima.github.io/ClimateMachine.jl/latest/Contributing/
- followed the style guide: https://clima.github.io/ClimateMachine.jl/latest/DevDocs/CodeStyle/
- followed the documentation policy: https://github.com/CliMA/policies/wiki/Documentation-Policy
- checked that this PR does not duplicate an open PR.

In the Content, I have included 
- relevant unit tests, and integration tests, 
- appropriate docstrings on all functions, structs, and modules, and included relevant documentation.


----
- [x] I have read and checked the items on the review checklist.


Co-authored-by: Valeria Barra <[email protected]>
@LenkaNovak LenkaNovak added 🍃 leaf Issue coupled to a PR and removed 🍃 leaf Issue coupled to a PR labels Jun 16, 2023
@LenkaNovak LenkaNovak removed this from the Release of ClimaCoupler v0.0.1 milestone Jun 16, 2023
@valeriabarra valeriabarra force-pushed the valeria/atmos-v0.12 branch 2 times, most recently from 33806d1 to 87cd7a8 Compare June 16, 2023 21:58
@valeriabarra valeriabarra changed the title Update to ClimaAtmos v0.14.1 Update to ClimaAtmos v0.15.0 Jun 16, 2023
@LenkaNovak LenkaNovak changed the title Update to ClimaAtmos v0.15.0 Update to ClimaAtmos v0.15.1 Jun 20, 2023
@LenkaNovak LenkaNovak self-assigned this Jun 21, 2023
@LenkaNovak LenkaNovak marked this pull request as ready for review June 22, 2023 21:17
@LenkaNovak LenkaNovak force-pushed the valeria/atmos-v0.12 branch 2 times, most recently from f8338d1 to b3304e0 Compare June 23, 2023 16:38
Copy link
Member

@juliasloan25 juliasloan25 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! I just had a few comments

.buildkite/pipeline.yml Show resolved Hide resolved
.buildkite/pipeline.yml Outdated Show resolved Hide resolved
.buildkite/pipeline.yml Outdated Show resolved Hide resolved
experiments/AMIP/modular/cli_options.jl Outdated Show resolved Hide resolved
.buildkite/longruns/pipeline.yml Show resolved Hide resolved
Apply ClimaLSM API soil resistance changes

Apply ClimaComms API changes; remove ClimaCommsMPI

Update ClimaAtmos CLI options

Use ClimaAtmos v0.14.1

ClimaAtmos change: rename Y.f.w -> Y.f.u₃

ClimaLSM API change: use make_exp_tendency in place of make_ode_function

Use ClimaComms.CPUDevice()

Remove simulation.is_distributed from Atmos change PR #1634

WIP: Apply changes from surface fluxes rework CA PR #1447

Rebase onto main after PRs #315 & #320

WIP: update to ClimaAtmos surface rework

Co-authored-by: Lenka Novak <[email protected]>

TEMP ONLY: Test CA surface setup fix dev branch

Adapt flux calculation given CA current Surface Setup

Some WIP fixes w/ Lenka

Co-authored-by: Lenka Novak <[email protected]>

CI: Try Float64 for AMIP modular experiment

Increase alloc limit for perf test

Update to ClimaAtmos v0.15.0

conserving, need Atmos #1803

test ci with Atmos fix

ClimaCore up

add refs to TD and CAP

init with 0 atmos fluxes

Atmos-commit dep

perf project

test project

pip

perf Manifest

flame fix

rm idealinsol true

rm idealized insol

increase allocs

rm debug.jl

clean climaatmos_init.jl

race condition fix

make Float64 default for all Buildkites

typo

up julia 1.8.5

up julia 1.8.5

rev

rev

rev eps(FT)
Copy link
Member

@juliasloan25 juliasloan25 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! Could you add a note in the PR description (maybe in the edit) explaining that this PR depends on a specific commit of ClimaAtmos, but that this is only temporary? :)

@LenkaNovak
Copy link
Collaborator

bors r+

@bors
Copy link
Contributor

bors bot commented Jun 27, 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 1df27fe into main Jun 27, 2023
@bors bors bot deleted the valeria/atmos-v0.12 branch June 27, 2023 01:42
mitraA90 pushed a commit to CliMA/ClimaLand.jl that referenced this pull request Dec 22, 2023
195: Update Insolation to latest release r=valeriabarra a=valeriabarra

## Purpose 
The purpose of this PR is to update the `compat` entry for Insolation, given its latest release. 

This should fix compatibility issues downstream in the Coupler

## Todo / Related PRs
- [x] This is blocking this Coupler PR CliMA/ClimaCoupler.jl#306

## Content
- Updated Insolation compat entry in the top-level Project.toml file
- Applied necessary API changes


Review checklist

I have:
- followed the codebase contribution guide: https://clima.github.io/ClimateMachine.jl/latest/Contributing/
- followed the style guide: https://clima.github.io/ClimateMachine.jl/latest/DevDocs/CodeStyle/
- followed the documentation policy: https://github.com/CliMA/policies/wiki/Documentation-Policy
- checked that this PR does not duplicate an open PR.

In the Content, I have included 
- relevant unit tests, and integration tests, 
- appropriate docstrings on all functions, structs, and modules, and included relevant documentation.


- [x] I have read and checked the items on the review checklist.


Co-authored-by: Valeria Barra <[email protected]>
Co-authored-by: Charles Kawczynski <[email protected]>
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 the Coupler to use ClimaAtmos v0.15.0 Use updated ClimaAtmos cache
3 participants