From c323d862448f9d93aae524e59d7e1fed56071e6a Mon Sep 17 00:00:00 2001 From: Charles Kawczynski Date: Thu, 29 Feb 2024 10:33:48 -0500 Subject: [PATCH] boundary_tags -> boundary_names kwarg --- benchmarks/3d/se_kernels.jl | 2 +- benchmarks/3d/vector_laplacian.jl | 2 +- docs/tutorials/introduction.jl | 2 +- examples/common_spaces.jl | 2 +- .../hybrid/box/bubble_3d_invariant_rhoe.jl | 2 +- .../sphere/nonhydrostatic_gravity_wave.jl | 2 +- lib/ClimaCoreMakie/test/runtests.jl | 2 +- lib/ClimaCorePlots/test/runtests.jl | 8 +++--- lib/ClimaCoreTempestRemap/test/netcdf.jl | 8 +++--- test/Fields/field_opt.jl | 2 +- test/Fields/reduction_cuda.jl | 4 +-- test/Fields/reduction_cuda_distributed.jl | 2 +- test/InputOutput/hybrid3dbox.jl | 2 +- test/InputOutput/hybrid3dcubedsphere.jl | 2 +- .../hybrid3dcubedsphere_topography.jl | 2 +- test/MatrixFields/field2arrays.jl | 2 +- test/MatrixFields/matrix_field_test_utils.jl | 2 +- test/Meshes/interval.jl | 4 +-- test/Operators/finitedifference/column.jl | 28 +++++++++---------- .../implicit_stencils_utils.jl | 2 +- test/Operators/finitedifference/linsolve.jl | 2 +- test/Operators/finitedifference/opt.jl | 2 +- .../finitedifference/opt_examples.jl | 2 +- .../finitedifference/opt_implicit_stencils.jl | 2 +- test/Operators/finitedifference/tensor.jl | 2 +- test/Operators/finitedifference/wfact.jl | 2 +- test/Operators/hybrid/2d.jl | 2 +- test/Operators/hybrid/3d.jl | 4 +-- test/Operators/hybrid/cuda.jl | 4 +-- test/Operators/hybrid/dss_opt.jl | 2 +- test/Operators/hybrid/extruded_3dbox_cuda.jl | 2 +- test/Operators/hybrid/extruded_sphere_cuda.jl | 2 +- test/Operators/hybrid/opt.jl | 2 +- test/Operators/remapping.jl | 16 +++++------ .../spectralelement/benchmark_utils.jl | 2 +- test/Operators/spectralelement/opt.jl | 2 +- test/Operators/spectralelement/plane.jl | 2 +- test/Remapping/distributed_remapping.jl | 8 +++--- test/Remapping/interpolate_array.jl | 8 +++--- test/Spaces/ddss1_cs.jl | 2 +- .../distributed_cuda/space_construction.jl | 2 +- test/Spaces/spaces.jl | 2 +- test/Spaces/sphere.jl | 2 +- test/Spaces/terrain_warp.jl | 2 +- test/TestUtilities/TestUtilities.jl | 4 +-- test/Topologies/interval.jl | 2 +- 46 files changed, 83 insertions(+), 83 deletions(-) diff --git a/benchmarks/3d/se_kernels.jl b/benchmarks/3d/se_kernels.jl index c384be4efe..4e8a613981 100644 --- a/benchmarks/3d/se_kernels.jl +++ b/benchmarks/3d/se_kernels.jl @@ -81,7 +81,7 @@ function initialize_mwe(device, ::Type{FT}) where {FT} z_domain = Domains.IntervalDomain( Geometry.ZPoint(zero(z_max)), Geometry.ZPoint(z_max); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) z_mesh = Meshes.IntervalMesh(z_domain, nelems = z_elem) z_topology = Topologies.IntervalTopology(context, z_mesh) diff --git a/benchmarks/3d/vector_laplacian.jl b/benchmarks/3d/vector_laplacian.jl index 6018466936..1923bdb6a6 100644 --- a/benchmarks/3d/vector_laplacian.jl +++ b/benchmarks/3d/vector_laplacian.jl @@ -19,7 +19,7 @@ hspace = Spaces.SpectralElementSpace2D(htopology, Quadratures.GLL{4}()) vdomain = Domains.IntervalDomain( Geometry.ZPoint(0.0), Geometry.ZPoint(10e3); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vmesh = Meshes.IntervalMesh(vdomain; nelems = 45) vtopology = Topologies.IntervalTopology( diff --git a/docs/tutorials/introduction.jl b/docs/tutorials/introduction.jl index 411166908d..f2164fcfce 100644 --- a/docs/tutorials/introduction.jl +++ b/docs/tutorials/introduction.jl @@ -27,7 +27,7 @@ using ClimaComms, column_domain = ClimaCore.Domains.IntervalDomain( ClimaCore.Geometry.ZPoint(0.0) .. ClimaCore.Geometry.ZPoint(10.0), - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) #---------------------------------------------------------------------------- diff --git a/examples/common_spaces.jl b/examples/common_spaces.jl index 81a93ca4ef..c20786224b 100644 --- a/examples/common_spaces.jl +++ b/examples/common_spaces.jl @@ -66,7 +66,7 @@ function make_hybrid_spaces(h_space, z_max, z_elem; z_stretch) z_domain = Domains.IntervalDomain( Geometry.ZPoint(zero(z_max)), Geometry.ZPoint(z_max); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) z_mesh = Meshes.IntervalMesh(z_domain, z_stretch; nelems = z_elem) z_topology = Topologies.IntervalTopology(z_mesh) diff --git a/examples/hybrid/box/bubble_3d_invariant_rhoe.jl b/examples/hybrid/box/bubble_3d_invariant_rhoe.jl index 8559239df1..0ff941e476 100644 --- a/examples/hybrid/box/bubble_3d_invariant_rhoe.jl +++ b/examples/hybrid/box/bubble_3d_invariant_rhoe.jl @@ -133,7 +133,7 @@ function hvspace_3D( vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(zlim[1]), Geometry.ZPoint{FT}(zlim[2]); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = zelem) verttopo = Topologies.IntervalTopology( diff --git a/examples/hybrid/sphere/nonhydrostatic_gravity_wave.jl b/examples/hybrid/sphere/nonhydrostatic_gravity_wave.jl index 02bf96e567..9e36c3167f 100644 --- a/examples/hybrid/sphere/nonhydrostatic_gravity_wave.jl +++ b/examples/hybrid/sphere/nonhydrostatic_gravity_wave.jl @@ -55,7 +55,7 @@ function sphere_3D( vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(zlim[1]), Geometry.ZPoint{FT}(zlim[2]); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = zelem) vert_center_space = Spaces.CenterFiniteDifferenceSpace(vertmesh) diff --git a/lib/ClimaCoreMakie/test/runtests.jl b/lib/ClimaCoreMakie/test/runtests.jl index 6301b879d8..5b23fbe6d2 100644 --- a/lib/ClimaCoreMakie/test/runtests.jl +++ b/lib/ClimaCoreMakie/test/runtests.jl @@ -93,7 +93,7 @@ end vert_domain = ClimaCore.Domains.IntervalDomain( ClimaCore.Geometry.ZPoint(0.0), ClimaCore.Geometry.ZPoint(1000.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vert_mesh = ClimaCore.Meshes.IntervalMesh(vert_domain, nelems = 36) vert_center_space = ClimaCore.Spaces.CenterFiniteDifferenceSpace(vert_mesh) diff --git a/lib/ClimaCorePlots/test/runtests.jl b/lib/ClimaCorePlots/test/runtests.jl index 53eed69487..46f3b04e8b 100644 --- a/lib/ClimaCorePlots/test/runtests.jl +++ b/lib/ClimaCorePlots/test/runtests.jl @@ -13,7 +13,7 @@ OUTPUT_DIR = mkpath(get(ENV, "CI_OUTPUT_DIR", tempname())) @testset "spectral element 1D" begin domain = ClimaCore.Domains.IntervalDomain( ClimaCore.Geometry.XPoint(0.0) .. ClimaCore.Geometry.XPoint(π), - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) mesh = ClimaCore.Meshes.IntervalMesh(domain; nelems = 5) grid_topology = ClimaCore.Topologies.IntervalTopology(mesh) @@ -109,7 +109,7 @@ end vertdomain = ClimaCore.Domains.IntervalDomain( ClimaCore.Geometry.ZPoint{FT}(0), ClimaCore.Geometry.ZPoint{FT}(1000); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = ClimaCore.Meshes.IntervalMesh(vertdomain, nelems = velem) vert_center_space = ClimaCore.Spaces.CenterFiniteDifferenceSpace(vertmesh) @@ -197,7 +197,7 @@ end vertdomain = ClimaCore.Domains.IntervalDomain( ClimaCore.Geometry.ZPoint{FT}(0), ClimaCore.Geometry.ZPoint{FT}(1000); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = ClimaCore.Meshes.IntervalMesh(vertdomain, nelems = velem) vert_center_space = ClimaCore.Spaces.CenterFiniteDifferenceSpace(vertmesh) @@ -246,7 +246,7 @@ end vertdomain = ClimaCore.Domains.IntervalDomain( ClimaCore.Geometry.ZPoint{FT}(0), ClimaCore.Geometry.ZPoint{FT}(1000); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = ClimaCore.Meshes.IntervalMesh(vertdomain, nelems = velem) vert_center_space = ClimaCore.Spaces.CenterFiniteDifferenceSpace(vertmesh) diff --git a/lib/ClimaCoreTempestRemap/test/netcdf.jl b/lib/ClimaCoreTempestRemap/test/netcdf.jl index 218936ff91..ed4c6d37dd 100644 --- a/lib/ClimaCoreTempestRemap/test/netcdf.jl +++ b/lib/ClimaCoreTempestRemap/test/netcdf.jl @@ -98,7 +98,7 @@ end vdomain = Domains.IntervalDomain( Geometry.ZPoint(0.0), Geometry.ZPoint(50.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vmesh = Meshes.IntervalMesh(vdomain, nelems = nlevels) vspace = Spaces.CenterFiniteDifferenceSpace(vmesh) @@ -181,7 +181,7 @@ end vdomain = Domains.IntervalDomain( Geometry.ZPoint(0.0), Geometry.ZPoint(50.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vmesh = Meshes.IntervalMesh(vdomain, nelems = nlevels) vspace = Spaces.CenterFiniteDifferenceSpace(vmesh) @@ -316,7 +316,7 @@ end vdomain = Domains.IntervalDomain( Geometry.ZPoint(0.0), Geometry.ZPoint(50.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vmesh = Meshes.IntervalMesh(vdomain, nelems = nlevels) vfspace = Spaces.FaceFiniteDifferenceSpace(vmesh) @@ -425,7 +425,7 @@ end vdomain = Domains.IntervalDomain( Geometry.ZPoint(0.0), Geometry.ZPoint(50.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vmesh = Meshes.IntervalMesh(vdomain, nelems = nlevels) vspace = Spaces.CenterFiniteDifferenceSpace(vmesh) diff --git a/test/Fields/field_opt.jl b/test/Fields/field_opt.jl index efe013a5fb..66a6b8b6fa 100644 --- a/test/Fields/field_opt.jl +++ b/test/Fields/field_opt.jl @@ -317,7 +317,7 @@ end vdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(zero(FT)), Geometry.ZPoint{FT}(FT(1e4)); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vmesh = Meshes.IntervalMesh(vdomain, nelems = 4) vspace = Spaces.CenterFiniteDifferenceSpace(vmesh) diff --git a/test/Fields/reduction_cuda.jl b/test/Fields/reduction_cuda.jl index 9c2333d332..ab5db17a16 100644 --- a/test/Fields/reduction_cuda.jl +++ b/test/Fields/reduction_cuda.jl @@ -121,7 +121,7 @@ end z_domain = Domains.IntervalDomain( Geometry.ZPoint(zero(z_max)), Geometry.ZPoint(z_max); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) z_mesh = Meshes.IntervalMesh(z_domain, nelems = z_elem) z_topology = Topologies.IntervalTopology(context, z_mesh) @@ -205,7 +205,7 @@ end domain = Domains.IntervalDomain( Geometry.ZPoint{FT}(z0), Geometry.ZPoint{FT}(z_max); - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) z_mesh = Meshes.IntervalMesh(domain; nelems = z_nelems) diff --git a/test/Fields/reduction_cuda_distributed.jl b/test/Fields/reduction_cuda_distributed.jl index 475c39cba2..86da245149 100644 --- a/test/Fields/reduction_cuda_distributed.jl +++ b/test/Fields/reduction_cuda_distributed.jl @@ -131,7 +131,7 @@ end z_domain = Domains.IntervalDomain( Geometry.ZPoint(zero(z_max)), Geometry.ZPoint(z_max); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) z_mesh = Meshes.IntervalMesh(z_domain, nelems = z_elem) z_topology = Topologies.IntervalTopology(vcontext, z_mesh) diff --git a/test/InputOutput/hybrid3dbox.jl b/test/InputOutput/hybrid3dbox.jl index ffd2a319c0..e6c3efb3d6 100644 --- a/test/InputOutput/hybrid3dbox.jl +++ b/test/InputOutput/hybrid3dbox.jl @@ -30,7 +30,7 @@ function hvspace_3D( vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(zlim[1]), Geometry.ZPoint{FT}(zlim[2]); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = zelem) vert_center_space = Spaces.CenterFiniteDifferenceSpace(vertmesh) diff --git a/test/InputOutput/hybrid3dcubedsphere.jl b/test/InputOutput/hybrid3dcubedsphere.jl index 45cd0ce185..ca978e6b32 100644 --- a/test/InputOutput/hybrid3dcubedsphere.jl +++ b/test/InputOutput/hybrid3dcubedsphere.jl @@ -41,7 +41,7 @@ end z_domain = Domains.IntervalDomain( Geometry.ZPoint(zero(z_max)), Geometry.ZPoint(z_max); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) z_mesh = Meshes.IntervalMesh(z_domain, nelems = z_elem) z_topology = Topologies.IntervalTopology(z_mesh) diff --git a/test/InputOutput/hybrid3dcubedsphere_topography.jl b/test/InputOutput/hybrid3dcubedsphere_topography.jl index 981c0fab29..e01dccb648 100644 --- a/test/InputOutput/hybrid3dcubedsphere_topography.jl +++ b/test/InputOutput/hybrid3dcubedsphere_topography.jl @@ -42,7 +42,7 @@ end z_domain = Domains.IntervalDomain( Geometry.ZPoint(zero(z_max)), Geometry.ZPoint(z_max); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) diff --git a/test/MatrixFields/field2arrays.jl b/test/MatrixFields/field2arrays.jl index 3123b591e2..edd4aa00d2 100644 --- a/test/MatrixFields/field2arrays.jl +++ b/test/MatrixFields/field2arrays.jl @@ -8,7 +8,7 @@ import ClimaCore: Geometry, Domains, Meshes, Spaces, Fields, MatrixFields domain = Domains.IntervalDomain( Geometry.ZPoint(FT(1)), Geometry.ZPoint(FT(4)); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) mesh = Meshes.IntervalMesh(domain, nelems = 3) center_space = Spaces.CenterFiniteDifferenceSpace(mesh) diff --git a/test/MatrixFields/matrix_field_test_utils.jl b/test/MatrixFields/matrix_field_test_utils.jl index 26cf0aa410..a55f55f625 100644 --- a/test/MatrixFields/matrix_field_test_utils.jl +++ b/test/MatrixFields/matrix_field_test_utils.jl @@ -207,7 +207,7 @@ function test_spaces(::Type{FT}) where {FT} vdomain = Domains.IntervalDomain( Geometry.ZPoint(FT(0)), Geometry.ZPoint(FT(10)); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vmesh = Meshes.IntervalMesh(vdomain, nelems = velem) vtopology = Topologies.IntervalTopology(comms_ctx, vmesh) diff --git a/test/Meshes/interval.jl b/test/Meshes/interval.jl index 42a2d07179..f5afef8af5 100644 --- a/test/Meshes/interval.jl +++ b/test/Meshes/interval.jl @@ -300,13 +300,13 @@ end parent_domain = Domains.IntervalDomain( Geometry.ZPoint{FT}(z_bottom), Geometry.ZPoint{FT}(z_top_parent), - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) parent_mesh = Meshes.IntervalMesh(parent_domain, stretch, nelems = nz) trunc_domain = Domains.IntervalDomain( Geometry.ZPoint{FT}(z_bottom), Geometry.ZPoint{FT}(z_top), - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) trunc_mesh = Meshes.truncate_mesh(parent_mesh, trunc_domain) diff --git a/test/Operators/finitedifference/column.jl b/test/Operators/finitedifference/column.jl index 34411617f9..1adf0632f7 100644 --- a/test/Operators/finitedifference/column.jl +++ b/test/Operators/finitedifference/column.jl @@ -14,7 +14,7 @@ device = ClimaComms.device() domain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0.0), Geometry.ZPoint{FT}(pi); - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) @test eltype(domain) === Geometry.ZPoint{FT} @@ -129,7 +129,7 @@ end domain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0.0), Geometry.ZPoint{FT}(pi); - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) @test eltype(domain) === Geometry.ZPoint{FT} @@ -215,7 +215,7 @@ end domain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0.0), Geometry.ZPoint{FT}(pi); - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) @test eltype(domain) === Geometry.ZPoint{FT} @@ -269,7 +269,7 @@ convergence_rate(err, Δh) = interval = Geometry.ZPoint(a) .. Geometry.ZPoint(b) domain = Domains.IntervalDomain( interval; - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) mesh = Meshes.IntervalMesh(domain, stretch_fn, nelems = n) @@ -317,7 +317,7 @@ end interval = Geometry.ZPoint(a) .. Geometry.ZPoint(b) domain = Domains.IntervalDomain( interval; - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) mesh = Meshes.IntervalMesh(domain, stretch_fn, nelems = n) @@ -368,7 +368,7 @@ end interval = Geometry.ZPoint(a) .. Geometry.ZPoint(b) domain = Domains.IntervalDomain( interval; - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) mesh = Meshes.IntervalMesh(domain, stretch_fn, nelems = n) @@ -419,7 +419,7 @@ end interval = Geometry.ZPoint(a) .. Geometry.ZPoint(b) domain = Domains.IntervalDomain( interval; - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) mesh = Meshes.IntervalMesh(domain, stretch_fn, nelems = n) @@ -474,7 +474,7 @@ end domain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0.0), Geometry.ZPoint{FT}(pi); - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) mesh = Meshes.IntervalMesh(domain; nelems = n) @@ -743,7 +743,7 @@ end domain = Domains.IntervalDomain( Geometry.ZPoint{FT}(-pi), Geometry.ZPoint{FT}(pi); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) mesh = Meshes.IntervalMesh(domain, stretch_fn; nelems = n) @@ -804,7 +804,7 @@ end domain = Domains.IntervalDomain( Geometry.ZPoint{FT}(-pi), Geometry.ZPoint{FT}(pi); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) mesh = Meshes.IntervalMesh(domain; nelems = n) @@ -915,7 +915,7 @@ end domain = Domains.IntervalDomain( Geometry.ZPoint{FT}(-pi), Geometry.ZPoint{FT}(pi); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) mesh = Meshes.IntervalMesh(domain, stretch_fn; nelems = n) @@ -985,7 +985,7 @@ end domain = Domains.IntervalDomain( Geometry.ZPoint{FT}(-pi), Geometry.ZPoint{FT}(pi); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) mesh = Meshes.IntervalMesh(domain; nelems = n) @@ -1044,7 +1044,7 @@ end domain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0.0), Geometry.ZPoint{FT}(pi); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) mesh = Meshes.IntervalMesh(domain; nelems = n_elems) @@ -1112,7 +1112,7 @@ end domain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0.0), Geometry.ZPoint{FT}(4π); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) mesh = Meshes.IntervalMesh(domain; nelems = n) diff --git a/test/Operators/finitedifference/implicit_stencils_utils.jl b/test/Operators/finitedifference/implicit_stencils_utils.jl index dd7593b022..a5bf7dfdd8 100644 --- a/test/Operators/finitedifference/implicit_stencils_utils.jl +++ b/test/Operators/finitedifference/implicit_stencils_utils.jl @@ -69,7 +69,7 @@ function get_space(::Type{FT}) where {FT} vdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(zero(FT)), Geometry.ZPoint{FT}(zmax); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vmesh = Meshes.IntervalMesh(vdomain, nelems = velem) vtopology = diff --git a/test/Operators/finitedifference/linsolve.jl b/test/Operators/finitedifference/linsolve.jl index ba7e928f83..b7939586d8 100644 --- a/test/Operators/finitedifference/linsolve.jl +++ b/test/Operators/finitedifference/linsolve.jl @@ -23,7 +23,7 @@ hspace = Spaces.SpectralElementSpace2D(htopology, quad) vdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(zero(FT)), Geometry.ZPoint{FT}(zmax); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vmesh = Meshes.IntervalMesh(vdomain, nelems = velem) center_space = Spaces.CenterFiniteDifferenceSpace(vmesh) diff --git a/test/Operators/finitedifference/opt.jl b/test/Operators/finitedifference/opt.jl index a1046e29ef..61f51a7ddc 100644 --- a/test/Operators/finitedifference/opt.jl +++ b/test/Operators/finitedifference/opt.jl @@ -210,7 +210,7 @@ end domain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0.0), Geometry.ZPoint{FT}(pi); - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) mesh = Meshes.IntervalMesh(domain; nelems = 16) diff --git a/test/Operators/finitedifference/opt_examples.jl b/test/Operators/finitedifference/opt_examples.jl index 791afb7714..d588344096 100644 --- a/test/Operators/finitedifference/opt_examples.jl +++ b/test/Operators/finitedifference/opt_examples.jl @@ -445,7 +445,7 @@ end domain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0.0), Geometry.ZPoint{FT}(pi); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) mesh = Meshes.IntervalMesh(domain; nelems = n_elems) cs = Spaces.CenterFiniteDifferenceSpace(mesh) diff --git a/test/Operators/finitedifference/opt_implicit_stencils.jl b/test/Operators/finitedifference/opt_implicit_stencils.jl index 4d3d892f9d..e2967a19b1 100644 --- a/test/Operators/finitedifference/opt_implicit_stencils.jl +++ b/test/Operators/finitedifference/opt_implicit_stencils.jl @@ -36,7 +36,7 @@ Operators.Operator2Stencil(op::CurriedTwoArgOperator) = vdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(zero(FT)), Geometry.ZPoint{FT}(zmax); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vmesh = Meshes.IntervalMesh(vdomain, nelems = velem) vspace = Spaces.CenterFiniteDifferenceSpace(vmesh) diff --git a/test/Operators/finitedifference/tensor.jl b/test/Operators/finitedifference/tensor.jl index 43b5d95b31..f177fc6ebc 100644 --- a/test/Operators/finitedifference/tensor.jl +++ b/test/Operators/finitedifference/tensor.jl @@ -21,7 +21,7 @@ for FT in (Float32, Float64) vdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0.0), Geometry.ZPoint{FT}(30e3); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) stretch = Meshes.GeneralizedExponentialStretching(FT(30), FT(5000)) vmesh = Meshes.IntervalMesh(vdomain, stretch; nelems = 45) diff --git a/test/Operators/finitedifference/wfact.jl b/test/Operators/finitedifference/wfact.jl index 901f084f39..64500f514b 100644 --- a/test/Operators/finitedifference/wfact.jl +++ b/test/Operators/finitedifference/wfact.jl @@ -33,7 +33,7 @@ hspace = Spaces.SpectralElementSpace2D(htopology, quad) vdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(zero(FT)), Geometry.ZPoint{FT}(zmax); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vmesh = Meshes.IntervalMesh(vdomain, nelems = velem) center_space = Spaces.CenterFiniteDifferenceSpace(vmesh) diff --git a/test/Operators/hybrid/2d.jl b/test/Operators/hybrid/2d.jl index 21e3a401de..16ac607686 100644 --- a/test/Operators/hybrid/2d.jl +++ b/test/Operators/hybrid/2d.jl @@ -32,7 +32,7 @@ function hvspace_2D(; vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(zlim[1]), Geometry.ZPoint{FT}(zlim[2]); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, stretch, nelems = velem) vert_center_space = Spaces.CenterFiniteDifferenceSpace(vertmesh) diff --git a/test/Operators/hybrid/3d.jl b/test/Operators/hybrid/3d.jl index bf8bc512d0..35d0037ae8 100644 --- a/test/Operators/hybrid/3d.jl +++ b/test/Operators/hybrid/3d.jl @@ -26,7 +26,7 @@ device = ClimaComms.device() vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0.0), Geometry.ZPoint{FT}(1.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = 10) verttopology = Topologies.IntervalTopology( @@ -96,7 +96,7 @@ function hvspace_3D( vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(zlim[1]), Geometry.ZPoint{FT}(zlim[2]); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = zelem) verttopology = Topologies.IntervalTopology( diff --git a/test/Operators/hybrid/cuda.jl b/test/Operators/hybrid/cuda.jl index f0b48b9fd0..b0e0e5b761 100644 --- a/test/Operators/hybrid/cuda.jl +++ b/test/Operators/hybrid/cuda.jl @@ -30,7 +30,7 @@ function hvspace_3D_box( vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(zlim[1]), Geometry.ZPoint{FT}(zlim[2]); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = zelem) @@ -65,7 +65,7 @@ function hvspace_3D_sphere(context) vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0.0), Geometry.ZPoint{FT}(1.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = 10) diff --git a/test/Operators/hybrid/dss_opt.jl b/test/Operators/hybrid/dss_opt.jl index cb859c3b3e..abe53d21e5 100644 --- a/test/Operators/hybrid/dss_opt.jl +++ b/test/Operators/hybrid/dss_opt.jl @@ -24,7 +24,7 @@ FT = Float64 vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0.0), Geometry.ZPoint{FT}(1.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = 10) vert_center_space = Spaces.CenterFiniteDifferenceSpace(vertmesh) diff --git a/test/Operators/hybrid/extruded_3dbox_cuda.jl b/test/Operators/hybrid/extruded_3dbox_cuda.jl index de9748e369..07d0941d6f 100644 --- a/test/Operators/hybrid/extruded_3dbox_cuda.jl +++ b/test/Operators/hybrid/extruded_3dbox_cuda.jl @@ -24,7 +24,7 @@ function get_space(context) vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0.0), Geometry.ZPoint{FT}(1.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = 10) diff --git a/test/Operators/hybrid/extruded_sphere_cuda.jl b/test/Operators/hybrid/extruded_sphere_cuda.jl index 3a3731741b..d98cbc2bfa 100644 --- a/test/Operators/hybrid/extruded_sphere_cuda.jl +++ b/test/Operators/hybrid/extruded_sphere_cuda.jl @@ -24,7 +24,7 @@ function get_space(context) vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0.0), Geometry.ZPoint{FT}(1.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = 10) diff --git a/test/Operators/hybrid/opt.jl b/test/Operators/hybrid/opt.jl index e34d784aca..52c054dbd5 100644 --- a/test/Operators/hybrid/opt.jl +++ b/test/Operators/hybrid/opt.jl @@ -241,7 +241,7 @@ end vdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0.0), Geometry.ZPoint{FT}(pi); - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) vmesh = Meshes.IntervalMesh(vdomain; nelems = 16) cvspace = Spaces.CenterFiniteDifferenceSpace(vmesh) diff --git a/test/Operators/remapping.jl b/test/Operators/remapping.jl index 3017023035..9912372797 100644 --- a/test/Operators/remapping.jl +++ b/test/Operators/remapping.jl @@ -133,7 +133,7 @@ end @testset "Identity Operator" begin domain1D = Domains.IntervalDomain( Geometry.XPoint(-1.0) .. Geometry.XPoint(1.0), - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) domain2D = Domains.RectangleDomain( Geometry.XPoint(-1.0) .. Geometry.XPoint(1.0), @@ -157,7 +157,7 @@ end @testset "Aligned Intervals Different Resolutions" begin domain = Domains.IntervalDomain( Geometry.XPoint(0.0) .. Geometry.XPoint(1.0), - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) source = make_space(domain, 1, 4) @@ -200,13 +200,13 @@ end @testset "Unaligned Intervals Same Resolution" begin domain1 = Domains.IntervalDomain( Geometry.XPoint(-1.0) .. Geometry.XPoint(1.0), - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) source = make_space(domain1, 1, 3) domain2 = Domains.IntervalDomain( Geometry.XPoint(0.0) .. Geometry.XPoint(2.0), - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) target = make_space(domain2, 1, 3) @@ -227,13 +227,13 @@ end @testset "Concentric Domains of Different Length" begin domain1 = Domains.IntervalDomain( Geometry.XPoint(-1.0) .. Geometry.XPoint(1.0), - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) source = make_space(domain1, 1, 4) domain2 = Domains.IntervalDomain( Geometry.XPoint(-0.5) .. Geometry.XPoint(0.5), - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) target = make_space(domain2, 1, 4) @@ -404,7 +404,7 @@ end @testset "1D Domains" begin domain = Domains.IntervalDomain( Geometry.XPoint(0.0) .. Geometry.XPoint(1.0), - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) @testset "Single aligned elements" begin @@ -511,7 +511,7 @@ end @testset "1D Domains" begin domain = Domains.IntervalDomain( Geometry.XPoint(0.0) .. Geometry.XPoint(1.0), - boundary_tags = (:left, :right), + boundary_names = (:left, :right), ) @testset "Single aligned elements" begin diff --git a/test/Operators/spectralelement/benchmark_utils.jl b/test/Operators/spectralelement/benchmark_utils.jl index bb222eeb49..fe70882231 100644 --- a/test/Operators/spectralelement/benchmark_utils.jl +++ b/test/Operators/spectralelement/benchmark_utils.jl @@ -127,7 +127,7 @@ function create_space( vertdomain = Domains.IntervalDomain( Geometry.ZPoint{float_type}(zlim[1]), Geometry.ZPoint{float_type}(zlim[2]); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = z_elem) vtopology = Topologies.IntervalTopology(context, vertmesh) diff --git a/test/Operators/spectralelement/opt.jl b/test/Operators/spectralelement/opt.jl index 424a407a4c..697d2054c6 100644 --- a/test/Operators/spectralelement/opt.jl +++ b/test/Operators/spectralelement/opt.jl @@ -188,7 +188,7 @@ end vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0), Geometry.ZPoint{FT}(1000); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = velem) vert_center_space = Spaces.CenterFiniteDifferenceSpace(vertmesh) diff --git a/test/Operators/spectralelement/plane.jl b/test/Operators/spectralelement/plane.jl index faf7502649..b5539004e5 100644 --- a/test/Operators/spectralelement/plane.jl +++ b/test/Operators/spectralelement/plane.jl @@ -30,7 +30,7 @@ hspace = Spaces.SpectralElementSpace1D(htopology, quad) vdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(-pi), Geometry.ZPoint{FT}(pi); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vmesh = Meshes.IntervalMesh(vdomain, nelems = 16) vtopology = diff --git a/test/Remapping/distributed_remapping.jl b/test/Remapping/distributed_remapping.jl index e232821067..cd76c63e68 100644 --- a/test/Remapping/distributed_remapping.jl +++ b/test/Remapping/distributed_remapping.jl @@ -30,7 +30,7 @@ if !(device isa ClimaComms.CUDADevice) vertdomain = Domains.IntervalDomain( Geometry.ZPoint(0.0), Geometry.ZPoint(1000.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = 30) @@ -86,7 +86,7 @@ end vertdomain = Domains.IntervalDomain( Geometry.ZPoint(0.0), Geometry.ZPoint(1000.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = 30) @@ -166,7 +166,7 @@ end vertdomain = Domains.IntervalDomain( Geometry.ZPoint(0.0), Geometry.ZPoint(1000.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = 30) @@ -247,7 +247,7 @@ end vertdomain = Domains.IntervalDomain( Geometry.ZPoint(0.0), Geometry.ZPoint(1000.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = 30) diff --git a/test/Remapping/interpolate_array.jl b/test/Remapping/interpolate_array.jl index d16d0a1019..948343e047 100644 --- a/test/Remapping/interpolate_array.jl +++ b/test/Remapping/interpolate_array.jl @@ -18,7 +18,7 @@ device = ClimaComms.CPUSingleThreaded() vertdomain = Domains.IntervalDomain( Geometry.ZPoint(0.0), Geometry.ZPoint(1000.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = 30) @@ -74,7 +74,7 @@ end vertdomain = Domains.IntervalDomain( Geometry.ZPoint(0.0), Geometry.ZPoint(1000.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = 30) @@ -129,7 +129,7 @@ end vertdomain = Domains.IntervalDomain( Geometry.ZPoint(0.0), Geometry.ZPoint(1000.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = 30) @@ -186,7 +186,7 @@ end vertdomain = Domains.IntervalDomain( Geometry.ZPoint(0.0), Geometry.ZPoint(1000.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = 30) diff --git a/test/Spaces/ddss1_cs.jl b/test/Spaces/ddss1_cs.jl index ea90819fcd..a2b95b6949 100644 --- a/test/Spaces/ddss1_cs.jl +++ b/test/Spaces/ddss1_cs.jl @@ -91,7 +91,7 @@ end z_domain = Domains.IntervalDomain( Geometry.ZPoint(zero(z_max)), Geometry.ZPoint(z_max); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) z_mesh = Meshes.IntervalMesh(z_domain, nelems = z_elem) z_topology = Topologies.IntervalTopology(context, z_mesh) diff --git a/test/Spaces/distributed_cuda/space_construction.jl b/test/Spaces/distributed_cuda/space_construction.jl index 8276032a2b..da99be802e 100644 --- a/test/Spaces/distributed_cuda/space_construction.jl +++ b/test/Spaces/distributed_cuda/space_construction.jl @@ -33,7 +33,7 @@ import ClimaCore: vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(zlim[1]), Geometry.ZPoint{FT}(zlim[2]); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = zelem) vtopology = Topologies.IntervalTopology(vcontext, vertmesh) diff --git a/test/Spaces/spaces.jl b/test/Spaces/spaces.jl index 336d7491cd..482aa0dc3b 100644 --- a/test/Spaces/spaces.jl +++ b/test/Spaces/spaces.jl @@ -83,7 +83,7 @@ on_gpu || @testset "extruded (2d 1×3) finite difference space" begin vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(0), Geometry.ZPoint{FT}(10); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, Meshes.Uniform(), nelems = 10) diff --git a/test/Spaces/sphere.jl b/test/Spaces/sphere.jl index a2dedb922a..17305d9536 100644 --- a/test/Spaces/sphere.jl +++ b/test/Spaces/sphere.jl @@ -96,7 +96,7 @@ end vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(zlim[1]), Geometry.ZPoint{FT}(zlim[2]); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = zelem) vertgrid = Grids.FiniteDifferenceGrid(vertmesh) diff --git a/test/Spaces/terrain_warp.jl b/test/Spaces/terrain_warp.jl index c9febb392e..c8dd5d5083 100644 --- a/test/Spaces/terrain_warp.jl +++ b/test/Spaces/terrain_warp.jl @@ -53,7 +53,7 @@ function generate_base_spaces( vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(zlim[1]), Geometry.ZPoint{FT}(zlim[2]); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, stretch, nelems = velem) vert_face_space = Spaces.FaceFiniteDifferenceSpace(vertmesh) diff --git a/test/TestUtilities/TestUtilities.jl b/test/TestUtilities/TestUtilities.jl index 720393c3f0..3fb60eab91 100644 --- a/test/TestUtilities/TestUtilities.jl +++ b/test/TestUtilities/TestUtilities.jl @@ -72,7 +72,7 @@ function ColumnCenterFiniteDifferenceSpace( domain = Domains.IntervalDomain( Geometry.ZPoint{FT}(zlim[1]), Geometry.ZPoint{FT}(zlim[2]); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) mesh = Meshes.IntervalMesh(domain, nelems = zelem) topology = Topologies.IntervalTopology(context, mesh) @@ -115,7 +115,7 @@ function CenterExtrudedFiniteDifferenceSpace( vertdomain = Domains.IntervalDomain( Geometry.ZPoint{FT}(zlim[1]), Geometry.ZPoint{FT}(zlim[2]); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) vertmesh = Meshes.IntervalMesh(vertdomain, nelems = zelem) vtopology = Topologies.IntervalTopology(context, vertmesh) diff --git a/test/Topologies/interval.jl b/test/Topologies/interval.jl index 11be63f170..c9643e87c7 100644 --- a/test/Topologies/interval.jl +++ b/test/Topologies/interval.jl @@ -7,7 +7,7 @@ using ClimaCore: Geometry, Domains, Meshes, Topologies domain = Domains.IntervalDomain( Geometry.ZPoint(0.0), Geometry.ZPoint(10.0); - boundary_tags = (:bottom, :top), + boundary_names = (:bottom, :top), ) mesh1 = Meshes.IntervalMesh(domain, [Geometry.ZPoint(Float64(i)) for i in 0:10]) mesh2 = Meshes.IntervalMesh(domain, [Geometry.ZPoint(Float64(i)) for i in 0:10])