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.

Sign up for GitHub

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

Jump to bottom

Change reference state to MSE. #1215

Merged
merged 1 commit into from
Jun 28, 2022
+360 −136
Merged

Change reference state to MSE. #1215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@ CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884"
CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b"
Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94"
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838"
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
LambertW = "984bce1d-4616-540c-a9ee-88d1112d94c9"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
OperatorFlux = "47cfafe2-3833-4da3-8183-ce14c2b92cbd"
RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
StochasticDiffEq = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0"
Expand All @@ -26,12 +29,15 @@ CLIMAParameters = "0.4"
ClimaCore = "0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.10"
CloudMicrophysics = "0.5"
Dierckx = "0.5"
DiffEqBase = "6.89.0"
Distributions = "0.25"
DocStringExtensions = "0.8"
FastGaussQuadrature = "0.4"
Flux = "0.12, 0.13"
KernelAbstractions = "0.7"
LambertW = "0.4"
OperatorFlux = "0.1"
RootSolvers = "0.2, 0.3"
StaticArrays = "1.2"
StatsBase = "0.33"
StochasticDiffEq = "6.41"
Expand Down
2 changes: 2 additions & 0 deletions docs/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
DocumenterCitations = "daee34ce-89f3-4625-b898-19384cb65244"
Glob = "c27321d9-0574-5035-807b-f59d2c89b15c"
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
Expand Down
21 changes: 15 additions & 6 deletions driver/dycore.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,19 +198,24 @@ function compute_ref_state!(
ts_g,
) where {PS}
FT = eltype(grid)
kf_surf = TC.kf_surface(grid)
qtg = TD.total_specific_humidity(param_set, ts_g)
θ_liq_ice_g = TD.liquid_ice_pottemp(param_set, ts_g)
Pg = TD.air_pressure(param_set, ts_g)
Φ = TC.geopotential(param_set, grid.zf[kf_surf].z)
mse_g = TD.moist_static_energy(param_set, ts_g, Φ)

# We are integrating the log pressure so need to take the log of the
# surface pressure
logp = log(Pg)

# Form a right hand side for integrating the hydrostatic equation to
# determine the reference pressure
function rhs(logp, u, z)
function minus_inv_scale_height(logp, u, z)
p_ = exp(logp)
ts = TD.PhaseEquil_pθq(param_set, p_, θ_liq_ice_g, qtg)
grav = FT(CPP.grav(param_set))
Φ = TC.geopotential(param_set, z)
h = TC.enthalpy(mse_g, Φ)
ts = TC.PhaseEquil_phq(param_set, p_, h, qtg)
R_m = TD.gas_constant_air(param_set, ts)
T = TD.air_temperature(param_set, ts)
return -FT(CPP.grav(param_set)) / (T * R_m)
Expand All @@ -219,7 +224,7 @@ function compute_ref_state!(
# Perform the integration
z_span = (grid.zmin, grid.zmax)
@info "z_span = $z_span"
prob = ODE.ODEProblem(rhs, logp, z_span)
prob = ODE.ODEProblem(minus_inv_scale_height, logp, z_span)
sol = ODE.solve(prob, ODE.Tsit5(), reltol = 1e-12, abstol = 1e-12)

parent(p_f) .= sol.(vec(grid.zf))
Expand All @@ -230,12 +235,16 @@ function compute_ref_state!(

# Compute reference state thermodynamic profiles
@inbounds for k in TC.real_center_indices(grid)
ts = TD.PhaseEquil_pθq(param_set, p_c[k], θ_liq_ice_g, qtg)
Φ = TC.geopotential(param_set, grid.zc[k].z)
h = TC.enthalpy(mse_g, Φ)
ts = TC.PhaseEquil_phq(param_set, p_c[k], h, qtg)
ρ_c[k] = TD.air_density(param_set, ts)
end

@inbounds for k in TC.real_face_indices(grid)
ts = TD.PhaseEquil_pθq(param_set, p_f[k], θ_liq_ice_g, qtg)
Φ = TC.geopotential(param_set, grid.zf[k].z)
h = TC.enthalpy(mse_g, Φ)
ts = TC.PhaseEquil_phq(param_set, p_f[k], h, qtg)
ρ_f[k] = TD.air_density(param_set, ts)
end
return nothing
Expand Down
4 changes: 4 additions & 0 deletions integration_tests/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884"
CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94"
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
DiffEqNoiseProcess = "77a26b50-5914-5dd7-bc55-306e6241c503"
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838"
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
Glob = "c27321d9-0574-5035-807b-f59d2c89b15c"
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
LambertW = "984bce1d-4616-540c-a9ee-88d1112d94c9"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
Expand Down Expand Up @@ -51,12 +53,14 @@ CLIMAParameters = "0.4"
ClimaCore = "0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.10"
CloudMicrophysics = "0.5"
Dierckx = "0.5"
DiffEqBase = "6.89.0"
Distributions = "0.25"
DocStringExtensions = "0.8"
FastGaussQuadrature = "0.4"
Flux = "0.12, 0.13"
Glob = "1.3"
JSON = "0.21"
KernelAbstractions = "0.7"
LambertW = "0.4"
NCDatasets = "0.11, 0.12"
OperatorFlux = "0.1"
Expand Down
4 changes: 4 additions & 0 deletions perf/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884"
CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b"
Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94"
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
DiffEqNoiseProcess = "77a26b50-5914-5dd7-bc55-306e6241c503"
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838"
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
Expand Down Expand Up @@ -45,11 +47,13 @@ CLIMAParameters = "0.4"
ClimaCore = "0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.10"
CloudMicrophysics = "0.5"
Dierckx = "0.5"
DiffEqBase = "6.89.0"
DiffEqNoiseProcess = "5.9.0"
Distributions = "0.25"
FastGaussQuadrature = "0.4"
Flux = "0.12, 0.13"
JSON = "0.21"
KernelAbstractions = "0.7"
NCDatasets = "0.11, 0.12"
OrderedCollections = "1.4"
OrdinaryDiffEq = "5.63, 6"
Expand Down
Loading