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

Try ClimaTimesteppers branch #2022

Closed
wants to merge 2 commits into from
Closed

Try ClimaTimesteppers branch #2022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6bbb9b
Try CTS branch
charleskawczynski Aug 25, 2023
28b4000
Changes needed for new CTS
charleskawczynski Aug 25, 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
12 changes: 7 additions & 5 deletions docs/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 = "484a0d15ba3f1cc8d5c8863c4fe1999899c42df7"
project_hash = "0789b12c1924195805e36789a2dd0acf89d01aa0"

[[deps.ADTypes]]
git-tree-sha1 = "f5c25e8a5b29b5e941b7408bc8cc79fea4d9ef9a"
Expand Down Expand Up @@ -223,7 +223,7 @@ version = "0.1.8"
deps = ["ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "CLIMAParameters", "CUDA", "ClimaComms", "ClimaCore", "ClimaTimeSteppers", "CloudMicrophysics", "Colors", "Dates", "Dierckx", "DiffEqBase", "DiffEqCallbacks", "Distributions", "DocStringExtensions", "FastGaussQuadrature", "ImageFiltering", "Insolation", "Interpolations", "IntervalSets", "JLD2", "LambertW", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "OrdinaryDiffEq", "Pkg", "Printf", "RRTMGP", "Random", "RootSolvers", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "TerminalLoggers", "Test", "Thermodynamics", "YAML"]
path = ".."
uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
version = "0.15.7"
version = "0.16.0"

[[deps.ClimaComms]]
deps = ["CUDA", "MPI"]
Expand All @@ -238,10 +238,12 @@ uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
version = "0.10.47"

[[deps.ClimaTimeSteppers]]
deps = ["CUDA", "ClimaComms", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "SciMLBase", "StaticArrays"]
git-tree-sha1 = "54b602435b0107b6c2dfe7664e0f7ff5fc78fb91"
deps = ["CUDA", "ClimaComms", "Colors", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"]
git-tree-sha1 = "4b2f11cadc5ff09975fb7dec386b78770c9b093f"
repo-rev = "ck/post_cb"
repo-url = "https://github.com/CliMA/ClimaTimeSteppers.jl.git"
uuid = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
version = "0.7.7"
version = "0.7.8"

[[deps.CloseOpenIntervals]]
deps = ["Static", "StaticArrayInterface"]
Expand Down
1 change: 1 addition & 0 deletions docs/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
ClimaAtmos = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
ClimaTimeSteppers = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
DocumenterCitations = "daee34ce-89f3-4625-b898-19384cb65244"
Expand Down
10 changes: 6 additions & 4 deletions examples/Manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ version = "0.1.8"
deps = ["ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "CLIMAParameters", "CUDA", "ClimaComms", "ClimaCore", "ClimaTimeSteppers", "CloudMicrophysics", "Colors", "Dates", "Dierckx", "DiffEqBase", "DiffEqCallbacks", "Distributions", "DocStringExtensions", "FastGaussQuadrature", "ImageFiltering", "Insolation", "Interpolations", "IntervalSets", "JLD2", "LambertW", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "OrdinaryDiffEq", "Pkg", "Printf", "RRTMGP", "Random", "RootSolvers", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "TerminalLoggers", "Test", "Thermodynamics", "YAML"]
path = ".."
uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
version = "0.15.7"
version = "0.16.0"

[[deps.ClimaComms]]
deps = ["CUDA", "MPI"]
Expand Down Expand Up @@ -307,10 +307,12 @@ uuid = "c8b6d40d-e815-466f-95ae-c48aefa668fa"
version = "0.7.1"

[[deps.ClimaTimeSteppers]]
deps = ["CUDA", "ClimaComms", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "SciMLBase", "StaticArrays"]
git-tree-sha1 = "54b602435b0107b6c2dfe7664e0f7ff5fc78fb91"
deps = ["CUDA", "ClimaComms", "Colors", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"]
git-tree-sha1 = "4b2f11cadc5ff09975fb7dec386b78770c9b093f"
repo-rev = "ck/post_cb"
repo-url = "https://github.com/CliMA/ClimaTimeSteppers.jl.git"
uuid = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
version = "0.7.7"
version = "0.7.8"

[[deps.CloseOpenIntervals]]
deps = ["Static", "StaticArrayInterface"]
Expand Down
10 changes: 6 additions & 4 deletions perf/Manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ version = "0.1.8"
deps = ["ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "CLIMAParameters", "CUDA", "ClimaComms", "ClimaCore", "ClimaTimeSteppers", "CloudMicrophysics", "Colors", "Dates", "Dierckx", "DiffEqBase", "DiffEqCallbacks", "Distributions", "DocStringExtensions", "FastGaussQuadrature", "ImageFiltering", "Insolation", "Interpolations", "IntervalSets", "JLD2", "LambertW", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "OrdinaryDiffEq", "Pkg", "Printf", "RRTMGP", "Random", "RootSolvers", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "TerminalLoggers", "Test", "Thermodynamics", "YAML"]
path = ".."
uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
version = "0.15.7"
version = "0.16.0"

[[deps.ClimaComms]]
deps = ["CUDA", "MPI"]
Expand Down Expand Up @@ -318,10 +318,12 @@ uuid = "c8b6d40d-e815-466f-95ae-c48aefa668fa"
version = "0.7.1"

[[deps.ClimaTimeSteppers]]
deps = ["CUDA", "ClimaComms", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "SciMLBase", "StaticArrays"]
git-tree-sha1 = "54b602435b0107b6c2dfe7664e0f7ff5fc78fb91"
deps = ["CUDA", "ClimaComms", "Colors", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"]
git-tree-sha1 = "4b2f11cadc5ff09975fb7dec386b78770c9b093f"
repo-rev = "ck/post_cb"
repo-url = "https://github.com/CliMA/ClimaTimeSteppers.jl.git"
uuid = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
version = "0.7.7"
version = "0.7.8"

[[deps.CloseOpenIntervals]]
deps = ["Static", "StaticArrayInterface"]
Expand Down
6 changes: 6 additions & 0 deletions src/prognostic_equations/dss.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ using ClimaCore.Utilities: half

import ClimaCore.Fields: ColumnField

function post_stage_callback!(Y, p, t)
dss!(Y, p, t)
set_precomputed_quantities!(Y, p, t)
return nothing
end

function dss!(Y, p, t)
if p.do_dss
Spaces.weighted_dss_start2!(Y.c, p.ghost_buffer.c)
Expand Down
6 changes: 3 additions & 3 deletions src/prognostic_equations/implicit/implicit_tendency.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ function implicit_tendency!(Yₜ, Y, p, t)
fill_with_nans!(p)
NVTX.@range "implicit tendency" color = colorant"yellow" begin
Yₜ .= zero(eltype(Yₜ))
NVTX.@range "precomputed quantities" color = colorant"orange" begin
set_precomputed_quantities!(Y, p, t)
end
# NVTX.@range "precomputed quantities" color = colorant"orange" begin
# set_precomputed_quantities!(Y, p, t)
# end
Fields.bycolumn(axes(Y.c)) do colidx
implicit_vertical_advection_tendency!(Yₜ, Y, p, t, colidx)
if p.turbconv_model isa TurbulenceConvection.EDMFModel
Expand Down
2 changes: 1 addition & 1 deletion src/prognostic_equations/implicit/wfact.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ end
function Wfact!(W, Y, p, dtγ, t)
NVTX.@range "Wfact!" color = colorant"green" begin
fill_with_nans!(p)
set_precomputed_quantities!(Y, p, t)
# set_precomputed_quantities!(Y, p, t)
Fields.bycolumn(axes(Y.c)) do colidx
Wfact!(W, Y, p, dtγ, t, colidx)
end
Expand Down
2 changes: 1 addition & 1 deletion src/prognostic_equations/limited_tendencies.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import ClimaCore.Fields: ColumnField

function limited_tendency!(Yₜ, Y, p, t)
Yₜ .= zero(eltype(Yₜ))
set_precomputed_quantities!(Y, p, t)
# set_precomputed_quantities!(Y, p, t)
horizontal_tracer_advection_tendency!(Yₜ, Y, p, t)
NVTX.@range "tracer hyperdiffusion tendency" color = colorant"yellow" begin
tracer_hyperdiffusion_tendency!(Yₜ, Y, p, t)
Expand Down
6 changes: 3 additions & 3 deletions src/prognostic_equations/remaining_tendency.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ function remaining_tendency!(Yₜ, Y, p, t)
fill_with_nans!(p)
NVTX.@range "remaining tendency" color = colorant"yellow" begin
Yₜ .= zero(eltype(Yₜ))
NVTX.@range "precomputed quantities" color = colorant"orange" begin
set_precomputed_quantities!(Y, p, t)
end
# NVTX.@range "precomputed quantities" color = colorant"orange" begin
# set_precomputed_quantities!(Y, p, t)
# end
NVTX.@range "horizontal" color = colorant"orange" begin
horizontal_advection_tendency!(Yₜ, Y, p, t)
NVTX.@range "hyperdiffusion tendency" color = colorant"yellow" begin
Expand Down
2 changes: 1 addition & 1 deletion src/solver/type_getters.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ function args_integrator(parsed_args, Y, p, tspan, ode_algo, callback)
T_imp! = implicit_func,
# Can we just pass implicit_tendency! and jac_prototype etc.?
lim! = limiters_func!,
dss!,
post_stage_callback!,
)
else
ODE.SplitFunction(implicit_func, remaining_tendency!)
Expand Down
Loading