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

Bugfix CATKEVerticalDiffusivity locator functions + other fixes #3090

Closed
wants to merge 60 commits into from

Conversation

glwagner
Copy link
Member

@glwagner glwagner commented Apr 29, 2023

Plus fixing vertically implicit diffusion for partial cells and a few other things.

Closes #3064
Closes #3047

@navidcy
Copy link
Collaborator

navidcy commented Apr 29, 2023

How about the tests that fail? Wanna work together to get them done?

Manifest.toml Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

add back Manifest?

Copy link
Member Author

Choose a reason for hiding this comment

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

yes

@navidcy
Copy link
Collaborator

navidcy commented Apr 29, 2023

patch release please

@navidcy navidcy changed the title Bugfix CATKEVerticalDiffusivity locator functions? Bugfix CATKEVerticalDiffusivity locator functions + other fixes Apr 30, 2023
@navidcy navidcy added performance 🏍️ So we can get the wrong answer even faster immersed boundaries ⛰️ Less Ocean, more anigans labels Apr 30, 2023
@glwagner
Copy link
Member Author

How about the tests that fail? Wanna work together to get them done?

yes, that's unfortunate, let's!

@navidcy
Copy link
Collaborator

navidcy commented Apr 30, 2023

perhaps test fail because there is no manifest and different KA/CUDA/whatnot versions are being installed.

@glwagner
Copy link
Member Author

glwagner commented May 2, 2023

It's less sensitive to resolution with the fix. Here's some boundary layer solutions at 2, 8, and 16m resolution.

variable_Pr_conv_adj_6_hour_suite_assessment

variable_Pr_conv_adj_72_hour_suite_assessment

@glwagner glwagner closed this May 26, 2023
glwagner added a commit that referenced this pull request May 30, 2023
glwagner added a commit that referenced this pull request Sep 6, 2023
…formulation + other fixes (#3122)

* Reorganize immersed boundary implementation + Field for bottom_height

* Better comment in set!

* Update manifest

* Move around imports

* Update windy convection validation

* More sophisticated windy convection

* Fix CATKE problems with tuples

* Better abstraction than truefunc and cosmetic change to conditional operation

* Cosmetic change to field

* Minor change to conditional fluxes

* Fix immersed reductions so they dont evaluate inactive nodes

* Formatting

* Extend grid fitted functions to all IBG

* Cosmetics

* Improve height above bottom and depth

* CATKE improvements for bottom boundary layers

* Improve ri-based for immersed boundaries

* Cosmetics for vertically implicit diffusion

* Fix show

* Update to homogeneous windy convection

* Maybe fix immersed boundaries with Field bottom-height

* Simplify via adapt

* Simpler reductions for bottom_height

* Interior to parent

* Update src/Fields/field.jl

* Update src/Fields/field.jl

Co-authored-by: Navid C. Constantinou <navidcy@users.noreply.github.com>

* Use max in mixing length

* Add output for ZeroField

* Better JLD2 output writer

* Add backward compatibility for FieldTimeSeries

* Fix bug in entrainment diffusivity for ri-based

* Cell centered dissipation length

* Bug in vertically-implicit diffusion?

* Cosmetic improvements

* Fix vertically implicit solver for general grids plus better notation

* Cosmetics

* Hmm

* Add missing import for CATKE

* Add tests

* More readable

* Help readability in ri-based diffusivity

* Dont test RiBased generically

* add note about convention in BatchedTridiagonalSolver doc

* clarifications

* add remark about different notation in Press

* clarifications

* minor beautification tweaks

* Add back Manifest from main

* Delete function tridiagonal solver tests

* New numerics, new defaults

* Implement time-smoothing of the buoyancy flux

* fix doctest

* Fix sign error in explicit dissipation

* Fix dissipation call signature and better name for dissipation rate

* bugfix

* Refactor CATKE parameters

* Fix GPU errors

* Updates

* Bugfix

* Use precise TKE terms

* Commit to nonconservative TKE equation but add comments

* Update free parameters and add comments

* Go back to conservative formulation

* New defaults based on defaults in #3090

* Fix shear production signature

* Bump convective entrainment parameter

* Change heterogeneous windy convection to an upwelling example

* Overhaul baroclinic adjustment example

* Remove messages during `record`

* Upwelling validation tests

* Clean up batched tridiagonal solver and vertically implicit solver

* Fix bug in batched tridiagonal solver

* Try to fix multi region immersed boundary issue

* Hopefully fix immersed boundary grid constructor

* Another fix

* add catke preprint

* remove warning; add ref to catke preprint

* some code cleanup

* Update src/TurbulenceClosures/vertically_implicit_diffusion_solver.jl

Co-authored-by: Navid C. Constantinou <navidcy@users.noreply.github.com>

* Refactor unit tests

* Generalize regridding for lat-lon

* Add newline

* Update test_turbulence_closures.jl

* rework IBG and MRG

* Update src/TurbulenceClosures/vertically_implicit_diffusion_solver.jl

* small bugfix

* remove multiregion ibg with arrays for the moment

* bugfix

* little cleaner

* fixed tests

* see what the error is

* dummy commit

* Allow tke and tracer diffusivity to be limited indepedent of viscosity

* small bugfix

* why would this specifically not work?

* test_broken for broken tests

* other broken tests

* Update Project.toml

---------

Co-authored-by: Navid C. Constantinou <navidcy@users.noreply.github.com>
Co-authored-by: Simone Silvestri <33547697+simone-silvestri@users.noreply.github.com>
Co-authored-by: Simone Silvestri <silvestri.simone0@gmail.com>
siddharthabishnu pushed a commit that referenced this pull request Sep 11, 2023
…formulation + other fixes (#3122)

* Reorganize immersed boundary implementation + Field for bottom_height

* Better comment in set!

* Update manifest

* Move around imports

* Update windy convection validation

* More sophisticated windy convection

* Fix CATKE problems with tuples

* Better abstraction than truefunc and cosmetic change to conditional operation

* Cosmetic change to field

* Minor change to conditional fluxes

* Fix immersed reductions so they dont evaluate inactive nodes

* Formatting

* Extend grid fitted functions to all IBG

* Cosmetics

* Improve height above bottom and depth

* CATKE improvements for bottom boundary layers

* Improve ri-based for immersed boundaries

* Cosmetics for vertically implicit diffusion

* Fix show

* Update to homogeneous windy convection

* Maybe fix immersed boundaries with Field bottom-height

* Simplify via adapt

* Simpler reductions for bottom_height

* Interior to parent

* Update src/Fields/field.jl

* Update src/Fields/field.jl

Co-authored-by: Navid C. Constantinou <navidcy@users.noreply.github.com>

* Use max in mixing length

* Add output for ZeroField

* Better JLD2 output writer

* Add backward compatibility for FieldTimeSeries

* Fix bug in entrainment diffusivity for ri-based

* Cell centered dissipation length

* Bug in vertically-implicit diffusion?

* Cosmetic improvements

* Fix vertically implicit solver for general grids plus better notation

* Cosmetics

* Hmm

* Add missing import for CATKE

* Add tests

* More readable

* Help readability in ri-based diffusivity

* Dont test RiBased generically

* add note about convention in BatchedTridiagonalSolver doc

* clarifications

* add remark about different notation in Press

* clarifications

* minor beautification tweaks

* Add back Manifest from main

* Delete function tridiagonal solver tests

* New numerics, new defaults

* Implement time-smoothing of the buoyancy flux

* fix doctest

* Fix sign error in explicit dissipation

* Fix dissipation call signature and better name for dissipation rate

* bugfix

* Refactor CATKE parameters

* Fix GPU errors

* Updates

* Bugfix

* Use precise TKE terms

* Commit to nonconservative TKE equation but add comments

* Update free parameters and add comments

* Go back to conservative formulation

* New defaults based on defaults in #3090

* Fix shear production signature

* Bump convective entrainment parameter

* Change heterogeneous windy convection to an upwelling example

* Overhaul baroclinic adjustment example

* Remove messages during `record`

* Upwelling validation tests

* Clean up batched tridiagonal solver and vertically implicit solver

* Fix bug in batched tridiagonal solver

* Try to fix multi region immersed boundary issue

* Hopefully fix immersed boundary grid constructor

* Another fix

* add catke preprint

* remove warning; add ref to catke preprint

* some code cleanup

* Update src/TurbulenceClosures/vertically_implicit_diffusion_solver.jl

Co-authored-by: Navid C. Constantinou <navidcy@users.noreply.github.com>

* Refactor unit tests

* Generalize regridding for lat-lon

* Add newline

* Update test_turbulence_closures.jl

* rework IBG and MRG

* Update src/TurbulenceClosures/vertically_implicit_diffusion_solver.jl

* small bugfix

* remove multiregion ibg with arrays for the moment

* bugfix

* little cleaner

* fixed tests

* see what the error is

* dummy commit

* Allow tke and tracer diffusivity to be limited indepedent of viscosity

* small bugfix

* why would this specifically not work?

* test_broken for broken tests

* other broken tests

* Update Project.toml

---------

Co-authored-by: Navid C. Constantinou <navidcy@users.noreply.github.com>
Co-authored-by: Simone Silvestri <33547697+simone-silvestri@users.noreply.github.com>
Co-authored-by: Simone Silvestri <silvestri.simone0@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug 🐞 Even a perfect program still has bugs immersed boundaries ⛰️ Less Ocean, more anigans performance 🏍️ So we can get the wrong answer even faster
Projects
None yet
3 participants