changeset 1409:cb5f30cd0e68

Merge feature/grids/scalar_eval_on
author Vidar Stiernström <vidar.stiernstrom@it.uu.se>
date Tue, 22 Aug 2023 21:57:38 +0200
parents 7694b35d137d (current diff) 887e052d5893 (diff)
children 031514327289 715f1c16f1fc 69c9e6eae686 26e168924cf1
files
diffstat 2 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
diff -r 7694b35d137d -r cb5f30cd0e68 src/Grids/grid.jl
--- a/src/Grids/grid.jl	Tue Aug 15 22:42:19 2023 +0200
+++ b/src/Grids/grid.jl	Tue Aug 22 21:57:38 2023 +0200
@@ -76,7 +76,7 @@
 """
     eval_on(g::Grid, f)
 
-Lazy evaluation `f` on the grid. `f` can either be on the form `f(x,y,...)`
+Lazy evaluation of `f` on the grid. `f` can either be on the form `f(x,y,...)`
 with each coordinate as an argument, or on the form `f(x̄)` taking a
 coordinate vector.
 
@@ -91,5 +91,12 @@
     end
 end
 
+"""
+    eval_on(g::Grid, f::Number)
+
+Lazy evaluation of a scalar `f` on the grid.
+"""
+eval_on(g::Grid, f::Number) = return LazyTensors.LazyConstantArray(f, size(g))
+
 _ncomponents(::Type{<:Number}) = 1
 _ncomponents(T::Type{<:SVector}) = length(T)
diff -r 7694b35d137d -r cb5f30cd0e68 test/Grids/grid_test.jl
--- a/test/Grids/grid_test.jl	Tue Aug 15 22:42:19 2023 +0200
+++ b/test/Grids/grid_test.jl	Tue Aug 22 21:57:38 2023 +0200
@@ -38,6 +38,9 @@
     @test eval_on(ZeroDimGrid(1.), x̄->2x̄) isa LazyArray
     @test eval_on(ZeroDimGrid(1.), x̄->2x̄) == fill(2.)
 
+    @test eval_on(ZeroDimGrid(@SVector[1.,2.]), π) isa LazyArray
+    @test eval_on(ZeroDimGrid(@SVector[1.,2.]), π) == fill(π)
+
     @test eval_on(EquidistantGrid(range(0,1,length=4)), x->2x) isa LazyArray
     @test eval_on(EquidistantGrid(range(0,1,length=4)), x->2x) == 2 .* range(0,1,length=4)
 
@@ -49,6 +52,8 @@
 
     @test eval_on(g, x̄ -> sin(x̄[1])*cos(x̄[2])) == map(x̄->sin(x̄[1])*cos(x̄[2]), g)
 
+    @test eval_on(g, π) == fill(π, (5,3))
+
     # Vector valued function
     @test eval_on(g, x̄ -> @SVector[x̄[2], x̄[1]]) isa LazyArray{SVector{2,Float64}}
     @test eval_on(g, x̄ -> @SVector[x̄[2], x̄[1]]) == map(x̄ -> @SVector[x̄[2], x̄[1]], g)