🧔🏽‍♂️ Refactor gridbuilder functions to improve type handling and error checking for grid dimensions.

Author: ZenanH

src/utils.jl

@@ -109,32 +109,52 @@ function meshbuilder(x::AbstractRange, y::AbstractRange, z::AbstractRange)::Arra
     return result
 end
 
-function gridbuilder(xr::AbstractRange, yr::AbstractRange, zr::AbstractRange; ϵ::Symbol=:double)
-    T1  = ϵ == :single ? Int32   : Int64
-    T2  = ϵ == :single ? Float32 : Float64
+function gridbuilder(xr::AbstractRange, yr::AbstractRange)
+    T2 = Float64
+    x, y = convert.(T2, xr), convert.(T2, yr)
+    nx = length(x); nx ≤ 1 && error("Grid must have at least 2 points in x-direction")
+    ny = length(y); ny ≤ 1 && error("Grid must have at least 2 points in y-direction")
+    ni = nx * ny; nc = (nx - 1) * (ny - 1)
+    _tmp_diff_vec_ = diff(x); all_equal = all(≈(_tmp_diff_vec_[1]), _tmp_diff_vec_)
+    h1 = all_equal ? _tmp_diff_vec_[1] : error("grid spacing in x direction must be equal")
+    _tmp_diff_vec_ = diff(y); all_equal = all(≈(_tmp_diff_vec_[1]), _tmp_diff_vec_)
+    h2 = all_equal ? _tmp_diff_vec_[1] : error("grid spacing in y direction must be equal")
+    h1 ≈ h2 || error("Grid spacing in x and y directions must be equal")
+    h     = T2(h1)
+    inv_h = T2(1 / h)
+    x1    = T2(x[1])
+    x2    = T2(x[end])
+    y1    = T2(y[1])
+    y2    = T2(y[end])
+    ξ     = meshbuilder(x1:h:x2, y1:h:y2)
+    return (nx=nx, ny=ny, ni=ni, nc=nc, h=h, x1=x[1], x2=x[end], y1=y[1], y2=y[end], inv_h=inv_h, ξ=ξ)
+end
+
+function gridbuilder(xr::AbstractRange, yr::AbstractRange, zr::AbstractRange)
+    T2 = Float64
     x, y, z = convert.(Float64, xr), convert.(Float64, yr), convert.(Float64, zr)
-    nx = T1(length(x)); nx ≤ 1 && error("Grid must have at least 2 points in x-direction")
-    ny = T1(length(y)); ny ≤ 1 && error("Grid must have at least 2 points in y-direction")
-    nz = T1(length(z)); nz ≤ 1 && error("Grid must have at least 2 points in z-direction")
-    ni = T1(nx * ny * nz)
+    nx = length(x); nx ≤ 1 && error("Grid must have at least 2 points in x-direction")
+    ny = length(y); ny ≤ 1 && error("Grid must have at least 2 points in y-direction")
+    nz = length(z); nz ≤ 1 && error("Grid must have at least 2 points in z-direction")
+    ni = nx * ny * nz; nc = (nx - 1) * (ny - 1) * (nz - 1)
     _tmp_diff_vec_ = diff(x); all_equal = all(≈(_tmp_diff_vec_[1]), _tmp_diff_vec_)
     h1 = all_equal ? _tmp_diff_vec_[1] : error("grid spacing in x direction must be equal")
     _tmp_diff_vec_ = diff(y); all_equal = all(≈(_tmp_diff_vec_[1]), _tmp_diff_vec_)
     h2 = all_equal ? _tmp_diff_vec_[1] : error("grid spacing in y direction must be equal")
     _tmp_diff_vec_ = diff(z); all_equal = all(≈(_tmp_diff_vec_[1]), _tmp_diff_vec_)
     h3 = all_equal ? _tmp_diff_vec_[1] : error("grid spacing in z direction must be equal")
     h1 ≈ h2 ≈ h3 || error("Grid spacing in x, y and z directions must be equal")
-    h    = T2(h1)
-    invh = T2(1 / h)
-    x1   = T2(x[1])
-    x2   = T2(x[end])
-    y1   = T2(y[1])
-    y2   = T2(y[end])
-    z1   = T2(z[1])
-    z2   = T2(z[end])
-    ξ    = meshbuilder(x1:h:x2, y1:h:y2, z1:h:z2)
-    return (x1=x1, x2=x2, y1=y1, y2=y2, z1=z1, z2=z2, h=h, invh=invh, ni=ni, nx=nx, ny=ny, 
-        nz=nz, ξ=ξ)
+    h     = T2(h1)
+    inv_h = T2(1 / h)
+    x1    = T2(x[1])
+    x2    = T2(x[end])
+    y1    = T2(y[1])
+    y2    = T2(y[end])
+    z1    = T2(z[1])
+    z2    = T2(z[end])
+    ξ     = meshbuilder(x1:h:x2, y1:h:y2, z1:h:z2)
+    return (nx=nx, ny=ny, nz=nz, ni=ni, nc=nc, h=h, x1=x1, x2=x2, y1=y1, y2=y2, z1=z1, 
+        z2=z2, inv_h=inv_h, ξ=ξ)
 end
 
 """