Merge pull request #149 from WaterLily-jl/mutable-sim

Make Simulation mutable and loc(T=Float32)
WaterLily-jl · Jul 22, 2024 · d23ac35 · d23ac35 · weymouth · Jul 22, 2024
2 parents 7aaa9b8 + 73475d2
commit d23ac35
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/WaterLily.jl b/src/WaterLily.jl
@@ -55,7 +55,7 @@ Constructor for a WaterLily.jl simulation:
 
 See files in `examples` folder for examples.
 """
-struct Simulation
+mutable struct Simulation
     U :: Number # velocity scale
     L :: Number # length scale
     ϵ :: Number # kernel width

diff --git a/src/util.jl b/src/util.jl
@@ -134,7 +134,7 @@ using StaticArrays
 Location in space of the cell at CartesianIndex `I` at face `i`.
 Using `i=0` returns the cell center s.t. `loc = I`.
 """
-@inline loc(i,I::CartesianIndex{N}) where N = SVector{N}(I.I .- 1.5 .- 0.5 .* δ(i,I).I)
+@inline loc(i,I::CartesianIndex{N},T=Float32) where N = SVector{N,T}(I.I .- 1.5 .- 0.5 .* δ(i,I).I)
 @inline loc(Ii::CartesianIndex) = loc(last(Ii),Base.front(Ii))
 Base.last(I::CartesianIndex) = last(I.I)
 Base.front(I::CartesianIndex) = CI(Base.front(I.I))

diff --git a/test/maintests.jl b/test/maintests.jl
@@ -282,7 +282,7 @@ end
 end
 import WaterLily: ×
 @testset "Metrics.jl" begin
-    J = CartesianIndex(2,3,4); x = loc(0,J); px = prod(x)
+    J = CartesianIndex(2,3,4); x = loc(0,J,Float64); px = prod(x)
     for f ∈ arrays
         u = zeros(3,4,5,3) |> f; apply!((i,x)->x[i]+prod(x),u)
         p = zeros(3,4,5) |> f