Merge pull request #1074 from CliMA/glw/fix-leith

Fix Leith closure
CliMA · Oct 19, 2020 · 58a99b0 · 58a99b0
2 parents 27265b8 + 9deb091
commit 58a99b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/TurbulenceClosures/TurbulenceClosures.jl b/src/TurbulenceClosures/TurbulenceClosures.jl
@@ -94,12 +94,12 @@ dissipation principle with model parameters stored as properties of type `FT`.
 abstract type AbstractAnisotropicMinimumDissipation{FT} <: AbstractIsotropicDiffusivity end
 
 """
-    AbstractLeith{FT} <: AbstractTurbulenceClosure
+    AbstractLeith{FT} <: AbstractIsotropicDiffusivity
 
 Abstract supertype for large eddy simulation models based on the Leith viscosity
 principle with model parameters stored as properties of type `FT`.
 """
-abstract type AbstractLeith{FT} <: AbstractTurbulenceClosure end
+abstract type AbstractLeith{FT} <: AbstractIsotropicDiffusivity end
 
 #####
 ##### 'Tupled closure' implementation

diff --git a/test/test_time_stepping.jl b/test/test_time_stepping.jl
@@ -268,8 +268,9 @@ timesteppers = (:QuasiAdamsBashforth2, :RungeKutta3)
 
             for Closure in Closures
                 @info "  Testing that time stepping works [$(typeof(arch)), $FT, $Closure]..."
-                if Closure === TwoDimensionalLeith
-                    # This test is extremely slow; skipping for now.
+                if Closure === TwoDimensionalLeith && arch isa CPU
+                    # This test is extremely slow so we skip.
+                    # See: https://github.com/CliMA/Oceananigans.jl/pull/1074
                     @test_skip time_stepping_works_with_closure(arch, FT, Closure)
                 else
                     @test time_stepping_works_with_closure(arch, FT, Closure)