Merge branch 'master' into fixsqg

FourierFlows · Nov 4, 2020 · 19ad60e · 19ad60e
2 parents d59ea5d + c4db658
commit 19ad60e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -2,7 +2,7 @@ name = "GeophysicalFlows"
 uuid = "44ee3b1c-bc02-53fa-8355-8e347616e15e"
 license = "MIT"
 authors = ["Navid C. Constantinou <navidcy@gmail.com>", "Gregory L. Wagner <wagner.greg@gmail.com>"]
-version = "0.8.0"
+version = "0.8.1"
 
 [deps]
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
@@ -17,14 +17,14 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [compat]
-CUDA = "^1"
+CUDA = "^1, ^2"
 FFTW = "^1"
 FourierFlows = "^0.6"
 JLD2 = "^0.1, ^0.2"
 Reexport = "^0.2"
 SpecialFunctions = "^0.10, ^1"
 StaticArrays = "^0.12"
-julia = "^1.4"
+julia = "^1.5"
 
 [extras]
 Coverage = "a2441757-f6aa-5fb2-8edb-039e3f45d037"

diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ All modules provide solvers on two-dimensional domains. We currently provide
 
 The code is citable via [zenodo](https://zenodo.org). Please cite as:
 
-> Navid C. Constantinou, Gregory L. Wagner. (2020). FourierFlows/GeophysicalFlows.jl: GeophysicalFlows v0.8.0  (Version v0.8.0). Zenodo.  [http://doi.org/10.5281/zenodo.1463809](http://doi.org/10.5281/zenodo.1463809)
+> Navid C. Constantinou, Gregory L. Wagner. (2020). FourierFlows/GeophysicalFlows.jl: GeophysicalFlows v0.8.0  (Version v0.8.1). Zenodo.  [http://doi.org/10.5281/zenodo.1463809](http://doi.org/10.5281/zenodo.1463809)
 
 
 [FourierFlows.jl]: https://github.com/FourierFlows/FourierFlows.jl

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
@@ -135,6 +135,28 @@ for dev in devices
   end
 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)