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

remove constraint on Thermodynamics #155

Merged
merged 1 commit into from
Jan 24, 2024
Merged

remove constraint on Thermodynamics #155

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
4 changes: 2 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "SurfaceFluxes"
uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f"
authors = ["Climate Modeling Alliance"]
version = "0.9.0"
version = "0.9.1"

[deps]
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
Expand All @@ -19,5 +19,5 @@ CreateParametersExt = "CLIMAParameters"
CLIMAParameters = "0.8"
DocStringExtensions = "0.8, 0.9"
RootSolvers = "0.2, 0.3, 0.4"
Thermodynamics = "< 0.11.4"
Thermodynamics = "0.11.5"
szy21 marked this conversation as resolved.
Show resolved Hide resolved
julia = "1.9"
62 changes: 31 additions & 31 deletions test/test_cases.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import SurfaceFluxes.Parameters as SFP
z0m = FT(1.0e-5)
z0b = FT(1.0e-5)
Δz = FT(15.000001)
ΔDSEᵥ = FT(603.5625)
ts_in = Thermodynamics.PhaseEquil{FT}(1.2595116, 99902.82, 12337.749, 0.0044478197, 275.624)
ts_sfc = Thermodynamics.PhaseEquil{FT}(1.2544012, 99335.55, 11996.086, 0.0044396375, 275.1768)
ΔDSEᵥ = FT(598.96875)
ts_in = TD.PhaseEquil{FT}(1.2595116, 99902.82, 12337.749, 0.0044478197, 275.624)
ts_sfc = TD.PhaseEquil{FT}(1.2544012, 99335.55, 11996.086, 0.0044396375, 275.1768)
state_sfc = SF.StateValues(FT(0), u_sfc, ts_sfc)
state_in = SF.StateValues(Δz, u_in, ts_in)
sc = SF.ValuesOnly(state_in, state_sfc, z0m, z0b)
Expand All @@ -24,12 +24,12 @@ import SurfaceFluxes.Parameters as SFP

u_in = (FT(-0.168524f0), FT(-0.000566946f0))
u_sfc = (FT(0.0), FT(0))
z0_m = FT(1.0e-5)
z0_b = FT(1.0e-5)
z0m = FT(1.0e-5)
z0b = FT(1.0e-5)
Δz = FT(15.000001)
ΔDSEᵥ = FT(68.59375)
ts_in = Thermodynamics.PhaseEquil{FT}(1.2605726f0, 100331.47f0, 7956.4053f0, 0.002202735f0, 276.95068f0)
ts_sfc = Thermodynamics.PhaseEquil{FT}(1.2499729f0, 99303.92f0, 13258.002f0, 0.0047157165f0, 276.01752f0)
ΔDSEᵥ = FT(662.09375)
ts_in = TD.PhaseEquil{FT}(1.2605726f0, 100331.47f0, 7956.4053f0, 0.002202735f0, 276.95068f0)
ts_sfc = TD.PhaseEquil{FT}(1.2499729f0, 99303.92f0, 13258.002f0, 0.0047157165f0, 276.01752f0)
state_sfc = SF.StateValues(FT(0), u_sfc, ts_sfc)
state_in = SF.StateValues(Δz, u_in, ts_in)
sc = SF.ValuesOnly(state_in, state_sfc, z0m, z0b)
Expand All @@ -38,53 +38,53 @@ import SurfaceFluxes.Parameters as SFP

u_in = (FT(-14.154735), FT(-5.1905923))
u_sfc = (FT(0.0), FT(0))
z0_m = FT(1.0e-5)
z0_b = FT(1.0e-5)
z0m = FT(1.0e-5)
z0b = FT(1.0e-5)
Δz = FT(15.000001)
ΔDSEᵥ = FT(-10.9375)
ts_in = Thermodynamics.PhaseEquil{FT}(1.1730341f0, 98689.72f0, 43302.703f0, 0.012817842f0, 290.8733f0)
ts_sfc = Thermodynamics.PhaseEquil{FT}(1.1740736f0, 98819.375f0, 43671.336f0, 0.012941063f0, 290.97592f0)
ΔDSEᵥ = FT(21.34375)
ts_in = TD.PhaseEquil{FT}(1.1730341f0, 98689.72f0, 43302.703f0, 0.012817842f0, 290.8733f0)
ts_sfc = TD.PhaseEquil{FT}(1.1740736f0, 98819.375f0, 43671.336f0, 0.012941063f0, 290.97592f0)
state_sfc = SF.StateValues(FT(0), u_sfc, ts_sfc)
state_in = SF.StateValues(Δz, u_in, ts_in)
sc = SF.ValuesOnly(state_in, state_sfc, z0m, z0b)
result = SF.surface_conditions(param_set, sc)
@test result.L_MO < FT(0)
@test result.L_MO > FT(0)

u_in = (FT(-13.526638), FT(-8.794365))
u_sfc = (FT(0.0), FT(0))
z0_m = FT(1.0e-5)
z0_b = FT(1.0e-5)
ΔDSEᵥ = FT(-12.90625)
ts_in = Thermodynamics.PhaseEquil{FT}(1.1698402f0, 98647.89f0, 44855.285f0, 0.013289474f0, 291.46088f0)
ts_sfc = Thermodynamics.PhaseEquil{FT}(1.1708081f0, 98770.55f0, 45266.523f0, 0.013432522f0, 291.5569f0)
z0m = FT(1.0e-5)
z0b = FT(1.0e-5)
ΔDSEᵥ = FT(24.46875)
ts_in = TD.PhaseEquil{FT}(1.1698402f0, 98647.89f0, 44855.285f0, 0.013289474f0, 291.46088f0)
ts_sfc = TD.PhaseEquil{FT}(1.1708081f0, 98770.55f0, 45266.523f0, 0.013432522f0, 291.5569f0)
state_sfc = SF.StateValues(FT(0), u_sfc, ts_sfc)
state_in = SF.StateValues(Δz, u_in, ts_in)
sc = SF.ValuesOnly(state_in, state_sfc, z0m, z0b)
result = SF.surface_conditions(param_set, sc)
@test result.L_MO < FT(0)
@test result.L_MO > FT(0)

u_in = (FT(-41.34482), FT(-23.609104))
u_sfc = (FT(0.0), FT(0))
z0_m = FT(1.0e-5)
z0_b = FT(1.0e-5)
z0m = FT(1.0e-5)
z0b = FT(1.0e-5)
Δz = FT(15.000001)
ΔDSEᵥ = FT(-18.96875)
ts_in = Thermodynamics.PhaseEquil{FT}(1.2182463f0, 96874.9f0, 13805.914f0, 0.0048752176f0, 276.25174f0)
ts_sfc = Thermodynamics.PhaseEquil{FT}(1.2197124f0, 97042.68f0, 14087.365f0, 0.004953378f0, 276.38446f0)
ΔDSEᵥ = FT(0.25)
ts_in = TD.PhaseEquil{FT}(1.2182463f0, 96874.9f0, 13805.914f0, 0.0048752176f0, 276.25174f0)
ts_sfc = TD.PhaseEquil{FT}(1.2197124f0, 97042.68f0, 14087.365f0, 0.004953378f0, 276.38446f0)
state_sfc = SF.StateValues(FT(0), u_sfc, ts_sfc)
state_in = SF.StateValues(Δz, u_in, ts_in)
sc = SF.ValuesOnly(state_in, state_sfc, z0m, z0b)
result = SF.surface_conditions(param_set, sc)
@test result.L_MO < FT(0)
@test result.L_MO > FT(0)

u_in = (FT(-0.75088084), FT(-0.09317328))
u_sfc = (FT(0.0), FT(0))
z0_m = FT(1.0e-5)
z0_b = FT(1.0e-5)
z0m = FT(1.0e-5)
z0b = FT(1.0e-5)
Δz = FT(15.000001)
ΔDSEᵥ = FT(69.96875)
ts_in = Thermodynamics.PhaseEquil{FT}(1.2317619f0, 99965.086f0, 12921.355f0, 0.0026684932f0, 282.31366f0)
ts_sfc = Thermodynamics.PhaseEquil{FT}(1.214932f0, 98294.87f0, 21252.703f0, 0.006637053f0, 280.76575f0)
ΔDSEᵥ = FT(1024.0)
ts_in = TD.PhaseEquil{FT}(1.2317619f0, 99965.086f0, 12921.355f0, 0.0026684932f0, 282.31366f0)
ts_sfc = TD.PhaseEquil{FT}(1.214932f0, 98294.87f0, 21252.703f0, 0.006637053f0, 280.76575f0)
state_sfc = SF.StateValues(FT(0), u_sfc, ts_sfc)
state_in = SF.StateValues(Δz, u_in, ts_in)
sc = SF.ValuesOnly(state_in, state_sfc, z0m, z0b)
Expand Down
Loading