Merge pull request #23 from JuliaGeodynamics/adm-bugfix

Fix minor indexing bug
JuliaGeodynamics · Nov 22, 2023 · 19e5c71 · 19e5c71 · albert-de-montserrat · Jan 4, 2024
2 parents 67de278 + 41d5a4f
commit 19e5c71
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 13 deletions.
diff --git a/scripts/single_particle_advection.jl b/scripts/single_particle_advection.jl
@@ -5,9 +5,7 @@ using JustPIC
 using CellArrays
 using ParallelStencil
 using GLMakie
-@init_parallel_stencil(CUDA, Float64, 2)
-
-const TA = backend == "CUDA" ? JustPIC.CUDA.CuArray : Array
+@init_parallel_stencil(Threads, Float64, 2)
 
 function init_particle(nxcell, max_xcell, min_xcell, x, y, dx, dy, nx, ny)
     ni = nx, ny

diff --git a/scripts/single_particle_advection_MPI.jl b/scripts/single_particle_advection_MPI.jl
@@ -5,9 +5,7 @@ using JustPIC
 using CellArrays
 using ParallelStencil
 using GLMakie
-@init_parallel_stencil(CUDA, Float64, 2)
-
-const TA = backend == "CUDA" ? JustPIC.CUDA.CuArray : Array
+@init_parallel_stencil(Threads, Float64, 2)
 
 function init_particle(nxcell, max_xcell, min_xcell, x, y, dx, dy, nx, ny, me)
     ni = nx, ny

diff --git a/scripts/temperature_advection.jl b/scripts/temperature_advection.jl
@@ -1,14 +1,11 @@
 using JustPIC
-using AMDGPU
-
-AMDGPU.allowscalar(false)
 
 # set_backend("AMDGPU_Float64_2D") # need to restart session if this changes
 
 using CellArrays
 using ParallelStencil
 using CairoMakie
-@init_parallel_stencil(AMDGPU, Float64, 2)
+@init_parallel_stencil(Threads, Float64, 2)
 
 function init_particles(nxcell, max_xcell, min_xcell, x, y, dx, dy, nx, ny)
     ni = nx, ny

diff --git a/scripts/temperature_advection3d.jl b/scripts/temperature_advection3d.jl
@@ -6,7 +6,7 @@ import JustPIC: @idx, @cell
 using CellArrays
 using ParallelStencil
 using GLMakie
-@init_parallel_stencil(CUDA, Float64, 3)
+@init_parallel_stencil(Threads, Float64, 3)
 
 function init_particles(nxcell, max_xcell, min_xcell, x, y, z, dx, dy, dz, ni)
     ncells     = prod(ni)

diff --git a/src/Interpolations/particle_to_grid.jl b/src/Interpolations/particle_to_grid.jl
@@ -7,7 +7,7 @@ function particle2grid!(F, Fp, xi::NTuple, particle_coords)
 end
 
 function particle2grid!(F, Fp, xi::NTuple, particle_coords, dxi)
-    @parallel (@idx size(particle_coords[1])) particle2grid!(
+    @parallel (@idx size(F)) particle2grid!(
         F, Fp, xi, particle_coords, dxi
     )
     return nothing
@@ -54,7 +54,7 @@ end
     F::NTuple{N,T1}, Fp::NTuple{N,T2}, inode, jnode, xi::NTuple{2,T3}, p, di
 ) where {N,T1,T2,T3}
     px, py = p # particle coordinates
-    nx, ny = size(F)
+    nx, ny = size(F[1])
     xvertex = xi[1][inode], xi[2][jnode] # cell lower-left coordinates
     ω, ωxF = 0.0, 0.0 # init weights