Skip to content

Try to reduce roundoff error in LocalGeometry constructor #3706

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Try to reduce roundoff error in LocalGeometry constructor #3706

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
41 changes: 41 additions & 0 deletions .buildkite/ci_driver.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,34 @@
# TODO: Move the following constructor to ClimaCore.
using ClimaCore: DataLayouts, Geometry
using LinearAlgebra: det
@inline function Geometry.LocalGeometry(
coordinates,
J,
WJ,
∂x∂ξ::Geometry.Axis2Tensor{
FT,
Tuple{Geometry.LocalAxis{I}, Geometry.CovariantAxis{I}},
S,
},
) where {FT, I, S}
C = typeof(coordinates)

W = WJ / J
J = det(Geometry.components(∂x∂ξ)) # overwrite J value passed to constructor
WJ = W * J # overwrite WJ value passed to constructor

∂ξ∂x = inv(∂x∂ξ)
Jinv = inv(J)

gᵢⱼ = (∂x∂ξ' * ∂x∂ξ + (∂x∂ξ' * ∂x∂ξ)') / 2 # ensure that gᵢⱼ is symmetric
gⁱʲ = inv(gᵢⱼ)

return DataLayouts.bypass_constructor(
Geometry.LocalGeometry{I, C, FT, S},
(coordinates, J, WJ, Jinv, ∂x∂ξ, ∂ξ∂x, gⁱʲ, gᵢⱼ),
)
end

# When Julia 1.10+ is used interactively, stacktraces contain reduced type information to make them shorter.
# On the other hand, the full type information is printed when julia is not run interactively.
# Given that ClimaCore objects are heavily parametrized, non-abbreviated stacktraces are hard to read,
Expand Down Expand Up @@ -27,6 +58,16 @@ sol_res = CA.solve_atmos!(simulation)
(; atmos, params) = integrator.p
(; p) = integrator

# TODO: Make the following into a unit test in ClimaCore
ᶜgⁱʲ = Fields.local_geometry_field(integrator.u.c).gⁱʲ
ᶜgᵢⱼ = Fields.local_geometry_field(integrator.u.c).gᵢⱼ
ᶠgⁱʲ = Fields.local_geometry_field(integrator.u.f).gⁱʲ
ᶠgᵢⱼ = Fields.local_geometry_field(integrator.u.f).gᵢⱼ
@info maximum(parent(@. norm(ᶜgⁱʲ - adjoint(ᶜgⁱʲ))))
@info maximum(parent(@. norm(ᶜgᵢⱼ - adjoint(ᶜgᵢⱼ))))
@info maximum(parent(@. norm(ᶠgⁱʲ - adjoint(ᶠgⁱʲ))))
@info maximum(parent(@. norm(ᶠgᵢⱼ - adjoint(ᶠgᵢⱼ))))

import ClimaCore
import ClimaCore: Topologies, Quadratures, Spaces, Fields
import ClimaComms
Expand Down
Loading