Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove import of deprecated getfieldspecs #126

Merged
merged 2 commits into from
Oct 20, 2020
Merged

Remove import of deprecated getfieldspecs #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b83efa
remove import of deprecated getfieldspecs
navidcy Oct 20, 2020
c0645b1
MQG tests only on CPU
navidcy Oct 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/barotropicqg.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ using

using FFTW: rfft
using LinearAlgebra: mul!, ldiv!
using FourierFlows: getfieldspecs, parsevalsum, parsevalsum2
using FourierFlows: parsevalsum, parsevalsum2

nothingfunction(args...) = nothing

Expand Down
41 changes: 22 additions & 19 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -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)