Merge branch 'master' into v2-state

CITATION.cff

@@ -10,6 +10,8 @@ authors:
     email: [email protected]
     affiliation: Weierstrass Institute Berlin
     orcid: 'https://orcid.org/0000-0003-4432-2434'
+  - given-names: Patrick
+    family-names: Jaap
   - given-names: Dilara
     family-names: Abdel
   - given-names: Jan

Project.toml

@@ -1,7 +1,7 @@
 name = "VoronoiFVM"
 uuid = "82b139dc-5afc-11e9-35da-9b9bdfd336f3"
-authors = ["Jürgen Fuhrmann <[email protected]>", "Dilara Abdel", "Jan Weidner", "Alexander Seiler", "Patricio Farrell", "Matthias Liero"]
-version = "1.24.1"
+authors = ["Jürgen Fuhrmann <[email protected]>", "Patrick Jaap", "Dilara Abdel", "Jan Weidner", "Alexander Seiler", "Patricio Farrell", "Matthias Liero"]
+version = "1.25.1"
 
 [deps]
 BandedMatrices = "aae01518-5342-5314-be14-df237901396f"

src/VoronoiFVM.jl

@@ -6,6 +6,7 @@ $(read(joinpath(@__DIR__,"..","README.md"),String))
 module VoronoiFVM
 
 using BandedMatrices: BandedMatrices, BandedMatrix, Zeros
+import Colors
 using CommonSolve: CommonSolve, solve, solve!
 using DiffResults: DiffResults
 using DocStringExtensions: DocStringExtensions, SIGNATURES, TYPEDEF,
@@ -34,6 +35,7 @@ using ExtendableSparse: ExtendableSparse, BlockPreconditioner,
 #                        STExtendableSparseMatrixCSC,
 
 using ForwardDiff: ForwardDiff
+using GridVisualize: GridVisualize, GridVisualizer
 using InteractiveUtils: InteractiveUtils
 using JLD2: JLD2, jldopen
 using LinearAlgebra: LinearAlgebra, Diagonal, I, Tridiagonal, isdiag, ldiv!, norm
@@ -54,6 +56,8 @@ using Statistics: Statistics, mean
 using Symbolics: Symbolics
 using Compat: @compat
 
+
+
 include("vfvm_physics.jl")
 @compat public Physics
 

src/gridvisualize.jl

@@ -1,7 +1,3 @@
-# Extend GridVisualize methods
-import GridVisualize
-import Colors
-
 """
     $(TYPEDSIGNATURES)
 
@@ -41,10 +37,10 @@ Plot one species from transient solution
 """
 function GridVisualize.scalarplot(sys::AbstractSystem, sol::AbstractTransientSolution; species = 1, scale = 1.0, tscale = :identity,
                                   kwargs...)
-    vis = GridVisualizer(kwargs...)
+    vis = GridVisualizer(;kwargs...)
     if !isnothing(vis.Plotter)
-        scalarplot!(vis[1, 1], sys, sol; species = species, scale = scale, tscale = tscale, kwargs...)
-        reveal(vis)
+        GridVisualize.scalarplot!(vis[1, 1], sys, sol; species = species, scale = scale, tscale = tscale, kwargs...)
+        GridVisualize.reveal(vis)
     end
 end
 

src/vfvm_postprocess.jl

@@ -61,7 +61,7 @@ function integrate(system::AbstractSystem{Tv, Tc, Ti, Tm}, F::Function, U::Abstr
 end
 
 """
-    integrate(system,F,U; boundary=false)
+    integrate(system,U; boundary=false)
 
 Integrate solution vector region-wise over domain or boundary.
 The result is an `nspec x nregion` matrix.