Apply formatter

CliMA · Dec 20, 2023 · 6800ed5 · 6800ed5
1 parent 643c24d
commit 6800ed5
Show file tree

Hide file tree

Showing 50 changed files with 349 additions and 82 deletions.
diff --git a/benchmarks/3d/vector_laplacian.jl b/benchmarks/3d/vector_laplacian.jl
@@ -1,7 +1,14 @@
 
 using ClimaComms
 using ClimaCore:
-    Geometry, Domains, Meshes, Topologies, Spaces, Fields, Operators, Quadratures
+    Geometry,
+    Domains,
+    Meshes,
+    Topologies,
+    Spaces,
+    Fields,
+    Operators,
+    Quadratures
 using CUDA, BenchmarkTools
 
 hdomain = Domains.SphereDomain(6.37122e6)

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, Quadratures
+    Domains,
+    Fields,
+    Geometry,
+    Meshes,
+    Operators,
+    Spaces,
+    Topologies,
+    Quadratures
 import ClimaCore.Geometry: ⊗
 
 using OrdinaryDiffEq: ODEProblem, solve, SSPRK33

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, Quadratures
+    Domains,
+    Fields,
+    Geometry,
+    Meshes,
+    Operators,
+    Spaces,
+    Topologies,
+    Quadratures
 import ClimaCore.Geometry: ⊗
 
 using OrdinaryDiffEq: ODEProblem, solve, SSPRK33

diff --git a/examples/hybrid/sphere/deformation_flow.jl b/examples/hybrid/sphere/deformation_flow.jl
@@ -4,7 +4,15 @@ using Test
 using Statistics: mean
 
 using ClimaCore:
-    Geometry, Domains, Meshes, Topologies, Spaces, Fields, Operators, Limiters, Quadratures
+    Geometry,
+    Domains,
+    Meshes,
+    Topologies,
+    Spaces,
+    Fields,
+    Operators,
+    Limiters,
+    Quadratures
 using ClimaTimeSteppers
 
 using Logging

diff --git a/examples/hybrid/sphere/remap_pipeline.jl b/examples/hybrid/sphere/remap_pipeline.jl
@@ -1,5 +1,6 @@
 import ClimaCore
-using ClimaCore: Geometry, Meshes, Domains, Topologies, Spaces, Operators, Quadratures
+using ClimaCore:
+    Geometry, Meshes, Domains, Topologies, Spaces, Operators, Quadratures
 using NCDatasets
 using ClimaCoreTempestRemap
 

diff --git a/examples/plane/limiters_advection.jl b/examples/plane/limiters_advection.jl
@@ -2,7 +2,15 @@ using ClimaComms
 using LinearAlgebra
 
 import ClimaCore:
-    Domains, Fields, Geometry, Meshes, Operators, Spaces, Topologies, Limiters, Quadratures
+    Domains,
+    Fields,
+    Geometry,
+    Meshes,
+    Operators,
+    Spaces,
+    Topologies,
+    Limiters,
+    Quadratures
 
 using OrdinaryDiffEq: ODEProblem, solve
 using ClimaTimeSteppers

diff --git a/examples/sphere/limiters_advection.jl b/examples/sphere/limiters_advection.jl
@@ -2,7 +2,15 @@ using ClimaComms
 using LinearAlgebra
 
 import ClimaCore:
-    Domains, Fields, Geometry, Meshes, Operators, Spaces, Topologies, Limiters, Quadratures
+    Domains,
+    Fields,
+    Geometry,
+    Meshes,
+    Operators,
+    Spaces,
+    Topologies,
+    Limiters,
+    Quadratures
 
 using OrdinaryDiffEq, Test
 

diff --git a/examples/sphere/solidbody.jl b/examples/sphere/solidbody.jl
@@ -2,7 +2,14 @@ using ClimaComms
 using LinearAlgebra
 
 import ClimaCore:
-    Domains, Fields, Geometry, Meshes, Operators, Spaces, Topologies, Quadratures
+    Domains,
+    Fields,
+    Geometry,
+    Meshes,
+    Operators,
+    Spaces,
+    Topologies,
+    Quadratures
 
 using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
 

diff --git a/lib/ClimaCoreTempestRemap/src/ClimaCoreTempestRemap.jl b/lib/ClimaCoreTempestRemap/src/ClimaCoreTempestRemap.jl
@@ -6,7 +6,8 @@ export def_time_coord, def_space_coord
 
 using ClimaComms
 import ClimaCore
-using ClimaCore: Geometry, Meshes, Domains, Topologies, Spaces, Fields, Quadratures
+using ClimaCore:
+    Geometry, Meshes, Domains, Topologies, Spaces, Fields, Quadratures
 
 using NCDatasets, Dates, PkgVersion, LinearAlgebra, TempestRemap_jll
 

diff --git a/lib/ClimaCoreTempestRemap/test/mpi_tests/online_remap.jl b/lib/ClimaCoreTempestRemap/test/mpi_tests/online_remap.jl
@@ -1,7 +1,8 @@
 import ClimaCore
 import ClimaCoreTempestRemap as CCTR
 using ClimaComms
-using ClimaCore: Geometry, Meshes, Domains, Topologies, Spaces, Fields, Quadratures
+using ClimaCore:
+    Geometry, Meshes, Domains, Topologies, Spaces, Fields, Quadratures
 using Test
 # use these packages for manual inspection of solutions
 # using Plots

diff --git a/lib/ClimaCoreTempestRemap/test/netcdf.jl b/lib/ClimaCoreTempestRemap/test/netcdf.jl
@@ -1,7 +1,14 @@
 import ClimaCore
 using ClimaComms
 using ClimaCore:
-    Geometry, Meshes, Domains, Topologies, Spaces, Fields, Hypsography, Quadratures
+    Geometry,
+    Meshes,
+    Domains,
+    Topologies,
+    Spaces,
+    Fields,
+    Hypsography,
+    Quadratures
 using NCDatasets
 using TempestRemap_jll
 using Test

diff --git a/lib/ClimaCoreTempestRemap/test/online_remap.jl b/lib/ClimaCoreTempestRemap/test/online_remap.jl
@@ -1,6 +1,7 @@
 import ClimaCore
 using ClimaComms
-using ClimaCore: Geometry, Meshes, Domains, Topologies, Spaces, Fields, Quadratures
+using ClimaCore:
+    Geometry, Meshes, Domains, Topologies, Spaces, Fields, Quadratures
 using NCDatasets
 using Test
 using ClimaCoreTempestRemap
@@ -59,10 +60,7 @@ end
         ClimaComms.SingletonCommsContext(),
         mesh_i,
     )
-    space_i = Spaces.SpectralElementSpace2D(
-        topology_i,
-        Quadratures.GLL{nq_i}(),
-    )
+    space_i = Spaces.SpectralElementSpace2D(topology_i, Quadratures.GLL{nq_i}())
     coords_i = Fields.coordinate_field(space_i)
 
     # construct target mesh
@@ -71,10 +69,7 @@ end
         ClimaComms.SingletonCommsContext(),
         mesh_o,
     )
-    space_o = Spaces.SpectralElementSpace2D(
-        topology_o,
-        Quadratures.GLL{nq_o}(),
-    )
+    space_o = Spaces.SpectralElementSpace2D(topology_o, Quadratures.GLL{nq_o}())
     coords_o = Fields.coordinate_field(space_o)
 
     # generate test data in the Field format

diff --git a/lib/ClimaCoreVTK/src/space.jl b/lib/ClimaCoreVTK/src/space.jl
@@ -104,9 +104,7 @@ an unstuctured mesh of linear cells, suitable for passing to
 `vtk_grid`.
 """
 function vtk_cells_linear(gridspace::Spaces.SpectralElementSpace2D)
-    Nq = Quadratures.degrees_of_freedom(
-        Spaces.quadrature_style(gridspace),
-    )
+    Nq = Quadratures.degrees_of_freedom(Spaces.quadrature_style(gridspace))
     Nh = Topologies.nlocalelems(gridspace)
     ind = LinearIndices((1:Nq, 1:Nq, 1:Nh))
     cells = [
@@ -226,20 +224,14 @@ This generally does two things:
  - Modifies the vertical space to be on the centers.
 """
 function vtk_cell_space(gridspace::Spaces.SpectralElementSpace1D)
-    @assert Spaces.quadrature_style(gridspace) isa
-            Quadratures.ClosedUniform
-    Nq = Quadratures.degrees_of_freedom(
-        Spaces.quadrature_style(gridspace),
-    )
+    @assert Spaces.quadrature_style(gridspace) isa Quadratures.ClosedUniform
+    Nq = Quadratures.degrees_of_freedom(Spaces.quadrature_style(gridspace))
     quad = Quadratures.Uniform{Nq - 1}()
     return Spaces.SpectralElementSpace1D(Spaces.topology(gridspace), quad)
 end
 function vtk_cell_space(gridspace::Spaces.SpectralElementSpace2D)
-    @assert Spaces.quadrature_style(gridspace) isa
-            Quadratures.ClosedUniform
-    Nq = Quadratures.degrees_of_freedom(
-        Spaces.quadrature_style(gridspace),
-    )
+    @assert Spaces.quadrature_style(gridspace) isa Quadratures.ClosedUniform
+    Nq = Quadratures.degrees_of_freedom(Spaces.quadrature_style(gridspace))
     quad = Quadratures.Uniform{Nq - 1}()
     return Spaces.SpectralElementSpace2D(Spaces.topology(gridspace), quad)
 end

diff --git a/lib/ClimaCoreVTK/test/runtests.jl b/lib/ClimaCoreVTK/test/runtests.jl
@@ -3,7 +3,14 @@ using ClimaComms
 using ClimaCoreVTK
 using IntervalSets
 import ClimaCore:
-    Geometry, Domains, Meshes, Topologies, Spaces, Fields, Operators, Quadratures
+    Geometry,
+    Domains,
+    Meshes,
+    Topologies,
+    Spaces,
+    Fields,
+    Operators,
+    Quadratures
 
 OUTPUT_DIR = mkpath(get(ENV, "CI_OUTPUT_DIR", tempname()))
 mkpath(joinpath(OUTPUT_DIR, "series"))

diff --git a/test/Fields/field.jl b/test/Fields/field.jl
@@ -828,9 +828,7 @@ end
         TU.bycolumnable(space) || continue
         hspace = Spaces.horizontal_space(space)
         Nh = Topologies.nlocalelems(hspace)
-        Nq = Quadratures.degrees_of_freedom(
-            Spaces.quadrature_style(hspace),
-        )
+        Nq = Quadratures.degrees_of_freedom(Spaces.quadrature_style(hspace))
         if nameof(typeof(space)) == :SpectralElementSpace1D
             @test Fields.ncolumns(space) == Nh * Nq
         else

diff --git a/test/Fields/field_opt.jl b/test/Fields/field_opt.jl
@@ -5,7 +5,15 @@ import ClimaCore
 import ClimaCore.Utilities: PlusHalf, half
 import ClimaCore.DataLayouts: IJFH
 import ClimaCore:
-    Fields, slab, Domains, Topologies, Meshes, Operators, Spaces, Geometry, Quadratures
+    Fields,
+    slab,
+    Domains,
+    Topologies,
+    Meshes,
+    Operators,
+    Spaces,
+    Geometry,
+    Quadratures
 
 using FastBroadcast
 using LinearAlgebra: norm

diff --git a/test/Limiters/distributed/dlimiter.jl b/test/Limiters/distributed/dlimiter.jl
@@ -1,5 +1,13 @@
 using ClimaCore:
-    DataLayouts, Fields, Domains, Geometry, Topologies, Meshes, Spaces, Limiters, Quadratures
+    DataLayouts,
+    Fields,
+    Domains,
+    Geometry,
+    Topologies,
+    Meshes,
+    Spaces,
+    Limiters,
+    Quadratures
 using ClimaCore.RecursiveApply
 using ClimaCore: slab
 using Test

diff --git a/test/Limiters/limiter.jl b/test/Limiters/limiter.jl
@@ -6,7 +6,15 @@ import CUDA
 CUDA.allowscalar(false)
 using ClimaComms
 using ClimaCore:
-    DataLayouts, Fields, Domains, Geometry, Topologies, Meshes, Spaces, Limiters, Quadratures
+    DataLayouts,
+    Fields,
+    Domains,
+    Geometry,
+    Topologies,
+    Meshes,
+    Spaces,
+    Limiters,
+    Quadratures
 using ClimaCore.RecursiveApply
 using ClimaCore: slab
 using Test

diff --git a/test/MatrixFields/matrix_field_test_utils.jl b/test/MatrixFields/matrix_field_test_utils.jl
@@ -5,7 +5,14 @@ import Random: seed!
 
 import ClimaComms
 import ClimaCore:
-    Geometry, Domains, Meshes, Topologies, Hypsography, Spaces, Fields, Quadratures
+    Geometry,
+    Domains,
+    Meshes,
+    Topologies,
+    Hypsography,
+    Spaces,
+    Fields,
+    Quadratures
 using ClimaCore.MatrixFields
 
 # Test that an expression is true and that it is also type-stable.

diff --git a/test/Operators/finitedifference/implicit_stencils_utils.jl b/test/Operators/finitedifference/implicit_stencils_utils.jl
@@ -3,7 +3,8 @@ using ClimaComms
 using Random: seed!
 seed!(1) # ensures reproducibility
 
-using ClimaCore: Geometry, Domains, Meshes, Topologies, Spaces, Fields, Quadratures
+using ClimaCore:
+    Geometry, Domains, Meshes, Topologies, Spaces, Fields, Quadratures
 using ClimaCore: Operators
 import ClimaCore.Operators as OP
 

diff --git a/test/Operators/finitedifference/linsolve.jl b/test/Operators/finitedifference/linsolve.jl
@@ -5,7 +5,8 @@ import ClimaCore
 # To avoid JET failures in the error message
 ClimaCore.Operators.allow_mismatched_fd_spaces() = true
 
-using ClimaCore: Geometry, Domains, Meshes, Topologies, Spaces, Fields, Quadratures
+using ClimaCore:
+    Geometry, Domains, Meshes, Topologies, Spaces, Fields, Quadratures
 
 FT = Float32
 radius = FT(1e7)

diff --git a/test/Operators/finitedifference/opt_implicit_stencils.jl b/test/Operators/finitedifference/opt_implicit_stencils.jl
@@ -2,7 +2,8 @@ using Test
 using ClimaComms
 using Random: seed!
 
-using ClimaCore: Geometry, Domains, Meshes, Topologies, Spaces, Fields, Quadratures
+using ClimaCore:
+    Geometry, Domains, Meshes, Topologies, Spaces, Fields, Quadratures
 using ClimaCore: Operators
 
 struct CurriedTwoArgOperator{O, A}

diff --git a/test/Operators/finitedifference/tensor.jl b/test/Operators/finitedifference/tensor.jl
@@ -2,15 +2,21 @@ using Test
 
 using ClimaComms
 using ClimaCore:
-    Geometry, Domains, Meshes, Topologies, Spaces, Fields, Operators, Quadratures
+    Geometry,
+    Domains,
+    Meshes,
+    Topologies,
+    Spaces,
+    Fields,
+    Operators,
+    Quadratures
 using LinearAlgebra
 
 for FT in (Float32, Float64)
     hdomain = Domains.SphereDomain{FT}(6.37122e6)
     hmesh = Meshes.EquiangularCubedSphere(hdomain, 30)
     htopology = Topologies.Topology2D(hmesh)
-    hspace =
-        Spaces.SpectralElementSpace2D(htopology, Quadratures.GLL{4}())
+    hspace = Spaces.SpectralElementSpace2D(htopology, Quadratures.GLL{4}())
 
     vdomain = Domains.IntervalDomain(
         Geometry.ZPoint{FT}(0.0),

diff --git a/test/Operators/finitedifference/wfact.jl b/test/Operators/finitedifference/wfact.jl
@@ -6,7 +6,14 @@ import ClimaCore
 ClimaCore.Operators.allow_mismatched_fd_spaces() = true
 
 using ClimaCore:
-    Geometry, Domains, Meshes, Topologies, Spaces, Fields, Operators, Quadratures
+    Geometry,
+    Domains,
+    Meshes,
+    Topologies,
+    Spaces,
+    Fields,
+    Operators,
+    Quadratures
 
 import ClimaCore.Utilities: half
 import LinearAlgebra: norm_sqr