Skip to content

Commit

Permalink
Merge pull request #1678 from CliMA/ck/up_deps
Browse files Browse the repository at this point in the history 
Update dependencies
  • Loading branch information
@charleskawczynski
charleskawczynski authored May 22, 2023
2 parents 27f919b + 7cbbcc4 commit d6be3ec
Show file tree
Hide file tree
Showing 10 changed files with 358 additions and 270 deletions.
12 changes: 3 additions & 9 deletions .dev/Manifest.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
version = "1.6.0"

[[deps.Parsers]]
deps = ["Dates", "SnoopPrecompile"]
git-tree-sha1 = "478ac6c952fddd4399e71d4779797c538d0ff2bf"
deps = ["Dates", "PrecompileTools", "UUIDs"]
git-tree-sha1 = "a5aef8d4a6e8d81f171b2bd4be5265b01384c74c"
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
version = "2.5.8"
version = "2.5.10"

[[deps.Pkg]]
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
Expand Down Expand Up @@ -182,12 +182,6 @@ version = "0.7.0"
[[deps.Serialization]]
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"

[[deps.SnoopPrecompile]]
deps = ["Preferences"]
git-tree-sha1 = "e760a70afdcd461cf01a575947738d359234665c"
uuid = "66db9d55-30c0-4569-8b51-7e840670fc0c"
version = "1.0.3"

[[deps.Sockets]]
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"

Expand Down
6 changes: 4 additions & 2 deletions Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "ClimaAtmos"
uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
authors = ["Climate Modeling Alliance"]
version = "0.12.0"
version = "0.13.0"

[deps]
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
Expand All @@ -28,6 +28,7 @@ Insolation = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8"
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
LambertW = "984bce1d-4616-540c-a9ee-88d1112d94c9"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
Expand Down Expand Up @@ -67,10 +68,11 @@ Distributions = "0.25"
DocStringExtensions = "0.8, 0.9"
FastGaussQuadrature = "0.4, 0.5"
ImageFiltering = "0.7"
Insolation = "0.4"
Insolation = "0.6"
Interpolations = "0.14"
IntervalSets = "0.5, 0.6, 0.7"
JLD2 = "0.4"
Krylov = "0.9.1"
LambertW = "0.4"
NCDatasets = "0.11, 0.12"
NVTX = "0.3"
Expand Down
159 changes: 91 additions & 68 deletions docs/Manifest.toml
View file

Large diffs are not rendered by default.

209 changes: 116 additions & 93 deletions examples/Manifest.toml
View file

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion examples/Project.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
LambertW = "984bce1d-4616-540c-a9ee-88d1112d94c9"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
Expand Down Expand Up @@ -88,11 +89,12 @@ FastGaussQuadrature = "0.4, 0.5"
ForwardDiff = "0.10"
Glob = "1"
ImageFiltering = "0.7"
Insolation = "0.4"
Insolation = "0.6"
Interpolations = "0.14"
IntervalSets = "0.5, 0.6, 0.7"
JLD2 = "0.4"
JSON = "0.21"
Krylov = "0.9.1"
LambertW = "0.4"
NCDatasets = "0.11, 0.12"
NCRegressionTests = "0.2"
Expand Down
209 changes: 116 additions & 93 deletions perf/Manifest.toml
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions perf/Project.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
LambertW = "984bce1d-4616-540c-a9ee-88d1112d94c9"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
Expand Down Expand Up @@ -82,6 +83,7 @@ DocStringExtensions = "0.8, 0.9"
FastGaussQuadrature = "0.4, 0.5"
Glob = "1"
JSON = "0.21"
Krylov = "0.9.1"
LambertW = "0.4"
NCDatasets = "0.11, 0.12"
OrderedCollections = "1"
Expand Down
3 changes: 0 additions & 3 deletions src/parameterizations/radiation/radiation.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ import .RRTMGPInterface as RRTMGPI
using Dierckx: Spline1D
using StatsBase: mean

# TODO: Move to Insolation.jl
Base.broadcastable(x::Insolation.OrbitalData) = tuple(x)

#####
##### No Radiation
#####
Expand Down
20 changes: 20 additions & 0 deletions src/utils/utilities.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,3 +153,23 @@ using ClimaComms
is_distributed(::ClimaComms.SingletonCommsContext) = false
is_distributed(::ClimaComms.AbstractCommsContext) = true # deprecate after upgrading
# is_distributed(::ClimaComms.MPICommsContext) = true # use this after upgrading

# TODO: remove after upgrading ClimaCore
import ClimaCore
import ClimaTimeSteppers
ClimaTimeSteppers.ct_ktypeof(x::ClimaCore.Fields.FieldVector) =
ClimaComms.array_type(x){eltype(parent(x)), 1}

# TODO: remove after upgrading ClimaCore
@inline ClimaCore.Fields._array_type(
x::ClimaCore.Fields.FieldVector,
pns::Tuple,
) = promote_type(
ClimaCore.Fields._array_type(getproperty(x, first(pns))),
ClimaCore.Fields._array_type(x, Base.tail(pns)),
)

# Move to weak dependency in ClimaCore
import Krylov
Krylov.ktypeof(x::ClimaCore.Fields.FieldVector) =
ClimaComms.array_type(x){eltype(parent(x)), 1}
4 changes: 3 additions & 1 deletion test/Project.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
LambertW = "984bce1d-4616-540c-a9ee-88d1112d94c9"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
Expand Down Expand Up @@ -88,10 +89,11 @@ DocStringExtensions = "0.8, 0.9"
FastGaussQuadrature = "0.4, 0.5"
ForwardDiff = "0.10"
Glob = "1"
Insolation = "0.4"
Insolation = "0.6"
IntervalSets = "0.5, 0.6, 0.7"
JLD2 = "0.4"
JSON = "0.21"
Krylov = "0.9.1"
LambertW = "0.4"
NCDatasets = "0.11, 0.12"
NCRegressionTests = "0.2"
Expand Down

2 comments on commit d6be3ec

@charleskawczynski
Copy link
Member Author

Choose a reason for hiding this comment

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

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

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

Registration pull request created: JuliaRegistries/General/84006

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.13.0 -m "<description of version>" d6be3ecdf43091a6dfbd8a8452d9ac8207279526
git push origin v0.13.0

Please sign in to comment.