Skip to content

Commit 04e7d9c

Browse files
committed
Refactor gridbuilder to use meshbuilder directly with ranges and calculate min/max values for improved clarity
1 parent 0603405 commit 04e7d9c

1 file changed

Lines changed: 17 additions & 13 deletions

File tree

src/utils.jl

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,14 @@ function gridbuilder(xr::AbstractRange, yr::AbstractRange)
122122
h1 h2 || error("Grid spacing in x and y directions must be equal")
123123
h = T2(h1)
124124
inv_h = T2(1 / h)
125-
x1 = T2(x[1])
126-
x2 = T2(x[end])
127-
y1 = T2(y[1])
128-
y2 = T2(y[end])
129-
ξ = meshbuilder(x1:h:x2, y1:h:y2)
130-
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, ξ=ξ)
125+
ξ = meshbuilder(xr, yr)
126+
vmin = minimum(ξ, dims=1)
127+
vmax = maximum(ξ, dims=1)
128+
x1 = T2(vmin[1])
129+
x2 = T2(vmax[1])
130+
y1 = T2(vmin[2])
131+
y2 = T2(vmax[2])
132+
return (nx=nx, ny=ny, ni=ni, nc=nc, h=h, x1=x1, x2=x2, y1=y1, y2=y2, inv_h=inv_h, ξ=ξ)
131133
end
132134

133135
function gridbuilder(xr::AbstractRange, yr::AbstractRange, zr::AbstractRange)
@@ -146,13 +148,15 @@ function gridbuilder(xr::AbstractRange, yr::AbstractRange, zr::AbstractRange)
146148
h1 h2 h3 || error("Grid spacing in x, y and z directions must be equal")
147149
h = T2(h1)
148150
inv_h = T2(1 / h)
149-
x1 = T2(x[1])
150-
x2 = T2(x[end])
151-
y1 = T2(y[1])
152-
y2 = T2(y[end])
153-
z1 = T2(z[1])
154-
z2 = T2(z[end])
155-
ξ = meshbuilder(x1:h:x2, y1:h:y2, z1:h:z2)
151+
ξ = meshbuilder(xr, yr, zr)
152+
vmin = minimum(ξ, dims=1)
153+
vmax = maximum(ξ, dims=1)
154+
x1 = T2(vmin[1])
155+
x2 = T2(vmax[1])
156+
y1 = T2(vmin[2])
157+
y2 = T2(vmax[2])
158+
z1 = T2(vmin[3])
159+
z2 = T2(vmax[3])
156160
return (nx=nx, ny=ny, nz=nz, ni=ni, nc=nc, h=h, x1=x1, x2=x2, y1=y1, y2=y2, z1=z1,
157161
z2=z2, inv_h=inv_h, ξ=ξ)
158162
end

0 commit comments

Comments
 (0)