Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "ClimaSeaIce"
uuid = "6ba0ff68-24e6-4315-936c-2e99227c95a4"
authors = ["Climate Modeling Alliance and contributors"]
version = "0.4.9"
version = "0.4.10"

[deps]
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
Expand Down
4 changes: 2 additions & 2 deletions src/SeaIceThermodynamics/thermodynamic_time_step.jl
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ end
hsⁿ = ifelse(ℵⁿ⁺¹ > 0, hsⁿ * ℵⁿ / ℵⁿ⁺¹, zero(hsⁿ))

Gs⁺ = snow_accumulation(i, j, snowfall, snow_thermodynamics, ℵⁿ⁺¹, clock)
hs⁺ = hsⁿ + Δt * (Gs⁺ - Gs⁻)
hs⁺ = max(zero(hs⁺), hs⁺)
hs⁺ = hsⁿ + Δt * (Gs⁺ - Gs⁻)
hs⁺ = max(zero(hs⁺), hs⁺)

# Snow-ice formation (flooding when freeboard is negative)
hiⁿ⁺¹, hs⁺ = snow_ice_formation(hiⁿ⁺¹, hs⁺, ice_thermodynamics, snow_thermodynamics)
Expand Down
8 changes: 4 additions & 4 deletions src/tracer_tendency_kernel_functions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ end
Gⁿ.ℵ[i, j, 1] = - horizontal_div_Uc(i, j, kᴺ, grid, advection, velocities, ice_concentration)
end

compute_snow_advection_tendency!(i, j, kᴺ, Gⁿ, grid, advection, velocities, ice_concentration, snow_thickness)
compute_snow_advection_tendency!(i, j, kᴺ, Gⁿ, grid, advection, velocities, snow_thickness)
end

@inline compute_snow_advection_tendency!(i, j, k, Gⁿ, grid, advection, velocities, ℵ, ::Nothing) = nothing
@inline compute_snow_advection_tendency!(i, j, k, Gⁿ, grid, advection, velocities, ::Nothing) = nothing

@inline function compute_snow_advection_tendency!(i, j, k, Gⁿ, grid, advection, velocities, ℵ, hs)
@inbounds Gⁿ.hs[i, j, 1] = - div_Uℵh(i, j, k, grid, advection, velocities, ℵ, hs)
@inline function compute_snow_advection_tendency!(i, j, k, Gⁿ, grid, advection, velocities, hs)
@inbounds Gⁿ.hs[i, j, 1] = - horizontal_div_Uc(i, j, k, grid, advection, velocities, hs)
return nothing
end
Loading