Fixup

src/LevelSets/LevelSets.jl

@@ -1,9 +1,8 @@
 module LevelSets
 
 export compute_level_set_from_dem!
-export volfrac_field, compute_volume_fractions_from_level_set!
+export volfrac_field, compute_volfrac_from_level_set!
 
-# using Chmy
 using Chmy.Architectures
 using Chmy.Grids
 using Chmy.Fields

src/LevelSets/compute_level_sets.jl

@@ -3,7 +3,7 @@
 
 Initialize level sets.
 """
-@kernel function init_level_set!(Ψ::Field, dem::Field, dem_grid::UniformGrid, Ψ_grid::UniformGrid, cutoff, R)
+@kernel inbounds = true function init_level_set!(Ψ::Field, dem::Field, dem_grid::UniformGrid, Ψ_grid::UniformGrid, cutoff, R)
     I = @index(Global, NTuple)
     x, y, z = coord(Ψ_grid, location(Ψ), I...)
     P = R * Point3(x, y, z)
@@ -16,7 +16,8 @@ end
 
 Compute level sets from dem.
 """
-function compute_level_set_from_dem!(backend, Ψ::Field, dem::Field, dem_grid::UniformGrid, Ψ_grid::UniformGrid, R=LinearAlgebra.I)
+function compute_level_set_from_dem!(arch::Architecture, Ψ::Field, dem::Field, dem_grid::UniformGrid, Ψ_grid::UniformGrid, R=LinearAlgebra.I)
+    backend = Architectures.get_backend(arch)
     kernel = init_level_set!(backend, 256, size(Ψ))
     cutoff = 4maximum(spacing(Ψ_grid, Center()))
     kernel(Ψ, dem, dem_grid, Ψ_grid, cutoff, R)

src/LevelSets/compute_volume_fractions.jl

@@ -136,8 +136,14 @@ end
 
 include("volume_fractions_kernels.jl")
 
-function compute_volume_fractions_from_level_set!(backend::Backend, wt, Ψ, grid::UniformGrid)
-    kernel = kernel_compute_volume_fractions_from_level_set!(backend, 256, size(Ψ))
+"""
+    compute_volfrac_from_level_set!(arch::Architecture, wt::Field, Ψ::Field, grid::UniformGrid)
+
+Compute volume fractions from level sets.
+"""
+function compute_volfrac_from_level_set!(arch::Architecture, wt::Field, Ψ::Field, grid::UniformGrid)
+    backend = Architectures.get_backend(arch)
+    kernel = compute_volfrac_from_level_set!(backend, 256, size(Ψ))
     kernel(wt, Ψ, grid)
     return
 end

src/LevelSets/volume_fractions_kernels.jl

@@ -1,5 +1,5 @@
 # Volume fraction kernel (2D)
-@kernel inbounds = true function kernel_compute_volume_fractions_from_level_set!(wt, Ψ, grid::UniformGrid{2})
+@kernel inbounds = true function compute_volfrac_from_level_set!(wt, Ψ, grid::UniformGrid{2})
     ix, iy = @index(Global, NTuple)
     dx, dy = spacing(grid, Center())
     cell = Rect(Vec(0.0, 0.0), Vec(dx, dy))
@@ -22,7 +22,7 @@
 end
 
 # Volume fraction kernel (3D)
-@kernel inbounds = true function kernel_compute_volume_fractions_from_level_set!(wt, Ψ, grid::UniformGrid{3})
+@kernel inbounds = true function compute_volfrac_from_level_set!(wt, Ψ, grid::UniformGrid{3})
     ix, iy, iz = @index(Global, NTuple)
     dx, dy, dz = spacing(grid, Center())
     cell = Rect(Vec(0.0, 0.0, 0.0), Vec(dx, dy, dz))