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

Move entr and detr to separate file #100

Merged
merged 1 commit into from
Aug 10, 2021
Merged

Conversation

yairchn
Copy link
Member

@yairchn yairchn commented Aug 9, 2021

This PR moves the computation of entrainment and detrainment to a separate file - while breaking of the non dimensional functions so that they could replaced by NN or any time of ML in the future.

Both this PR and the the recent changes to pressure should have all parameters read of CliMA parameters in the future

@yairchn yairchn force-pushed the yc/add_entr_detr branch 3 times, most recently from 3fa8046 to 3c0d79d Compare August 10, 2021 03:06
@yairchn yairchn closed this Aug 10, 2021
@yairchn yairchn force-pushed the yc/add_entr_detr branch 2 times, most recently from a9a86ee to cbd3d5d Compare August 10, 2021 18:18
src/types.jl Outdated Show resolved Hide resolved
Copy link
Member

@charleskawczynski charleskawczynski left a comment

Choose a reason for hiding this comment

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

After deleting the block of commented code, I think this looks ready to go.

WIP
WIP

add pressure closure file

cleanups in entrainment

add entr_detr, incomplete

move nh_pressure to closures

move nh_pressure to closures

update tables

running with entr in closures

running with entr in closures

working with entr_detr

apply formatter

update tables

resolve conflicts with yc/call_press_closure

remove cleanup_covariance

add entr_detr_model + merge turb entr + cleanup

fix bug

apply formatter

WIP

WIP

add pressure closure file

cleanups in entrainment

add entr_detr, incomplete

move nh_pressure to closures

move nh_pressure to closures

update tables

running with entr in closures

running with entr in closures

working with entr_detr

apply formatter

update tables

resolve conflicts with yc/call_press_closure

remove cleanup_covariance

add entr_detr_model + merge turb entr + cleanup

fix bug

apply formatter

update tables
@charleskawczynski
Copy link
Member

bors r+

bors bot added a commit that referenced this pull request Aug 10, 2021
100: Move entr and detr to separate file  r=charleskawczynski a=yairchn

This PR moves the computation of entrainment and detrainment to a separate file  - while breaking of the non dimensional functions so that they could replaced by NN or any time of ML in the future.

Both this PR and the the recent changes to pressure should have all parameters read of CliMA parameters in the future 

103: set qt and h in extrap buoyancy to clear values r=charleskawczynski a=yairchn

First step to handle the definition of h and qt in extra buoyancy part in the updrafts 

Co-authored-by: yairchn <yairchn@caltech.edu>
@bors
Copy link
Contributor

bors bot commented Aug 10, 2021

This PR was included in a batch that was canceled, it will be automatically retried

@charleskawczynski
Copy link
Member

bors r-

@bors
Copy link
Contributor

bors bot commented Aug 10, 2021

Canceled.

@charleskawczynski charleskawczynski merged commit 0d51c51 into main Aug 10, 2021
@bors bors bot deleted the yc/add_entr_detr branch August 10, 2021 21:46
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.

2 participants