Skip to content

Commit

Permalink
Flip lat and long
Browse files Browse the repository at this point in the history
[skip ci][ci skip]
  • Loading branch information
Sbozzolo committed Sep 9, 2024
1 parent 6bc5983 commit 5c39c58
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 54 deletions.
100 changes: 57 additions & 43 deletions .buildkite/Manifest.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is machine-generated - editing it directly is not advised

julia_version = "1.10.3"
julia_version = "1.10.5"
manifest_format = "2.0"
project_hash = "8bf4280ae518624e2eecdd78d73fb9c6d91ad4cf"

Expand Down Expand Up @@ -101,9 +101,9 @@ version = "0.4.0"

[[deps.ArrayInterface]]
deps = ["Adapt", "LinearAlgebra"]
git-tree-sha1 = "f54c23a5d304fb87110de62bace7777d59088c34"
git-tree-sha1 = "3640d077b6dafd64ceb8fd5c1ec76f7ca53bcf76"
uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
version = "7.15.0"
version = "7.16.0"

[deps.ArrayInterface.extensions]
ArrayInterfaceBandedMatricesExt = "BandedMatrices"
Expand Down Expand Up @@ -390,9 +390,7 @@ version = "0.4.5"

[[deps.ClimaDiagnostics]]
deps = ["Accessors", "ClimaComms", "ClimaCore", "Dates", "NCDatasets", "SciMLBase"]
git-tree-sha1 = "ebd3224da5ff242eca048b651395fb91f44c2fb8"
repo-rev = "gb/latlong_boxes"
repo-url = "https://github.com/CliMA/ClimaDiagnostics.jl.git"
git-tree-sha1 = "0c60c2b40b0c5ae87690734e2aedea5a8c686e91"
uuid = "1ecacbb8-0713-4841-9a07-eb5aa8a2d53f"
version = "0.2.5"

Expand All @@ -417,10 +415,10 @@ version = "0.14.3"
cuDNN = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd"

[[deps.ClimaParams]]
deps = ["DocStringExtensions", "TOML", "Test"]
git-tree-sha1 = "56f4b28affba295c0cbc81d9684ddc759af04bfc"
deps = ["TOML"]
git-tree-sha1 = "b43ca371c435056129295445122ea87fd843b505"
uuid = "5c42b081-d73a-476f-9059-fd94b934656c"
version = "0.10.13"
version = "0.10.14"

[[deps.ClimaTimeSteppers]]
deps = ["ClimaComms", "Colors", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"]
Expand Down Expand Up @@ -561,14 +559,14 @@ uuid = "f0e56b4a-5159-44fe-b623-3e5288b988bb"
version = "2.4.2"

[[deps.ConstructionBase]]
deps = ["LinearAlgebra"]
git-tree-sha1 = "a33b7ced222c6165f624a3f2b55945fac5a598d9"
git-tree-sha1 = "76219f1ed5771adbb096743bff43fb5fdd4c1157"
uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
version = "1.5.7"
weakdeps = ["IntervalSets", "StaticArrays"]
version = "1.5.8"
weakdeps = ["IntervalSets", "LinearAlgebra", "StaticArrays"]

[deps.ConstructionBase.extensions]
ConstructionBaseIntervalSetsExt = "IntervalSets"
ConstructionBaseLinearAlgebraExt = "LinearAlgebra"
ConstructionBaseStaticArraysExt = "StaticArrays"

[[deps.ContextVariablesX]]
Expand Down Expand Up @@ -600,10 +598,10 @@ uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f"
version = "4.1.1"

[[deps.CubedSphere]]
deps = ["Elliptic", "FFTW", "Printf", "ProgressBars", "SpecialFunctions", "TaylorSeries", "Test"]
git-tree-sha1 = "10134667d7d3569b191a65801514271b8a93b292"
deps = ["Elliptic", "FFTW", "Printf", "ProgressBars", "SpecialFunctions", "TaylorSeries"]
git-tree-sha1 = "049f692019f52ad3b043edf20ef25ebd7b38eb94"
uuid = "7445602f-e544-4518-8976-18f8e8ae6cdb"
version = "0.2.5"
version = "0.2.6"

[[deps.DataAPI]]
git-tree-sha1 = "abe83f3a2f1b857aac70ef8b269080af17764bbe"
Expand Down Expand Up @@ -644,9 +642,9 @@ version = "0.1.2"

[[deps.DelaunayTriangulation]]
deps = ["AdaptivePredicates", "EnumX", "ExactPredicates", "Random"]
git-tree-sha1 = "b5f1c6532d2ea71e99b74231b0a3d53fba846ced"
git-tree-sha1 = "9903123ab7fc5e55053292aff04ff5d7aff92633"
uuid = "927a84f5-c5f4-47a5-9785-b46e178433df"
version = "1.1.3"
version = "1.3.0"

[[deps.DelimitedFiles]]
deps = ["Mmap"]
Expand Down Expand Up @@ -710,9 +708,9 @@ version = "1.15.1"

[[deps.DifferentiationInterface]]
deps = ["ADTypes", "Compat", "DocStringExtensions", "FillArrays", "LinearAlgebra", "PackageExtensionCompat", "SparseArrays", "SparseMatrixColorings"]
git-tree-sha1 = "e53e4eb7f8e7b25656ea17263b0c22f129091eeb"
git-tree-sha1 = "9b23f9a816790b8ab9914c3c86321a546e92cbe7"
uuid = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
version = "0.5.15"
version = "0.5.17"

[deps.DifferentiationInterface.extensions]
DifferentiationInterfaceChainRulesCoreExt = "ChainRulesCore"
Expand Down Expand Up @@ -1121,10 +1119,10 @@ uuid = "68eda718-8dee-11e9-39e7-89f7f65f511f"
version = "0.4.2"

[[deps.GeoInterface]]
deps = ["Extents"]
git-tree-sha1 = "9fff8990361d5127b770e3454488360443019bb3"
deps = ["Extents", "GeoFormatTypes"]
git-tree-sha1 = "5921fc0704e40c024571eca551800c699f86ceb4"
uuid = "cf35fbd7-0cd7-5166-be24-54bfbe79505f"
version = "1.3.5"
version = "1.3.6"

[[deps.GeoInterfaceMakie]]
deps = ["GeoInterface", "GeometryBasics", "MakieCore"]
Expand Down Expand Up @@ -1593,9 +1591,9 @@ version = "0.1.17"

[[deps.LazyArrays]]
deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra", "MacroTools", "SparseArrays"]
git-tree-sha1 = "507b423197fdd9e77b74aa2532c0a05eb7eb4004"
git-tree-sha1 = "360f6039babd6e4d6364eff0d4fc9120834a2d9a"
uuid = "5078a376-72f3-5289-bfd5-ec5146d43c02"
version = "2.2.0"
version = "2.2.1"

[deps.LazyArrays.extensions]
LazyArraysBandedMatricesExt = "BandedMatrices"
Expand Down Expand Up @@ -1720,10 +1718,10 @@ version = "2.8.0"
LDLFactorizations = "40e66cde-538c-5869-a4ad-c39174c6795b"

[[deps.LinearSolve]]
deps = ["ArrayInterface", "ChainRulesCore", "ConcreteStructs", "CpuId", "DocStringExtensions", "EnumX", "FastLapackInterface", "GPUArraysCore", "InteractiveUtils", "KLU", "Krylov", "LazyArrays", "Libdl", "LinearAlgebra", "MKL_jll", "Markdown", "PrecompileTools", "Preferences", "RecursiveFactorization", "Reexport", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Sparspak", "StaticArraysCore", "UnPack"]
git-tree-sha1 = "6b7011b27e35453f68a8f851776271b31fce021c"
deps = ["ArrayInterface", "ChainRulesCore", "ConcreteStructs", "DocStringExtensions", "EnumX", "FastLapackInterface", "GPUArraysCore", "InteractiveUtils", "KLU", "Krylov", "LazyArrays", "Libdl", "LinearAlgebra", "MKL_jll", "Markdown", "PrecompileTools", "Preferences", "RecursiveFactorization", "Reexport", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Sparspak", "StaticArraysCore", "UnPack"]
git-tree-sha1 = "6c5e4555ac2bc449a28604e184f759d18fc08420"
uuid = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
version = "2.33.0"
version = "2.34.0"

[deps.LinearSolve.extensions]
LinearSolveBandedMatricesExt = "BandedMatrices"
Expand Down Expand Up @@ -1969,23 +1967,25 @@ uuid = "2774e3e8-f4cf-5e23-947b-6d7e65073b56"
version = "4.5.1"

[[deps.NNlib]]
deps = ["Adapt", "Atomix", "ChainRulesCore", "GPUArraysCore", "KernelAbstractions", "LinearAlgebra", "Pkg", "Random", "Requires", "Statistics"]
git-tree-sha1 = "ae52c156a63bb647f80c26319b104e99e5977e51"
deps = ["Adapt", "Atomix", "ChainRulesCore", "GPUArraysCore", "KernelAbstractions", "LinearAlgebra", "Random", "Statistics"]
git-tree-sha1 = "4a83c2e01027a0bfcea28589222f2df60b2e20cb"
uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
version = "0.9.22"
version = "0.9.23"

[deps.NNlib.extensions]
NNlibAMDGPUExt = "AMDGPU"
NNlibCUDACUDNNExt = ["CUDA", "cuDNN"]
NNlibCUDAExt = "CUDA"
NNlibEnzymeCoreExt = "EnzymeCore"
NNlibFFTWExt = "FFTW"
NNlibForwardDiffExt = "ForwardDiff"

[deps.NNlib.weakdeps]
AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e"
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869"
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
cuDNN = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd"

[[deps.NVTX]]
Expand Down Expand Up @@ -2383,9 +2383,15 @@ version = "6.5.2+2"

[[deps.QuadGK]]
deps = ["DataStructures", "LinearAlgebra"]
git-tree-sha1 = "e237232771fdafbae3db5c31275303e056afaa9f"
git-tree-sha1 = "1d587203cf851a51bf1ea31ad7ff89eff8d625ea"
uuid = "1fd47b50-473d-5c70-9696-f719f8f3bcdc"
version = "2.10.1"
version = "2.11.0"

[deps.QuadGK.extensions]
QuadGKEnzymeExt = "Enzyme"

[deps.QuadGK.weakdeps]
Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"

[[deps.REPL]]
deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
Expand Down Expand Up @@ -2552,9 +2558,9 @@ version = "0.1.0"

[[deps.SciMLBase]]
deps = ["ADTypes", "Accessors", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "Expronicon", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables"]
git-tree-sha1 = "2c98f2723eea6a86fd4e956703f161ee1e6f0c3f"
git-tree-sha1 = "303a73db99326a8be43e695fbab9e076b02118ca"
uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
version = "2.50.6"
version = "2.52.2"

[deps.SciMLBase.extensions]
SciMLBaseChainRulesCoreExt = "ChainRulesCore"
Expand Down Expand Up @@ -2588,9 +2594,9 @@ weakdeps = ["SparseArrays", "StaticArraysCore"]

[[deps.SciMLStructures]]
deps = ["ArrayInterface"]
git-tree-sha1 = "20ad3e7c137156c50c93c888d0f2bc5b7883c729"
git-tree-sha1 = "25514a6f200219cd1073e4ff23a6324e4a7efe64"
uuid = "53ae85a6-f571-4167-b2af-e1d143709226"
version = "1.4.2"
version = "1.5.0"

[[deps.Scratch]]
deps = ["Dates"]
Expand Down Expand Up @@ -2867,9 +2873,9 @@ weakdeps = ["ClimaParams"]

[[deps.SymbolicIndexingInterface]]
deps = ["Accessors", "ArrayInterface", "RuntimeGeneratedFunctions", "StaticArraysCore"]
git-tree-sha1 = "c9fce29fb41a10677e24f74421ebe31220b81ad0"
git-tree-sha1 = "988e04b34a4c3b824fb656f542473df99a4f610d"
uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
version = "0.3.28"
version = "0.3.30"

[[deps.TOML]]
deps = ["Dates"]
Expand All @@ -2895,13 +2901,21 @@ version = "1.10.0"

[[deps.TaylorSeries]]
deps = ["LinearAlgebra", "Markdown", "Requires", "SparseArrays"]
git-tree-sha1 = "1c7170668366821b0c4c4fe03ee78f8d6cf36e2c"
git-tree-sha1 = "90c9bc500f4c5cdd235c81503ec91b2048f06423"
uuid = "6aa5eb33-94cf-58f4-a9d0-e4b2c4fc25ea"
version = "0.16.0"
weakdeps = ["IntervalArithmetic"]
version = "0.17.8"

[deps.TaylorSeries.extensions]
TaylorSeriesIAExt = "IntervalArithmetic"
TaylorSeriesJLD2Ext = "JLD2"
TaylorSeriesRATExt = "RecursiveArrayTools"
TaylorSeriesSAExt = "StaticArrays"

[deps.TaylorSeries.weakdeps]
IntervalArithmetic = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253"
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"

[[deps.TensorCore]]
deps = ["LinearAlgebra"]
Expand Down Expand Up @@ -3332,7 +3346,7 @@ version = "0.15.2+0"
[[deps.libblastrampoline_jll]]
deps = ["Artifacts", "Libdl"]
uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
version = "5.8.0+1"
version = "5.11.0+0"

[[deps.libdecor_jll]]
deps = ["Artifacts", "Dbus_jll", "JLLWrappers", "Libdl", "Libglvnd_jll", "Pango_jll", "Wayland_jll", "xkbcommon_jll"]
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ CSV = "0.10"
CUDA = "5.2"
ClimaComms = "0.6"
ClimaCore = "0.14"
ClimaDiagnostics = "0.2"
ClimaDiagnostics = "0.2.5"
ClimaParams = "0.10.2"
ClimaUtilities = "0.1.6"
DataFrames = "1.4"
Expand Down
21 changes: 11 additions & 10 deletions src/shared_utilities/Domains.jl
Original file line number Diff line number Diff line change
Expand Up @@ -268,21 +268,22 @@ function Plane(;
radius_earth = FT(radius_earth)
long, lat = longlat
xlim =
(long - xlim[1] / (2radius_earth), long + xlim[2] / (2radius_earth))
ylim =
(lat - ylim[1] / (2radius_earth), lat + ylim[2] / (2radius_earth))
ylim =
(long - xlim[1] / (2radius_earth), long + xlim[2] / (2radius_earth))
@assert xlim[1] < xlim[2]
@assert ylim[1] < ylim[2]

# NOTE: We have LatLong instead of the other way because of ClimaCore
domain_x = ClimaCore.Domains.IntervalDomain(
ClimaCore.Geometry.LongPoint(xlim[1]),
ClimaCore.Geometry.LongPoint(xlim[2]);
boundary_names = (:west, :east),
ClimaCore.Geometry.LatPoint(xlim[1]),
ClimaCore.Geometry.LatPoint(xlim[2]);
boundary_names = (:north, :south),
)
domain_y = ClimaCore.Domains.IntervalDomain(
ClimaCore.Geometry.LatPoint(ylim[1]),
ClimaCore.Geometry.LatPoint(ylim[2]);
boundary_names = (:north, :south),
ClimaCore.Geometry.LongPoint(ylim[1]),
ClimaCore.Geometry.LongPoint(ylim[2]);
boundary_names = (:west, :east),
)
end
plane = ClimaCore.Domains.RectangleDomain(domain_x, domain_y)
Expand Down Expand Up @@ -922,10 +923,10 @@ end

"""
depth(space::Union{ClimaCore.Spaces.CenterFiniteDifferenceSpace,
ClimaCore.Spaces.CenterExtrudedFiniteDifferenceSpace})
ClimaCore.Spaces.CenterExtrudedFiniteDifferenceSpace})
Returns the depth of the domain as a scalar. Note that these functions
will need to be modified upon the introduction of
will need to be modified upon the introduction of
- topography at surface
- depth to bedrock (topography at bottom)
Expand Down

0 comments on commit 5c39c58

Please sign in to comment.