Merge pull request #37 from PieterjanRobbe/unstructured-mesh

Fix for unstructured grids with Cholsky/Spectral
PieterjanRobbe · Sep 15, 2021 · e2aeeb6 · e2aeeb6 · PieterjanRobbe · Sep 15, 2021
2 parents 9707e43 + 28202a7
commit e2aeeb6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "GaussianRandomFields"
 uuid = "e4b2fa32-6e09-5554-b718-106ed5adafe9"
-version = "2.1.3"
+version = "2.1.4"
 
 [deps]
 Arpack = "7d9fca2a-8960-54d3-9f78-7d1dccf2cb97"

diff --git a/src/covariance_functions/covariance_functions.jl b/src/covariance_functions/covariance_functions.jl
@@ -185,6 +185,9 @@ function apply(cov::CovarianceStructure, tx::NTuple{2,AbstractMatrix},
     Symmetric(C, :U)
 end
 
+# evaluate for unstructured grids
+apply(cov::CovarianceFunction{d}, x::AbstractMatrix{T}, y::AbstractMatrix{N}) where {d, T, N} = apply(cov.cov, (x,x), (x,x))
+
 # evaluate for KL eigenfunctions
 function apply(cov::CovarianceStructure, tx::NTuple{2,AbstractMatrix}, y::Tuple)
     x = first(tx) # select FE nodes

diff --git a/src/fem.jl b/src/fem.jl
@@ -39,7 +39,7 @@ function GaussianRandomField(mean::Vector{<:Real}, cov::CovarianceFunction{d}, m
     size(pts, 2) == d || throw(DimensionMismatch("second dimension of points must be equal to $(d)"))
     method isa CirculantEmbedding && throw(ArgumentError("cannot use circulant embedding with an unstructured grid"))
 
-    _GaussianRandomField(mean, cov, method, pts', Matrix{Int}(undef,0,0); kwargs...)
+    _GaussianRandomField(mean, cov, method, copy(pts'), Matrix{Int}(undef,0,0); kwargs...)
 end
 
 GaussianRandomField(cov::CovarianceFunction, method::GaussianRandomFieldGenerator,

diff --git a/test/test_unstructured.jl b/test/test_unstructured.jl
@@ -53,5 +53,9 @@
     grf = GaussianRandomField(cov, KarhunenLoeve(128), pts)
     z = sample(grf)
     @test isa(grf,GaussianRandomField{KarhunenLoeve{128}})
+    grf = GaussianRandomField(cov, Spectral(), pts)
+    @test isa(grf,GaussianRandomField{Spectral})
+    grf = GaussianRandomField(cov, Cholesky(), pts)
+    @test isa(grf,GaussianRandomField{Cholesky})
 
 end