Skip to content

Commit

Permalink
Merge #2187
Browse files Browse the repository at this point in the history 
2187: Upgrade to latest ClimaTimSteppers, minimally call `set_precomputed_quantities!` r=charleskawczynski a=charleskawczynski

This PR:
 - Upgrades to the latest ClimaTimeSteppers and
 - Minimally calls `set_precomputed_quantities!`

Together with #2186, this PR closes #2015. Supersedes #2175, and #2145.

Co-authored-by: Charles Kawczynski <kawczynski.charles@gmail.com>
  • Loading branch information
@bors @charleskawczynski
bors[bot] and charleskawczynski authored Oct 4, 2023
2 parents 641cdeb + a4a35d9 commit 3a80801
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 169 deletions.
4 changes: 2 additions & 2 deletions .dev/Manifest.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ version = "0.21.4"

[[deps.JuliaFormatter]]
deps = ["CSTParser", "CommonMark", "DataStructures", "Glob", "Pkg", "PrecompileTools", "Tokenize"]
git-tree-sha1 = "c0ac2f93058fd148267154c42dd7dc79869f7923"
git-tree-sha1 = "80031f6e58b09b0de4553bf63d9a36ec5db57967"
uuid = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
version = "1.0.37"
version = "1.0.39"

[[deps.LibCURL]]
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
Expand Down
12 changes: 6 additions & 6 deletions docs/Manifest.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ version = "0.1.29"

[[deps.ArrayLayouts]]
deps = ["FillArrays", "LinearAlgebra"]
git-tree-sha1 = "0d61921af2799487b80453a44abb57db7a0c1381"
git-tree-sha1 = "9a731850434825d183af39c6e6cd0a1c32dd7e20"
uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
version = "1.4.1"
version = "1.4.2"
weakdeps = ["SparseArrays"]

[deps.ArrayLayouts.extensions]
Expand Down Expand Up @@ -266,9 +266,9 @@ version = "0.10.51"

[[deps.ClimaTimeSteppers]]
deps = ["CUDA", "ClimaComms", "Colors", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"]
git-tree-sha1 = "1b437bf71f2e35925e957715361bcfa60f68351a"
git-tree-sha1 = "6b8068a0d888e1ec83e3001526cb8050f2ef39fe"
uuid = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
version = "0.7.10"
version = "0.7.13"

[[deps.CloseOpenIntervals]]
deps = ["Static", "StaticArrayInterface"]
Expand Down Expand Up @@ -1233,9 +1233,9 @@ version = "6.57.0"

[[deps.PDMats]]
deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"]
git-tree-sha1 = "b7c4f29f93b548caa58f703580f4d79ab753c8ac"
git-tree-sha1 = "528664265c9c36b3ecdb6d721d47aaab52ddf267"
uuid = "90014a1f-27ba-587c-ab20-58faa44d9150"
version = "0.11.21"
version = "0.11.24"

[[deps.PackageExtensionCompat]]
git-tree-sha1 = "fb28e33b8a95c4cee25ce296c817d89cc2e53518"
Expand Down
16 changes: 8 additions & 8 deletions examples/Manifest.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ version = "0.1.29"

[[deps.ArrayLayouts]]
deps = ["FillArrays", "LinearAlgebra"]
git-tree-sha1 = "0d61921af2799487b80453a44abb57db7a0c1381"
git-tree-sha1 = "9a731850434825d183af39c6e6cd0a1c32dd7e20"
uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
version = "1.4.1"
version = "1.4.2"
weakdeps = ["SparseArrays"]

[deps.ArrayLayouts.extensions]
Expand Down Expand Up @@ -335,9 +335,9 @@ version = "0.7.1"

[[deps.ClimaTimeSteppers]]
deps = ["CUDA", "ClimaComms", "Colors", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"]
git-tree-sha1 = "1b437bf71f2e35925e957715361bcfa60f68351a"
git-tree-sha1 = "6b8068a0d888e1ec83e3001526cb8050f2ef39fe"
uuid = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
version = "0.7.10"
version = "0.7.13"

[[deps.CloseOpenIntervals]]
deps = ["Static", "StaticArrayInterface"]
Expand Down Expand Up @@ -1446,9 +1446,9 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"

[[deps.LoggingExtras]]
deps = ["Dates", "Logging"]
git-tree-sha1 = "0d097476b6c381ab7906460ef1ef1638fbce1d91"
git-tree-sha1 = "c1dd6d7978c12545b4179fb6153b9250c96b0075"
uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36"
version = "1.0.2"
version = "1.0.3"

[[deps.LoopVectorization]]
deps = ["ArrayInterface", "ArrayInterfaceCore", "CPUSummary", "CloseOpenIntervals", "DocStringExtensions", "HostCPUFeatures", "IfElse", "LayoutPointers", "LinearAlgebra", "OffsetArrays", "PolyesterWeave", "PrecompileTools", "SIMDTypes", "SLEEFPirates", "Static", "StaticArrayInterface", "ThreadingUtilities", "UnPack", "VectorizationBase"]
Expand Down Expand Up @@ -1767,9 +1767,9 @@ version = "10.42.0+0"

[[deps.PDMats]]
deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"]
git-tree-sha1 = "b7c4f29f93b548caa58f703580f4d79ab753c8ac"
git-tree-sha1 = "528664265c9c36b3ecdb6d721d47aaab52ddf267"
uuid = "90014a1f-27ba-587c-ab20-58faa44d9150"
version = "0.11.21"
version = "0.11.24"

[[deps.PNGFiles]]
deps = ["Base64", "CEnum", "ImageCore", "IndirectArrays", "OffsetArrays", "libpng_jll"]
Expand Down
16 changes: 8 additions & 8 deletions perf/Manifest.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ version = "0.1.29"

[[deps.ArrayLayouts]]
deps = ["FillArrays", "LinearAlgebra"]
git-tree-sha1 = "0d61921af2799487b80453a44abb57db7a0c1381"
git-tree-sha1 = "9a731850434825d183af39c6e6cd0a1c32dd7e20"
uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
version = "1.4.1"
version = "1.4.2"
weakdeps = ["SparseArrays"]

[deps.ArrayLayouts.extensions]
Expand Down Expand Up @@ -346,9 +346,9 @@ version = "0.7.1"

[[deps.ClimaTimeSteppers]]
deps = ["CUDA", "ClimaComms", "Colors", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"]
git-tree-sha1 = "1b437bf71f2e35925e957715361bcfa60f68351a"
git-tree-sha1 = "6b8068a0d888e1ec83e3001526cb8050f2ef39fe"
uuid = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
version = "0.7.10"
version = "0.7.13"

[[deps.CloseOpenIntervals]]
deps = ["Static", "StaticArrayInterface"]
Expand Down Expand Up @@ -1498,9 +1498,9 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"

[[deps.LoggingExtras]]
deps = ["Dates", "Logging"]
git-tree-sha1 = "0d097476b6c381ab7906460ef1ef1638fbce1d91"
git-tree-sha1 = "c1dd6d7978c12545b4179fb6153b9250c96b0075"
uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36"
version = "1.0.2"
version = "1.0.3"

[[deps.LoopVectorization]]
deps = ["ArrayInterface", "ArrayInterfaceCore", "CPUSummary", "CloseOpenIntervals", "DocStringExtensions", "HostCPUFeatures", "IfElse", "LayoutPointers", "LinearAlgebra", "OffsetArrays", "PolyesterWeave", "PrecompileTools", "SIMDTypes", "SLEEFPirates", "Static", "StaticArrayInterface", "ThreadingUtilities", "UnPack", "VectorizationBase"]
Expand Down Expand Up @@ -1813,9 +1813,9 @@ version = "10.42.0+0"

[[deps.PDMats]]
deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"]
git-tree-sha1 = "b7c4f29f93b548caa58f703580f4d79ab753c8ac"
git-tree-sha1 = "528664265c9c36b3ecdb6d721d47aaab52ddf267"
uuid = "90014a1f-27ba-587c-ab20-58faa44d9150"
version = "0.11.21"
version = "0.11.24"

[[deps.PNGFiles]]
deps = ["Base64", "CEnum", "ImageCore", "IndirectArrays", "OffsetArrays", "libpng_jll"]
Expand Down
2 changes: 1 addition & 1 deletion perf/flame.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ allocs_limit["flame_perf_target"] = 12864
allocs_limit["flame_perf_target_tracers"] = 212496
allocs_limit["flame_perf_target_edmfx"] = 304064
allocs_limit["flame_perf_diagnostics"] = 3024344
allocs_limit["flame_perf_target_diagnostic_edmfx"] = 762784
allocs_limit["flame_perf_target_diagnostic_edmfx"] = 862576
allocs_limit["flame_perf_target_edmf"] = 12459299664
allocs_limit["flame_perf_target_threaded"] = 6175664
allocs_limit["flame_perf_target_callbacks"] = 46413904
Expand Down
1 change: 0 additions & 1 deletion src/ClimaAtmos.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ include(joinpath("diagnostics", "Diagnostics.jl"))
import .Diagnostics as CAD

include(joinpath("solver", "model_getters.jl")) # high-level (using parsed_args) model getters
include(joinpath("time_stepper", "time_stepper.jl"))
include(joinpath("solver", "type_getters.jl"))
include(joinpath("solver", "yaml_helper.jl"))
include(joinpath("solver", "solve.jl"))
Expand Down
1 change: 0 additions & 1 deletion src/prognostic_equations/implicit/implicit_tendency.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import ClimaCore: Fields, Geometry
NVTX.@annotate function implicit_tendency!(Yₜ, Y, p, t)
fill_with_nans!(p)
Yₜ .= zero(eltype(Yₜ))
set_precomputed_quantities!(Y, p, t)
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
1 change: 0 additions & 1 deletion src/prognostic_equations/implicit/wfact.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ end

NVTX.@annotate function Wfact!(W, Y, p, dtγ, t)
fill_with_nans!(p)
set_precomputed_quantities!(Y, p, t)
Fields.bycolumn(axes(Y.c)) do colidx
Wfact!(W, Y, p, dtγ, t, colidx)
end
Expand Down
1 change: 0 additions & 1 deletion src/prognostic_equations/limited_tendencies.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import ClimaCore.Fields: ColumnField

NVTX.@annotate function limited_tendency!(Yₜ, Y, p, t)
Yₜ .= zero(eltype(Yₜ))
set_precomputed_quantities!(Y, p, t)
horizontal_tracer_advection_tendency!(Yₜ, Y, p, t)
tracer_hyperdiffusion_tendency!(Yₜ, Y, p, t)
return nothing
Expand Down
2 changes: 1 addition & 1 deletion src/solver/type_getters.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ function args_integrator(parsed_args, Y, p, tspan, ode_algo, callback)
tgrad = (∂Y∂t, Y, p, t) -> (∂Y∂t .= 0),
)
if is_cts_algo(ode_algo)
CA.AtmosODEFunction(;
CTS.ClimaODEFunction(;
T_lim! = limited_tendency!,
T_exp! = remaining_tendency!,
T_imp! = implicit_func,
Expand Down
121 changes: 0 additions & 121 deletions src/time_stepper/imex_ark.jl
View file

This file was deleted.

18 changes: 0 additions & 18 deletions src/time_stepper/time_stepper.jl
View file

This file was deleted.

0 comments on commit 3a80801

Please sign in to comment.