Skip to content

Commit

Permalink
Merge pull request #512 from CliMA/aj/more_r_eff
Browse files Browse the repository at this point in the history 
Add r_eff overwirte based on ClimaParams
  • Loading branch information
@trontrytel
trontrytel authored Feb 11, 2025
2 parents 2d9b6e3 + 4bc4711 commit 0c63125
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "CloudMicrophysics"
uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b"
authors = ["Climate Modeling Alliance"]
version = "0.22.7"
version = "0.22.8"

[deps]
ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
Expand All @@ -22,7 +22,7 @@ MLJ = "add582a8-e3ab-11e8-2d5e-e98b27df1bc7"
EmulatorModelsExt = ["DataFrames", "MLJ"]

[compat]
ClimaParams = "0.10"
ClimaParams = "0.10.19"
DataFrames = "1.6"
DocStringExtensions = "0.8, 0.9"
ForwardDiff = "0.10"
Expand Down
4 changes: 2 additions & 2 deletions src/CloudDiagnostics.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,10 @@ end
Returns a constant assumed effective radius for clouds
"""
function effective_radius_const(cloud_params::CMP.CloudLiquid{FT}) where {FT}
return FT(14e-6) # TODO grab it from parameters
return cloud_params.r_eff
end
function effective_radius_const(cloud_params::CMP.CloudIce{FT}) where {FT}
return FT(25e-6)
return cloud_params.r_eff
end

end # end module
1 change: 1 addition & 0 deletions test/Project.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"

[compat]
ClimaParams = "0.10.19"
KernelAbstractions = "0.9"
MLJFlux = "0.4"
Optim = "<1.9.3"

2 comments on commit 0c63125

@trontrytel
Copy link
Member Author

Choose a reason for hiding this comment

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

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

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

Registration pull request created: JuliaRegistries/General/124863

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.22.8 -m "<description of version>" 0c63125535458c1209c5d215b07944ef25eebbee
git push origin v0.22.8

Please sign in to comment.