Merge pull request #126 from FourierFlows/patch

Remove import of deprecated getfieldspecs
FourierFlows · Oct 20, 2020 · 3854ea3 · 3854ea3
2 parents 0b599a0 + c0645b1
commit 3854ea3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/src/barotropicqg.jl b/src/barotropicqg.jl
@@ -24,7 +24,7 @@ using
 
 using FFTW: rfft
 using LinearAlgebra: mul!, ldiv!
-using FourierFlows: getfieldspecs, parsevalsum, parsevalsum2
+using FourierFlows: parsevalsum, parsevalsum2
 
 nothingfunction(args...) = nothing
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -99,25 +99,6 @@ for dev in devices
     @test BarotropicQGQL.nothingfunction() == nothing
   end
 
-  @testset "MultilayerQG" begin
-    include("test_multilayerqg.jl")
-
-    @test test_pvtofromstreamfunction_2layer(dev)
-    @test test_pvtofromstreamfunction_3layer(dev)
-    @test test_mqg_rossbywave("RK4", 1e-2, 20, dev)
-    @test test_mqg_nonlinearadvection(0.005, "ForwardEuler", dev)
-    @test test_mqg_linearadvection(0.005, "ForwardEuler", dev)
-    @test test_mqg_energies(dev)
-    @test test_mqg_energysinglelayer(dev)
-    @test test_mqg_fluxes(dev)
-    @test test_mqg_fluxessinglelayer(dev)
-    @test test_mqg_setqsetψ(dev)
-    @test test_mqg_paramsconstructor(dev)
-    @test test_mqg_stochasticforcedproblemconstructor(dev)
-    @test test_mqg_problemtype(dev, Float32)
-    @test MultilayerQG.nothingfunction() == nothing
-  end
-
   @testset "SurfaceQG" begin
     include("test_surfaceqg.jl")
 
@@ -134,6 +115,28 @@ for dev in devices
 
 end
 
+dev = CPU()
+println("following tests only on "*string(typeof(dev)))
+
+@testset "MultilayerQG" begin
+  include("test_multilayerqg.jl")
+
+  @test test_pvtofromstreamfunction_2layer(dev)
+  @test test_pvtofromstreamfunction_3layer(dev)
+  @test test_mqg_rossbywave("RK4", 1e-2, 20, dev)
+  @test test_mqg_nonlinearadvection(0.005, "ForwardEuler", dev)
+  @test test_mqg_linearadvection(0.005, "ForwardEuler", dev)
+  @test test_mqg_energies(dev)
+  @test test_mqg_energysinglelayer(dev)
+  @test test_mqg_fluxes(dev)
+  @test test_mqg_fluxessinglelayer(dev)
+  @test test_mqg_setqsetψ(dev)
+  @test test_mqg_paramsconstructor(dev)
+  @test test_mqg_stochasticforcedproblemconstructor(dev)
+  @test test_mqg_problemtype(dev, Float32)
+  @test MultilayerQG.nothingfunction() == nothing
+end
+
 end # time
 
 println("Total test time: ", testtime)