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

Qualify IntervalSets and OrderedCollections #2081

Closed
wants to merge 1 commit into from
Closed

Qualify IntervalSets and OrderedCollections #2081

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
10 changes: 5 additions & 5 deletions src/Domains/Domains.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module Domains

import ..Geometry: Geometry, float_type
using IntervalSets
import IntervalSets
export RectangleDomain

"""
Expand Down Expand Up @@ -62,7 +62,7 @@ function IntervalDomain(
end
IntervalDomain(promote(coord_min, coord_max)..., boundary_names)
end
IntervalDomain(coords::ClosedInterval; kwargs...) =
IntervalDomain(coords::IntervalSets.ClosedInterval; kwargs...) =
IntervalDomain(coords.left, coords.right; kwargs...)

"""
Expand Down Expand Up @@ -119,7 +119,7 @@ boundary_names(domain::RectangleDomain) = unique(
)::Vector{Symbol}

"""
RectangleDomain(x1::ClosedInterval, x2::ClosedInterval;
RectangleDomain(x1::IntervalSets.ClosedInterval, x2::IntervalSets.ClosedInterval;
x1boundary::Tuple{Symbol,Symbol},
x2boundary::Tuple{Symbol,Symbol},
x1periodic = false,
Expand All @@ -130,8 +130,8 @@ Construct a `RectangularDomain` in the horizontal.
If a given x1 or x2 boundary is not periodic, then `x1boundary` or `x2boundary` boundary name keyword arguments must be supplied.
"""
function RectangleDomain(
x1::ClosedInterval{X1CT},
x2::ClosedInterval{X2CT};
x1::IntervalSets.ClosedInterval{X1CT},
x2::IntervalSets.ClosedInterval{X2CT};
x1periodic = false,
x2periodic = false,
x1boundary::BCTagType = nothing,
Expand Down
2 changes: 1 addition & 1 deletion test/Fields/convergence_field_integrals.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ using JET

using ClimaComms
ClimaComms.@import_required_backends
using OrderedCollections
import OrderedCollections
using StaticArrays, IntervalSets
import ClimaCore
import ClimaCore.Utilities: PlusHalf
Expand Down
2 changes: 1 addition & 1 deletion test/Fields/unit_field.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ using JET

using ClimaComms
ClimaComms.@import_required_backends
using OrderedCollections
import OrderedCollections
using StaticArrays, IntervalSets
import ClimaCore
import ClimaCore.InputOutput
Expand Down
2 changes: 1 addition & 1 deletion test/Fields/utils_field_multi_broadcast_fusion.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ using BenchmarkTools

using ClimaComms
ClimaComms.@import_required_backends
using OrderedCollections
import OrderedCollections
using StaticArrays, IntervalSets
import ClimaCore
import ClimaCore.Utilities: PlusHalf
Expand Down
Loading