From 5b83efaca9fa8faf422bd58929eb9ae043351cde Mon Sep 17 00:00:00 2001 From: Navid Constantinou Date: Tue, 20 Oct 2020 11:36:58 +1100 Subject: [PATCH 1/2] remove import of deprecated getfieldspecs --- src/barotropicqg.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/barotropicqg.jl b/src/barotropicqg.jl index acb129f2..33652276 100644 --- 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 From c0645b1fd5ad6d27d028c47ad1c1fdbec6d48e3b Mon Sep 17 00:00:00 2001 From: Navid Constantinou Date: Tue, 20 Oct 2020 12:19:46 +1100 Subject: [PATCH 2/2] MQG tests only on CPU --- test/runtests.jl | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index 27fb6eee..544a71ad 100644 --- 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)