Skip to content

Commit

Permalink
Merge pull request #324 from CliMA/aj/slow_docs
Browse files Browse the repository at this point in the history
Bring the docs up to speed
  • Loading branch information
trontrytel authored Feb 15, 2024
2 parents a3fe665 + 999f005 commit 997ec7f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions parcel/Immersion_Freezing.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import CLIMAParameters as CP

# definition of the ODE problem for parcel model
include(joinpath(pkgdir(CM), "parcel", "parcel.jl"))
FT = Float64
FT = Float32
# get free parameters
tps = TD.Parameters.ThermodynamicsParameters(FT)
aps = CMP.AirProperties(FT)
Expand All @@ -26,7 +26,7 @@ r₀ = FT(1e-6)
p₀ = FT(800 * 1e2)
T₀ = FT(251)
qᵥ = FT(8.1e-4)
qₗ = Nₗ * 4 / 3 * FT(π) * r₀^3 * ρₗ / 1.2 # 1.2 should be ρₐ
qₗ = Nₗ * 4 / 3 * FT(π) * r₀^3 * ρₗ / FT(1.2) # 1.2 should be ρₐ
qᵢ = FT(0)
x_sulph = FT(0.01)

Expand Down
4 changes: 2 additions & 2 deletions parcel/Jensen_et_al_2022.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import CloudMicrophysics.Parameters as CMP
# definition of the ODE problem for parcel model
include(joinpath(pkgdir(CM), "parcel", "parcel.jl"))

FT = Float64
FT = Float32

# Get free parameters
tps = TD.Parameters.ThermodynamicsParameters(FT)
Expand Down Expand Up @@ -42,7 +42,7 @@ x_sulph = FT(0)
# saturation and partial pressure
eₛ = TD.saturation_vapor_pressure(tps, T₀, TD.Liquid())
qᵥ = ϵₘ / (ϵₘ - 1 + 1 / cᵥ₀)
qₗ = Nₗ * 4 / 3 * FT(π) * r₀^3 * ρₗ / 1.2
qₗ = Nₗ * 4 / 3 * FT(π) * r₀^3 * ρₗ / FT(1.2)
qᵢ = FT(0)
q = TD.PhasePartition(qᵥ + qₗ + qᵢ, qₗ, qᵢ)
R_a = TD.gas_constant_air(tps, q)
Expand Down
2 changes: 1 addition & 1 deletion parcel/Liquid_only.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import CLIMAParameters as CP
# definition of the ODE problem for parcel model
include(joinpath(pkgdir(CM), "parcel", "parcel.jl"))

FT = Float64
FT = Float32

# Get free parameters
tps = TD.Parameters.ThermodynamicsParameters(FT)
Expand Down
2 changes: 1 addition & 1 deletion parcel/Tully_et_al_2023.jl
Original file line number Diff line number Diff line change
Expand Up @@ -203,4 +203,4 @@ function Tully_et_al_2023(FT)
end
MK.save("cirrus_box.svg", fig)
end
Tully_et_al_2023(Float64)
Tully_et_al_2023(Float32)
6 changes: 3 additions & 3 deletions parcel/parcel.jl
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function parcel_model(dY, Y, p, t)
N_aer = Y[7] # number concentration of interstitial aerosol
N_liq = Y[8] # number concentration of existing water droplets
N_ice = Y[9] # number concentration of activated ice crystals
x_sulph = Y[10] # percent mass sulphuric acid
x_sulph = Y[10] # percent mass sulphuric acid

# Constants
R_v = TD.Parameters.R_v(tps)
Expand Down Expand Up @@ -350,8 +350,8 @@ function run_parcel(IC, t_0, t_end, p)
problem,
timestepper,
dt = const_dt,
reltol = 10 * eps(FT),
abstol = 10 * eps(FT),
reltol = 100 * eps(FT),
abstol = 100 * eps(FT),
)
return sol
end

0 comments on commit 997ec7f

Please sign in to comment.