|
74 | 74 | @inbounds ζ₂wᶠᶜᶠ(i, j, k, grid, u, w) = ℑxᶠᵃᵃ(i, j, k, grid, Az_qᶜᶜᶠ, w) * ∂zᶠᶜᶠ(i, j, k, grid, u)
|
75 | 75 | @inbounds ζ₁wᶜᶠᶠ(i, j, k, grid, v, w) = ℑyᵃᶠᵃ(i, j, k, grid, Az_qᶜᶜᶠ, w) * ∂zᶜᶠᶠ(i, j, k, grid, v)
|
76 | 76 |
|
77 |
| -@inline vertical_advection_U(i, j, k, grid, ::VectorInvariant, u, w) = ℑzᵃᵃᶜ(i, j, k, grid, ζ₂wᶠᶜᶠ, u, w) / Azᶠᶜᶜ(i, j, k, grid) |
78 |
| -@inline vertical_advection_V(i, j, k, grid, ::VectorInvariant, v, w) = ℑzᵃᵃᶜ(i, j, k, grid, ζ₁wᶜᶠᶠ, v, w) / Azᶜᶠᶜ(i, j, k, grid) |
| 77 | +@inline vertical_advection_U(i, j, k, grid, ::VectorInvariantSchemes, u, w) = ℑzᵃᵃᶜ(i, j, k, grid, ζ₂wᶠᶜᶠ, u, w) / Azᶠᶜᶜ(i, j, k, grid) |
| 78 | +@inline vertical_advection_V(i, j, k, grid, ::VectorInvariantSchemes, v, w) = ℑzᵃᵃᶜ(i, j, k, grid, ζ₁wᶜᶠᶠ, v, w) / Azᶜᶠᶜ(i, j, k, grid) |
79 | 79 |
|
| 80 | +#= |
80 | 81 | @inline function vertical_advection_U(i, j, k, grid, scheme::WENOVectorInvariant{FT, XT, YT, ZT, XS, YS, ZS, VI}, u, w) where {FT, XT, YT, ZT, XS, YS, ZS, VI}
|
81 | 82 | ŵ = ℑxᶠᵃᵃ(i, j, k, grid, ℑzᵃᵃᶜ, Δx_qᶜᶜᶠ, w) / Δxᶠᶜᶜ(i, j, k, grid)
|
82 | 83 | ζᴸ = _left_biased_interpolate_zᵃᵃᶜ(i, j, k, grid, scheme, ∂zᶠᶜᶠ, VI, u)
|
|
90 | 91 | ζᴿ = _right_biased_interpolate_zᵃᵃᶜ(i, j, k, grid, scheme, ∂zᶜᶠᶠ, VI, v)
|
91 | 92 | return upwind_biased_product(ŵ, ζᴸ, ζᴿ)
|
92 | 93 | end
|
| 94 | +=# |
93 | 95 |
|
94 | 96 | ######
|
95 | 97 | ###### Conservative formulation of momentum advection
|
|
0 commit comments