Merge pull request #1581 from CliMA/ck/cleanup

Remove duplicate quadratures module
CliMA · Dec 20, 2023 · 2979991 · 2979991
2 parents d261a88 + 2dc2b09
commit 2979991
Show file tree

Hide file tree

Showing 118 changed files with 620 additions and 603 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -172,9 +172,9 @@ steps:
   - group: "Unit: Spaces"
     steps:
 
-      - label: "Unit: quadrature"
+      - label: "Unit: Quadratures"
         key: unit_quadrature
-        command: "julia --color=yes --check-bounds=yes --project=test test/Spaces/quadrature.jl"
+        command: "julia --color=yes --check-bounds=yes --project=test test/Quadratures/Quadratures.jl"
 
       - label: "Unit: spaces"
         key: unit_spaces

diff --git a/benchmarks/3d/se_kernels.jl b/benchmarks/3d/se_kernels.jl
@@ -11,6 +11,7 @@ import ClimaCore:
     Meshes,
     Operators,
     Spaces,
+    Quadratures,
     Topologies,
     DataLayouts,
     RecursiveApply
@@ -73,7 +74,7 @@ function initialize_mwe(device, ::Type{FT}) where {FT}
         horizontal_mesh,
         Topologies.spacefillingcurve(horizontal_mesh),
     )
-    quad = Spaces.Quadratures.GLL{npoly + 1}()
+    quad = Quadratures.GLL{npoly + 1}()
     h_space = Spaces.SpectralElementSpace2D(horizontal_topology, quad)
 
     # vertical space

diff --git a/benchmarks/3d/vector_laplacian.jl b/benchmarks/3d/vector_laplacian.jl
@@ -1,13 +1,20 @@
 
 using ClimaComms
 using ClimaCore:
-    Geometry, Domains, Meshes, Topologies, Spaces, Fields, Operators
+    Geometry,
+    Domains,
+    Meshes,
+    Topologies,
+    Spaces,
+    Fields,
+    Operators,
+    Quadratures
 using CUDA, BenchmarkTools
 
 hdomain = Domains.SphereDomain(6.37122e6)
 hmesh = Meshes.EquiangularCubedSphere(hdomain, 30)
 htopology = Topologies.Topology2D(hmesh)
-hspace = Spaces.SpectralElementSpace2D(htopology, Spaces.Quadratures.GLL{4}())
+hspace = Spaces.SpectralElementSpace2D(htopology, Quadratures.GLL{4}())
 
 vdomain = Domains.IntervalDomain(
     Geometry.ZPoint(0.0),

diff --git a/benchmarks/bickleyjet/bickleyjet_dg_reference.jl b/benchmarks/bickleyjet/bickleyjet_dg_reference.jl
@@ -1,11 +1,12 @@
 using Base.Threads
 import ClimaCore.Spaces
+import ClimaCore.Quadratures
 using CUDA
 
 function spaceconfig(::Val{Nq}, ::Type{DA} = Array) where {Nq, DA}
-    quad = Spaces.Quadratures.GLL{Nq}()
-    ξ, W = Spaces.Quadratures.quadrature_points(Float64, quad)
-    D = Spaces.Quadratures.differentiation_matrix(Float64, quad)
+    quad = Quadratures.GLL{Nq}()
+    ξ, W = Quadratures.quadrature_points(Float64, quad)
+    D = Quadratures.differentiation_matrix(Float64, quad)
     return (DA(ξ), DA(W), DA(D))
 end
 

diff --git a/benchmarks/bickleyjet/core_vs_ref.jl b/benchmarks/bickleyjet/core_vs_ref.jl
@@ -22,7 +22,7 @@ for Nq in Nqs
     # setup core
     mesh = Meshes.RectilinearMesh(domain, n1, n2)
     grid_topology = Topologies.Topology2D(mesh)
-    quad = Spaces.Quadratures.GLL{Nq}()
+    quad = Quadratures.GLL{Nq}()
     space = Spaces.SpectralElementSpace2D(grid_topology, quad)
 
     y0 = init_state.(Fields.coordinate_field(space), Ref(parameters))

diff --git a/benchmarks/bickleyjet/run_ref_thread.jl b/benchmarks/bickleyjet/run_ref_thread.jl
@@ -10,7 +10,7 @@ Nq = 4
 
 mesh = Meshes.RectilinearMesh(domain, n1, n2)
 grid_topology = Topologies.Topology2D(mesh)
-quad = Spaces.Quadratures.GLL{Nq}()
+quad = Quadratures.GLL{Nq}()
 space = Spaces.SpectralElementSpace2D(grid_topology, quad)
 
 X = coordinates(Val(Nq), n1, n2)

diff --git a/docs/src/lib/ClimaCoreTempestRemap.md b/docs/src/lib/ClimaCoreTempestRemap.md
@@ -49,7 +49,7 @@ apply_remap
 The following example converts an OrdinaryDiffEq solution object `sol` to a netcdf file, and remaps it to an regular latitude-longitude (RLL) grid.
 
 ```julia
-using ClimaCore: Geometry, Meshes, Domains, Topologies, Spaces
+using ClimaCore: Geometry, Meshes, Domains, Topologies, Spaces, Quadratures
 using NCDatasets, ClimaCoreTempestRemap
 
 # sol is the integrator solution
@@ -58,7 +58,7 @@ using NCDatasets, ClimaCoreTempestRemap
 
 # the issue is that the Space types changed since this changed
 # we can reconstruct it by digging around a bit
-Nq = Spaces.Quadratures.degrees_of_freedom(Spaces.quadrature_style(cspace))
+Nq = Quadratures.degrees_of_freedom(Spaces.quadrature_style(cspace))
 
 datafile_cc = "test.nc"
 NCDataset(datafile_cc, "c") do nc
@@ -115,7 +115,7 @@ remap_weights(
     meshfile_rll,
     meshfile_overlap;
     in_type = "cgll",
-    in_np = Spaces.Quadratures.degrees_of_freedom(Spaces.quadrature_style(cspace)),
+    in_np = Quadratures.degrees_of_freedom(Spaces.quadrature_style(cspace)),
 )
 
 # apply remap

diff --git a/docs/tutorials/introduction.jl b/docs/tutorials/introduction.jl
@@ -84,7 +84,7 @@ column_face_space =
 # These nodes are chosen by a particular *quadrature rule*, which allows us to integrate functions over the domain. The only supported choice for now is a Gauss-Legendre-Lobatto rule.
 
 ## Gauss-Legendre-Lobatto quadrature with 4 nodes in each direction, so 16 in each element
-quad = ClimaCore.Spaces.Quadratures.GLL{4}()
+quad = ClimaCore.Quadratures.GLL{4}()
 rectangle_space =
     ClimaCore.Spaces.SpectralElementSpace2D(rectangle_topology, quad)
 #----------------------------------------------------------------------------

diff --git a/examples/bickleyjet/bickleyjet_cg.jl b/examples/bickleyjet/bickleyjet_cg.jl
@@ -2,7 +2,14 @@ using ClimaComms
 using LinearAlgebra
 
 import ClimaCore:
-    Domains, Fields, Geometry, Meshes, Operators, Spaces, Topologies
+    Domains,
+    Fields,
+    Geometry,
+    Meshes,
+    Operators,
+    Spaces,
+    Topologies,
+    Quadratures
 import ClimaCore.Geometry: ⊗
 
 using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
@@ -40,10 +47,10 @@ Nq = 4
 Nqh = 7
 mesh = Meshes.RectilinearMesh(domain, n1, n2)
 grid_topology = Topologies.Topology2D(context, mesh)
-quad = Spaces.Quadratures.GLL{Nq}()
+quad = Quadratures.GLL{Nq}()
 space = Spaces.SpectralElementSpace2D(grid_topology, quad)
 
-Iquad = Spaces.Quadratures.GLL{Nqh}()
+Iquad = Quadratures.GLL{Nqh}()
 Ispace = Spaces.SpectralElementSpace2D(grid_topology, Iquad)
 
 function init_state(coord, p)

diff --git a/examples/bickleyjet/bickleyjet_cg_invariant_hypervisc.jl b/examples/bickleyjet/bickleyjet_cg_invariant_hypervisc.jl
@@ -9,6 +9,7 @@ import ClimaCore:
     Operators,
     Spaces,
     Topologies,
+    Quadratures,
     DataLayouts
 using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
 
@@ -55,7 +56,7 @@ domain = Domains.RectangleDomain(
 )
 n1, n2 = 16, 16
 Nq = 4
-quad = Spaces.Quadratures.GLL{Nq}()
+quad = Quadratures.GLL{Nq}()
 mesh = Meshes.RectilinearMesh(domain, n1, n2)
 grid_topology = Topologies.Topology2D(context, mesh)
 if usempi

diff --git a/examples/bickleyjet/bickleyjet_cg_unsmesh.jl b/examples/bickleyjet/bickleyjet_cg_unsmesh.jl
@@ -2,7 +2,14 @@ using ClimaComms
 using LinearAlgebra
 
 import ClimaCore:
-    Domains, Fields, Geometry, Meshes, Operators, Spaces, Topologies
+    Domains,
+    Fields,
+    Geometry,
+    Meshes,
+    Operators,
+    Spaces,
+    Topologies,
+    Quadratures
 import ClimaCore.Geometry: ⊗
 
 using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
@@ -41,10 +48,10 @@ Nqh = 7
 
 mesh = Meshes.RectilinearMesh(domain, n1, n2)
 grid_topology = Topologies.Topology2D(context, mesh)
-quad = Spaces.Quadratures.GLL{Nq}()
+quad = Quadratures.GLL{Nq}()
 space = Spaces.SpectralElementSpace2D(grid_topology, quad)
 
-Iquad = Spaces.Quadratures.GLL{Nqh}()
+Iquad = Quadratures.GLL{Nqh}()
 Ispace = Spaces.SpectralElementSpace2D(grid_topology, Iquad)
 
 function init_state(coord, p)

diff --git a/examples/bickleyjet/bickleyjet_dg.jl b/examples/bickleyjet/bickleyjet_dg.jl
@@ -9,6 +9,7 @@ import ClimaCore:
     Operators,
     RecursiveApply,
     Spaces,
+    Quadratures,
     Topologies
 import ClimaCore.Geometry: ⊗
 import ClimaCore.RecursiveApply: ⊞, rdiv, rmap
@@ -51,10 +52,10 @@ Nq = 4
 Nqh = 7
 mesh = Meshes.RectilinearMesh(domain, n1, n2)
 grid_topology = Topologies.Topology2D(context, mesh)
-quad = Spaces.Quadratures.GLL{Nq}()
+quad = Quadratures.GLL{Nq}()
 space = Spaces.SpectralElementSpace2D(grid_topology, quad)
 
-Iquad = Spaces.Quadratures.GLL{Nqh}()
+Iquad = Quadratures.GLL{Nqh}()
 Ispace = Spaces.SpectralElementSpace2D(grid_topology, Iquad)
 
 function init_state(coord, p)
@@ -206,7 +207,7 @@ function rhs!(dydt, y, (parameters, numflux), t)
     # 6. Solve for final result
     dydt_data = Fields.field_values(dydt)
     dydt_data .= RecursiveApply.rdiv.(dydt_data, space.local_geometry.WJ)
-    M = Spaces.Quadratures.cutoff_filter_matrix(
+    M = Quadratures.cutoff_filter_matrix(
         Float64,
         Spaces.quadrature_style(space),
         3,

diff --git a/examples/common_spaces.jl b/examples/common_spaces.jl
@@ -1,5 +1,5 @@
 using ClimaComms
-using ClimaCore: Geometry, Domains, Meshes, Topologies, Spaces
+using ClimaCore: Geometry, Domains, Meshes, Topologies, Spaces, Quadratures
 
 function periodic_line_mesh(; x_max, x_elem)
     domain = Domains.IntervalDomain(
@@ -36,7 +36,7 @@ function make_horizontal_space(
     npoly,
     context::ClimaComms.SingletonCommsContext,
 )
-    quad = Spaces.Quadratures.GLL{npoly + 1}()
+    quad = Quadratures.GLL{npoly + 1}()
     if mesh isa Meshes.AbstractMesh1D
         topology = Topologies.IntervalTopology(mesh)
         space = Spaces.SpectralElementSpace1D(topology, quad)
@@ -52,7 +52,7 @@ function make_horizontal_space(
     npoly,
     comms_ctx::ClimaComms.MPICommsContext,
 )
-    quad = Spaces.Quadratures.GLL{npoly + 1}()
+    quad = Quadratures.GLL{npoly + 1}()
     if mesh isa Meshes.AbstractMesh1D
         error("Distributed mode does not work with 1D horizontal spaces.")
     elseif mesh isa Meshes.AbstractMesh2D

diff --git a/examples/hybrid/box/bubble_3d_invariant_rhoe.jl b/examples/hybrid/box/bubble_3d_invariant_rhoe.jl
@@ -24,6 +24,7 @@ import ClimaCore:
     Geometry,
     Topologies,
     Spaces,
+    Quadratures,
     Fields,
     Operators
 using ClimaCorePlots, Plots
@@ -149,7 +150,7 @@ function hvspace_3D(
     )
     Nv = Meshes.nelements(vertmesh)
     Nf_center, Nf_face = 2, 1 #1 + 3 + 1
-    quad = Spaces.Quadratures.GLL{npoly + 1}()
+    quad = Quadratures.GLL{npoly + 1}()
     horzmesh = Meshes.RectilinearMesh(horzdomain, xyelem, xyelem)
     horztopology = Topologies.Topology2D(comms_ctx, horzmesh)
     horzspace = Spaces.SpectralElementSpace2D(horztopology, quad)
@@ -191,7 +192,7 @@ end
 function compute_κ₄(sim_params::SimulationParameters{FT}) where {FT}
     (; lxy, xyelem, npoly) = sim_params
     quad_points, _ =
-        Spaces.Quadratures.quadrature_points(FT, Quadratures.GLL{npoly + 1}())
+        Quadratures.quadrature_points(FT, Quadratures.GLL{npoly + 1}())
     Δx = (lxy / xyelem) * diff(quad_points)[1] / 2
     κ₄ = 1.0e6 * (Δx / lxy)^3.2
     return κ₄

diff --git a/examples/hybrid/box/bubble_3d_invariant_rhotheta.jl b/examples/hybrid/box/bubble_3d_invariant_rhotheta.jl
@@ -5,12 +5,12 @@ using LinearAlgebra
 import ClimaCore:
     ClimaCore,
     slab,
-    Spaces,
     Domains,
     Meshes,
     Geometry,
     Topologies,
     Spaces,
+    Quadratures,
     Fields,
     Operators
 using ClimaCore.Geometry
@@ -56,7 +56,7 @@ function hvspace_3D(
     vertmesh = Meshes.IntervalMesh(zdomain, nelems = zelem)
     vert_center_space = Spaces.CenterFiniteDifferenceSpace(vertmesh)
 
-    quad = Spaces.Quadratures.GLL{npoly + 1}()
+    quad = Quadratures.GLL{npoly + 1}()
     horzspace = Spaces.SpectralElementSpace2D(horztopology, quad)
 
     hv_center_space =

diff --git a/examples/hybrid/box/bubble_3d_rhotheta.jl b/examples/hybrid/box/bubble_3d_rhotheta.jl
@@ -5,12 +5,12 @@ using LinearAlgebra, StaticArrays
 import ClimaCore:
     ClimaCore,
     slab,
-    Spaces,
     Domains,
     Meshes,
     Geometry,
     Topologies,
     Spaces,
+    Quadratures,
     Fields,
     Operators
 import ClimaCore.Geometry: ⊗
@@ -55,7 +55,7 @@ function hvspace_3D(
     vertmesh = Meshes.IntervalMesh(zdomain, nelems = zelem)
     vert_center_space = Spaces.CenterFiniteDifferenceSpace(vertmesh)
 
-    quad = Spaces.Quadratures.GLL{npoly + 1}()
+    quad = Quadratures.GLL{npoly + 1}()
     horzspace = Spaces.SpectralElementSpace2D(horztopology, quad)
 
     hv_center_space =

diff --git a/examples/hybrid/box/limiters_advection.jl b/examples/hybrid/box/limiters_advection.jl
@@ -16,6 +16,7 @@ import ClimaCore:
     Meshes,
     Operators,
     Spaces,
+    Quadratures,
     Topologies,
     Limiters,
     slab
@@ -80,7 +81,7 @@ function hvspace_3D(
     z_topology = Topologies.IntervalTopology(context, z_mesh)
     z_space = Spaces.CenterFiniteDifferenceSpace(z_topology)
 
-    quad = Spaces.Quadratures.GLL{Nij}()
+    quad = Quadratures.GLL{Nij}()
     hspace = Spaces.SpectralElementSpace2D(horztopology, quad)
     cspace = Spaces.ExtrudedFiniteDifferenceSpace(hspace, z_space)
     fspace = Spaces.FaceExtrudedFiniteDifferenceSpace(cspace)

diff --git a/examples/hybrid/hybrid3dcs_dss.jl b/examples/hybrid/hybrid3dcs_dss.jl
@@ -12,6 +12,7 @@ import ClimaCore:
     Meshes,
     Operators,
     Spaces,
+    Quadratures,
     Topologies,
     DataLayouts
 
@@ -69,7 +70,7 @@ function hybrid3dcubedsphere_dss_profiler(
     z_stretch_string = "uniform"
     horizontal_mesh = cubed_sphere_mesh(; radius = R, h_elem = h_elem)
 
-    quad = Spaces.Quadratures.GLL{npoly + 1}()
+    quad = Quadratures.GLL{npoly + 1}()
     h_topology = Topologies.Topology2D(
         comms_ctx,
         horizontal_mesh,

diff --git a/examples/hybrid/plane/bubble_2d_invariant_rhoe.jl b/examples/hybrid/plane/bubble_2d_invariant_rhoe.jl
@@ -12,6 +12,7 @@ import ClimaCore:
     Geometry,
     Topologies,
     Spaces,
+    Quadratures,
     Fields,
     Operators
 using ClimaCore.Geometry
@@ -44,7 +45,7 @@ function hvspace_2D(
     horzmesh = Meshes.IntervalMesh(horzdomain, nelems = xelem)
     horztopology = Topologies.IntervalTopology(horzmesh)
 
-    quad = Spaces.Quadratures.GLL{npoly + 1}()
+    quad = Quadratures.GLL{npoly + 1}()
     horzspace = Spaces.SpectralElementSpace1D(horztopology, quad)
 
     hv_center_space =

diff --git a/examples/hybrid/plane/density_current_2d_flux_form.jl b/examples/hybrid/plane/density_current_2d_flux_form.jl
@@ -4,12 +4,12 @@ using LinearAlgebra, StaticArrays
 import ClimaCore:
     ClimaCore,
     slab,
-    Spaces,
     Domains,
     Meshes,
     Geometry,
     Topologies,
     Spaces,
+    Quadratures,
     Fields,
     Operators
 import ClimaCore.Geometry: ⊗
@@ -43,7 +43,7 @@ function hvspace_2D(
     horzmesh = Meshes.IntervalMesh(horzdomain; nelems = helem)
     horztopology = Topologies.IntervalTopology(horzmesh)
 
-    quad = Spaces.Quadratures.GLL{npoly + 1}()
+    quad = Quadratures.GLL{npoly + 1}()
     horzspace = Spaces.SpectralElementSpace1D(horztopology, quad)
 
     hv_center_space =