Skip to content

Commit

Permalink
Merge #51
Browse files Browse the repository at this point in the history
51: Add some planet parameters r=charleskawczynski a=charleskawczynski

These parameters are from "Large-eddy simulation in an anelastic framework with closed water and entropy balances" (Pressel et. al.), Table 1. This is needed for [TurbulenceConvection.jl's #43](CliMA/TurbulenceConvection.jl#43).

Co-authored-by: Charles Kawczynski <[email protected]>
  • Loading branch information
bors[bot] and charleskawczynski authored Jul 27, 2021
2 parents 8daafc0 + 3c60508 commit 4106c0f
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "CLIMAParameters"
uuid = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
authors = ["Charles Kawczynski <[email protected]>"]
version = "0.1.12"
version = "0.1.13"

[deps]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
3 changes: 3 additions & 0 deletions docs/src/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ Planet.e_int_v0
Planet.e_int_i0
Planet.press_triple
Planet.surface_tension_coeff
Planet.entropy_water_vapor
Planet.entropy_dry_air
Planet.entropy_reference_temperature
Planet.ρ_ocean
Planet.cp_ocean
Planet.planet_radius
Expand Down
20 changes: 20 additions & 0 deletions src/Planet/Planet.jl
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ export molmass_dryair,
e_int_i0,
press_triple,
surface_tension_coeff,
entropy_dry_air,
entropy_water_vapor,
entropy_reference_temperature,
ρ_ocean,
cp_ocean,
planet_radius,
Expand Down Expand Up @@ -114,6 +117,23 @@ function e_int_i0 end
function press_triple end
""" Surface tension coefficient of water (J/m2) """
function surface_tension_coeff end
""" Surface tension coefficient of water (J/m2) """
function surface_tension_coeff end

#=
The standard entropy value for dry air is computed based
on the reference data given in Lemmon et al. [2000], and
the standard entropy value for water vapor is based on the
reference data given in Chase [1998].
=#

""" Entropy of dry air J / (kg K)"""
function entropy_dry_air end
""" Entropy of water vapor J / (kg K)"""
function entropy_water_vapor end
""" Entropy reference temperature (K)"""
function entropy_reference_temperature end


# Properties of sea water
""" Reference density sea water (kg/m``^3``) """
Expand Down
4 changes: 4 additions & 0 deletions src/Planet/planet_parameters.jl
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ Planet.e_int_i0(ps::AbstractEarthParameterSet) = Planet.LH_f0(ps)
Planet.press_triple(ps::AbstractEarthParameterSet) = 611.657
Planet.surface_tension_coeff(ps::AbstractEarthParameterSet) = 0.072

Planet.entropy_dry_air(ps::AbstractEarthParameterSet) = 6864.8
Planet.entropy_water_vapor(ps::AbstractEarthParameterSet) = 10513.6
Planet.entropy_reference_temperature(ps::AbstractEarthParameterSet) = 298.15

# Properties of sea water
Planet.ρ_ocean(ps::AbstractEarthParameterSet) = 1.035e3
Planet.cp_ocean(ps::AbstractEarthParameterSet) = 3989.25
Expand Down

2 comments on commit 4106c0f

@charleskawczynski
Copy link
Member

Choose a reason for hiding this comment

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

@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/41651

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.1.13 -m "<description of version>" 4106c0fe427b30bd8098e3b0ec5b1016b1bff9c6
git push origin v0.1.13

Please sign in to comment.