Skip to content

Commit

Permalink
Remove unused direct dependencies (#1103)
Browse files Browse the repository at this point in the history
* Remove unused direct dependencies

* Remove indirect dependencies from Project.tomls
  • Loading branch information
imreddyTeja authored Dec 5, 2024
1 parent 4cc0f9b commit 91e03f7
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 52 deletions.
2 changes: 0 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ authors = ["CliMA Contributors <[email protected]>"]
version = "0.1.1"

[deps]
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884"
ClimaCoreTempestRemap = "d934ef94-cdd4-4710-83d6-720549644b70"
Expand All @@ -18,7 +17,6 @@ SurfaceFluxes = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f"
Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"

[compat]
Artifacts = "1"
ClimaComms = "0.5.6, 0.6"
ClimaCore = "0.14.19"
ClimaCoreTempestRemap = "0.3"
Expand Down
1 change: 0 additions & 1 deletion docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
ClimaCoupler = "4ade58fe-a8da-486c-bd89-46df092ec0c7"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

[compat]
Documenter = "0.27"
2 changes: 1 addition & 1 deletion docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using ClimaCoupler
using Documenter, Literate, Pkg
using Documenter, Literate

const COUPLER_DIR = joinpath(@__DIR__, "..")
const EXPERIMENTS_DIR = joinpath(@__DIR__, "..", "experiments")
Expand Down
4 changes: 2 additions & 2 deletions experiments/ClimaCore/Manifest-v1.11.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

julia_version = "1.11.1"
manifest_format = "2.0"
project_hash = "b4183f1b0845de246c310b2b5727563772495d81"
project_hash = "bf83058e7b8cbbdd01fa91af0f6b995b1e2e3f47"

[[deps.ADTypes]]
git-tree-sha1 = "30bb95a372787af850addf28ac937f1be7b79173"
Expand Down Expand Up @@ -300,7 +300,7 @@ uuid = "d934ef94-cdd4-4710-83d6-720549644b70"
version = "0.3.18"

[[deps.ClimaCoupler]]
deps = ["Artifacts", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "Dates", "JLD2", "Logging", "NCDatasets", "SciMLBase", "StaticArrays", "SurfaceFluxes", "Thermodynamics"]
deps = ["ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "Dates", "JLD2", "Logging", "NCDatasets", "SciMLBase", "StaticArrays", "SurfaceFluxes", "Thermodynamics"]
path = "../.."
uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7"
version = "0.1.1"
Expand Down
2 changes: 1 addition & 1 deletion experiments/ClimaCore/Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

julia_version = "1.10.5"
manifest_format = "2.0"
project_hash = "b4183f1b0845de246c310b2b5727563772495d81"
project_hash = "bf83058e7b8cbbdd01fa91af0f6b995b1e2e3f47"

[[deps.ADTypes]]
git-tree-sha1 = "30bb95a372787af850addf28ac937f1be7b79173"
Expand Down
1 change: 0 additions & 1 deletion experiments/ClimaCore/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"

[compat]
ClimaTimeSteppers = "0.7"
Expand Down
9 changes: 2 additions & 7 deletions experiments/ClimaEarth/Manifest-v1.11.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

julia_version = "1.11.1"
manifest_format = "2.0"
project_hash = "877ee33651abf1f1d3b01a8c2b47c6c89669e6d6"
project_hash = "3e0c86edc8d967d8d36d7e014c51e11ddd02d073"

[[deps.ADTypes]]
git-tree-sha1 = "30bb95a372787af850addf28ac937f1be7b79173"
Expand Down Expand Up @@ -329,7 +329,7 @@ uuid = "d934ef94-cdd4-4710-83d6-720549644b70"
version = "0.3.18"

[[deps.ClimaCoupler]]
deps = ["Artifacts", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "Dates", "JLD2", "Logging", "NCDatasets", "SciMLBase", "StaticArrays", "SurfaceFluxes", "Thermodynamics"]
deps = ["ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "Dates", "JLD2", "Logging", "NCDatasets", "SciMLBase", "StaticArrays", "SurfaceFluxes", "Thermodynamics"]
path = "../.."
uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7"
version = "0.1.1"
Expand Down Expand Up @@ -960,11 +960,6 @@ git-tree-sha1 = "674ff0db93fffcd11a3573986e550d66cd4fd71f"
uuid = "7746bdde-850d-59dc-9ae8-88ece973131d"
version = "2.80.5+0"

[[deps.Glob]]
git-tree-sha1 = "97285bbd5230dd766e9ef6749b80fc617126d496"
uuid = "c27321d9-0574-5035-807b-f59d2c89b15c"
version = "1.3.1"

[[deps.GnuTLS_jll]]
deps = ["Artifacts", "GMP_jll", "JLLWrappers", "Libdl", "Nettle_jll", "P11Kit_jll", "Zlib_jll"]
git-tree-sha1 = "383db7d3f900f4c1f47a8a04115b053c095e48d3"
Expand Down
11 changes: 3 additions & 8 deletions experiments/ClimaEarth/Manifest.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This file is machine-generated - editing it directly is not advised

julia_version = "1.10.5"
julia_version = "1.10.6"
manifest_format = "2.0"
project_hash = "bb90fe1237f0005fb451fcca456bfa9abb22474c"
project_hash = "9d4daca72a27dd26a4e46ba913787d7e63971347"

[[deps.ADTypes]]
git-tree-sha1 = "30bb95a372787af850addf28ac937f1be7b79173"
Expand Down Expand Up @@ -326,7 +326,7 @@ uuid = "d934ef94-cdd4-4710-83d6-720549644b70"
version = "0.3.18"

[[deps.ClimaCoupler]]
deps = ["Artifacts", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "Dates", "JLD2", "Logging", "NCDatasets", "SciMLBase", "StaticArrays", "SurfaceFluxes", "Thermodynamics"]
deps = ["ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "Dates", "JLD2", "Logging", "NCDatasets", "SciMLBase", "StaticArrays", "SurfaceFluxes", "Thermodynamics"]
path = "../.."
uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7"
version = "0.1.1"
Expand Down Expand Up @@ -953,11 +953,6 @@ git-tree-sha1 = "674ff0db93fffcd11a3573986e550d66cd4fd71f"
uuid = "7746bdde-850d-59dc-9ae8-88ece973131d"
version = "2.80.5+0"

[[deps.Glob]]
git-tree-sha1 = "97285bbd5230dd766e9ef6749b80fc617126d496"
uuid = "c27321d9-0574-5035-807b-f59d2c89b15c"
version = "1.3.1"

[[deps.GnuTLS_jll]]
deps = ["Artifacts", "GMP_jll", "JLLWrappers", "Libdl", "Nettle_jll", "P11Kit_jll", "Zlib_jll"]
git-tree-sha1 = "383db7d3f900f4c1f47a8a04115b053c095e48d3"
Expand Down
5 changes: 0 additions & 5 deletions experiments/ClimaEarth/Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[deps]
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
ClimaAnalysis = "29b5916a-a76c-4e73-9657-3c8fd22e65e6"
ClimaAtmos = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
Expand All @@ -14,13 +13,10 @@ ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
ClimaTimeSteppers = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
ClimaUtilities = "b3f4f4ca-9299-4f7f-bd9b-81e1242a7513"
GeoMakie = "db073c08-6b98-4ee5-b6a4-5efafb3259c6"
Glob = "c27321d9-0574-5035-807b-f59d2c89b15c"
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
Poppler_jll = "9c32591e-4766-534b-9725-b71a8799265b"
PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
Expand All @@ -39,7 +35,6 @@ ClimaLand = "0.14, 0.15"
ClimaParams = "0.10"
ClimaTimeSteppers = "0.7"
ClimaUtilities = "0.1"
Glob = "1"
Interpolations = "0.14, 0.15"
StaticArrays = "1"
YAML = "0.4"
3 changes: 1 addition & 2 deletions experiments/ClimaEarth/run_amip.jl
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ import ClimaUtilities.SpaceVaryingInputs: SpaceVaryingInput
import ClimaUtilities.TimeVaryingInputs: TimeVaryingInput, evaluate!
import ClimaUtilities.Utils: period_to_seconds_float
import ClimaUtilities.ClimaArtifacts: @clima_artifact
import Interpolations

import Interpolations # triggers InterpolationsExt in ClimaUtilities
# Random is used by RRMTGP for some cloud properties
import Random

Expand Down
2 changes: 1 addition & 1 deletion experiments/ClimaEarth/run_cloudy_slabplanet.jl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import ClimaCoupler:

import ClimaUtilities.ClimaArtifacts: @clima_artifact
import ClimaUtilities.SpaceVaryingInputs: SpaceVaryingInput
import Interpolations
import Interpolations # triggers InterpolationsExt in ClimaUtilities

pkg_dir = pkgdir(ClimaCoupler)

Expand Down
1 change: 0 additions & 1 deletion src/Utilities.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ modules in the coupler.
"""
module Utilities

import Artifacts
import ClimaComms
import ClimaCore as CC
import Logging
Expand Down
12 changes: 0 additions & 12 deletions test/Project.toml
Original file line number Diff line number Diff line change
@@ -1,27 +1,19 @@
[deps]
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
ClimaAnalysis = "29b5916a-a76c-4e73-9657-3c8fd22e65e6"
ClimaAtmos = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884"
ClimaCoreMakie = "908f55d8-4145-4867-9c14-5dad1a479e4d"
ClimaCoupler = "4ade58fe-a8da-486c-bd89-46df092ec0c7"
ClimaLand = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532"
ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
ClimaTimeSteppers = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
ClimaUtilities = "b3f4f4ca-9299-4f7f-bd9b-81e1242a7513"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
Expand All @@ -37,12 +29,8 @@ Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
[compat]
Aqua = "0.8"
ClimaAtmos = "0.27"
ClimaLand = "0.14, 0.15"
ClimaParams = "0.10"
ClimaUtilities = "0.1"
Dates = "1"
Downloads = "1"
IntervalSets = "0.5, 0.6, 0.7"
Pkg = "1"
PrettyTables = "2"
StaticArrays = "1"
Expand Down
20 changes: 12 additions & 8 deletions test/experiment_tests/coupled_sims.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Test: @test, @testset, @test_throws
using IntervalSets # for `..`
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
import ClimaCore as CC
Expand Down Expand Up @@ -31,14 +30,19 @@ end
name(::SimB) = :simB

function spectral_space_2D(; n1 = 1, n2 = 1, Nij = 4)
domain = CC.Domains.RectangleDomain(
CC.Geometry.XPoint(-1.0) .. CC.Geometry.XPoint(1.0),
CC.Geometry.YPoint(-1.0) .. CC.Geometry.YPoint(1.0),
x1periodic = false,
x2periodic = false,
x1boundary = (:east, :west),
x2boundary = (:south, :north),
xdomain = CC.Domains.IntervalDomain(
CC.Geometry.XPoint(-1.0),
CC.Geometry.XPoint(1.0),
periodic = false,
boundary_names = (:east, :west),
)
ydomain = CC.Domains.IntervalDomain(
CC.Geometry.YPoint(-1.0),
CC.Geometry.YPoint(1.0),
periodic = false,
boundary_names = (:south, :north),
)
domain = CC.Domains.RectangleDomain(xdomain, ydomain)
mesh = CC.Meshes.RectilinearMesh(domain, n1, n2)
comms_ctx = ClimaComms.SingletonCommsContext()
grid_topology = CC.Topologies.Topology2D(comms_ctx, mesh)
Expand Down

0 comments on commit 91e03f7

Please sign in to comment.