Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Tullio dependency; take #2 and implement universally accurate CFL time-scale #3037

Merged
merged 16 commits into from
Apr 11, 2023
Merged

Remove Tullio dependency; take #2 and implement universally accurate CFL time-scale #3037

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e5b424d
remove tullio dependency
simone-silvestri Mar 28, 2023
67e92ef
bugfix
simone-silvestri Mar 28, 2023
a1b549d
add abs to abstract operations
simone-silvestri Mar 28, 2023
786e8d2
solved the issue
simone-silvestri Mar 29, 2023
d694462
probably not super efficient
simone-silvestri Mar 29, 2023
3c8d844
indices for gridmetricoperations
simone-silvestri Mar 29, 2023
5508269
just remove tullio
simone-silvestri Mar 29, 2023
e31abbb
change timescale definition
simone-silvestri Mar 29, 2023
8b12c59
do not introduce indices now
simone-silvestri Mar 29, 2023
0230734
Merge branch 'main' into ss/remove-tullio
simone-silvestri Mar 30, 2023
0b90834
Update src/Advection/cell_advection_timescale.jl
simone-silvestri Mar 31, 2023
3d2fb59
Merge branch 'main' into ss/remove-tullio
navidcy Apr 5, 2023
0c2472b
Update src/Diagnostics/cfl.jl
glwagner Apr 5, 2023
f0e33fe
Merge branch 'main' into ss/remove-tullio
navidcy Apr 6, 2023
5cc4332
accurate_cell_advection_timescale -> cell_advection_timescale
navidcy Apr 6, 2023
e689081
Merge branch 'main' into ss/remove-tullio
navidcy Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions Manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

julia_version = "1.8.5"
manifest_format = "2.0"
project_hash = "96eebad427fe7f986c00777f7738aa636a9e621d"
project_hash = "31dd08f0370dcfe9232b9df8c2131e894bcff3ca"

[[deps.AMGX]]
deps = ["AMGX_jll", "CEnum", "CUDA", "JSON", "Libdl", "SparseArrays"]
Expand Down Expand Up @@ -156,12 +156,6 @@ version = "1.0.0"
deps = ["Printf"]
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"

[[deps.DiffRules]]
deps = ["IrrationalConstants", "LogExpFunctions", "NaNMath", "Random", "SpecialFunctions"]
git-tree-sha1 = "c5b6685d53f933c11404a3ae9822afe30d522494"
uuid = "b552c78f-8df3-52c6-915a-8e097449b14b"
version = "1.12.2"

[[deps.Distributed]]
deps = ["Random", "Serialization", "Sockets"]
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
Expand Down Expand Up @@ -431,12 +425,6 @@ git-tree-sha1 = "d3e32d2b0530d929a047ceab8799ae4204de6c88"
uuid = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
version = "0.12.12"

[[deps.NaNMath]]
deps = ["OpenLibm_jll"]
git-tree-sha1 = "a7c3d1da1189a1c2fe843a3bfa04d18d20eb3211"
uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
version = "1.0.1"

[[deps.NetCDF_jll]]
deps = ["Artifacts", "HDF5_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "Pkg", "XML2_jll", "Zlib_jll"]
git-tree-sha1 = "072f8371f74c3b9e1b26679de7fbf059d45ea221"
Expand Down Expand Up @@ -703,12 +691,6 @@ git-tree-sha1 = "94f38103c984f89cf77c402f2a68dbd870f8165f"
uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
version = "0.9.11"

[[deps.Tullio]]
deps = ["ChainRulesCore", "DiffRules", "LinearAlgebra", "Requires"]
git-tree-sha1 = "7871a39eac745697ee512a87eeff06a048a7905b"
uuid = "bc48ee85-29a4-5162-ae0b-a64e1601d4bc"
version = "0.3.5"

[[deps.TupleTools]]
git-tree-sha1 = "3c712976c47707ff893cf6ba4354aa14db1d8938"
uuid = "9d95972d-f1c8-5527-a6e0-b4b365fa01f6"
Expand Down
2 changes: 0 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ SeawaterPolynomials = "d496a93d-167e-4197-9f49-d3af4ff8fe40"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
Tullio = "bc48ee85-29a4-5162-ae0b-a64e1601d4bc"

[compat]
AMGX = "0.1.3"
Expand All @@ -62,7 +61,6 @@ PencilFFTs = "0.13.5, 0.14"
Rotations = "1.0"
SeawaterPolynomials = "0.3"
StructArrays = "0.4, 0.5, 0.6"
Tullio = "0.2, 0.3"
julia = "1.6"

[extras]
Expand Down
3 changes: 2 additions & 1 deletion src/AbstractOperations/AbstractOperations.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ include("show_abstract_operations.jl")
# Make some operators!

# Some operators:
import Base: sqrt, sin, cos, exp, tanh, -, +, /, ^, *
import Base: sqrt, sin, cos, exp, tanh, abs, -, +, /, ^, *
import Base: abs

@unary sqrt sin cos exp tanh abs
@unary -
Expand Down
7 changes: 3 additions & 4 deletions src/Advection/cell_advection_timescale.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ end
Δy = Δyᶜᶠᶜ(i, j, k, grid)
Δz = Δzᶜᶜᶠ(i, j, k, grid)

return @inbounds min(Δx / abs(u[i, j, k]),
Δy / abs(v[i, j, k]),
Δz / abs(w[i, j, k]))
end

ω = @inbounds abs(u[i, j, k]) / Δx + abs(v[i, j, k]) / Δy + abs(w[i, j, k]) / Δz
return 1 / ω
end
29 changes: 2 additions & 27 deletions src/Diagnostics/cfl.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,31 +83,6 @@ DiffusiveCFL(Δt) = CFL(Δt, cell_diffusion_timescale)
##### Accurate CFL via reduction
#####

using CUDA, CUDAKernels, KernelAbstractions, Tullio

using Oceananigans.Models
using Oceananigans.Grids: halo_size
using Oceananigans.Operators: Δxᶠᶜᶜ, Δyᶜᶠᶜ, Δzᶜᶜᶠ

accurate_cell_advection_timescale(model) = accurate_cell_advection_timescale(model.grid, model.velocities)

function accurate_cell_advection_timescale(grid, velocities)
Nx, Ny, Nz = size(grid)
Hx, Hy, Hz = halo_size(grid)

is = 1+Hx:Nx+Hx
js = 1+Hy:Ny+Hy
ks = 1+Hz:Nz+Hz

u = view(velocities.u.data.parent, is, js, ks)
v = view(velocities.v.data.parent, is, js, ks)
w = view(velocities.w.data.parent, is, js, ks)

min_timescale = minimum(
@tullio (min) timescale[k] := 1 / ( abs(u[i, j, k]) / Δxᶠᶜᶜ(i, j, k, grid)
+ abs(v[i, j, k]) / Δyᶜᶠᶜ(i, j, k, grid)
+ abs(w[i, j, k]) / Δzᶜᶜᶠ(i, j, k, grid))
)
using Oceananigans.Advection: cell_advection_timescale
navidcy marked this conversation as resolved.
Show resolved Hide resolved

return min_timescale
end
accurate_cell_advection_timescale(model) = cell_advection_timescale(model.grid, model.velocities)
Copy link
Member

@glwagner glwagner Apr 5, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why we would keep the function accurate_cell_advection_timescale as a duplicate of cell_advection_timescale? The word "accurate" is meaningless now.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree!

glwagner marked this conversation as resolved.
Show resolved Hide resolved