(0.5.0) remove the OrthogonalSphericalShellGrids.jl package (#395)

simone-silvestri · web-flow · commit eb26ed3645c4 · 2025-03-11T09:45:14.000+01:00
* bump

* update oceananigans

* bump

* Update Project.toml

* Update Project.toml

* Update Project.toml

* Update OceanSimulations.jl

* bugfix
diff --git a/Project.toml b/Project.toml
@@ -2,7 +2,7 @@ name = "ClimaOcean"
 uuid = "0376089a-ecfe-4b0e-a64f-9c555d74d754"
 license = "MIT"
 authors = ["Climate Modeling Alliance and contributors"]
-version = "0.4.7"
+version = "0.5.0"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
@@ -20,7 +20,6 @@ MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
 NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
 Oceananigans = "9e8cae18-63c1-5223-a75c-80ca9d6e9a09"
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
-OrthogonalSphericalShellGrids = "c2be9673-fb75-4747-82dc-aa2bb9f4aed0"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 Scratch = "6c6a2e73-6563-6170-7368-637461726353"
 SeawaterPolynomials = "d496a93d-167e-4197-9f49-d3af4ff8fe40"
@@ -42,9 +41,8 @@ JLD2 = "0.4, 0.5"
 KernelAbstractions = "0.9"
 MPI = "0.20"
 NCDatasets = "0.12, 0.13, 0.14"
-Oceananigans = "0.95.21 - 0.99"
+Oceananigans = "0.95.25 - 0.99"
 OffsetArrays = "1.14"
-OrthogonalSphericalShellGrids = "0.2.2"
 Scratch = "1"
 SeawaterPolynomials = "0.3.4"
 StaticArrays = "1"
diff --git a/docs/Project.toml b/docs/Project.toml
@@ -5,13 +5,11 @@ DataDeps = "124859b0-ceae-595e-8997-d05f6a7a8dfe"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
 Oceananigans = "9e8cae18-63c1-5223-a75c-80ca9d6e9a09"
-OrthogonalSphericalShellGrids = "c2be9673-fb75-4747-82dc-aa2bb9f4aed0"
 SeawaterPolynomials = "d496a93d-167e-4197-9f49-d3af4ff8fe40"
 
 [compat]
 CairoMakie = "0.10.12, 0.11, 0.12, 0.13"
 DataDeps = "0.7"
 Documenter = "1"
-Oceananigans = "0.95.12 - 0.99"
-OrthogonalSphericalShellGrids = "0.2.1"
+Oceananigans = "0.95.25 - 0.99"
 SeawaterPolynomials = "0.3.5"
diff --git a/examples/one_degree_simulation.jl b/examples/one_degree_simulation.jl
@@ -3,14 +3,14 @@
 # This example configures a global ocean--sea ice simulation at 1ᵒ horizontal resolution with
 # realistic bathymetry and some closures.
 #
-# For this example, we need Oceananigans, ClimaOcean, OrthogonalSphericalShellGrids, and
+# For this example, we need Oceananigans, ClimaOcean, and
 # CairoMakie to visualize the simulation. Also we need CFTime and Dates for date handling.
 
 using ClimaOcean
 using ClimaOcean.ECCO
 using Oceananigans
 using Oceananigans.Units
-using OrthogonalSphericalShellGrids
+using Oceananigans.OrthogonalSphericalShellGrids
 using CFTime
 using Dates
 using Printf
diff --git a/experiments/coupled_simulation/ocean_sea_ice_coupled_simulation.jl b/experiments/coupled_simulation/ocean_sea_ice_coupled_simulation.jl
@@ -2,7 +2,7 @@ using ClimaOcean
 using Oceananigans
 using Oceananigans.Units
 using Oceananigans.Grids
-using OrthogonalSphericalShellGrids
+using Oceananigans.OrthogonalSphericalShellGrids
 using CFTime
 using Dates
 using Printf
diff --git a/experiments/one_degree_simulation/one_degree_simulation.jl b/experiments/one_degree_simulation/one_degree_simulation.jl
@@ -1,6 +1,6 @@
 using ClimaOcean
 using ClimaOcean.ECCO: ECCO4Monthly
-using OrthogonalSphericalShellGrids
+using Oceananigans.OrthogonalSphericalShellGrids
 using Oceananigans
 using Oceananigans.Units
 using Dates
diff --git a/src/OceanSimulations/OceanSimulations.jl b/src/OceanSimulations/OceanSimulations.jl
@@ -8,7 +8,7 @@ using Oceananigans.Utils: with_tracers
 using Oceananigans.Advection: FluxFormAdvection
 using Oceananigans.BoundaryConditions: DefaultBoundaryCondition
 using Oceananigans.ImmersedBoundaries: immersed_peripheral_node, inactive_node, MutableGridOfSomeKind
-using OrthogonalSphericalShellGrids
+using Oceananigans.OrthogonalSphericalShellGrids
 
 using Oceananigans.TurbulenceClosures.TKEBasedVerticalDiffusivities:
     CATKEVerticalDiffusivity,
diff --git a/src/OceanSimulations/ocean_simulation.jl b/src/OceanSimulations/ocean_simulation.jl
@@ -2,7 +2,7 @@ using Oceananigans.DistributedComputations: DistributedGrid, all_reduce
 using Oceananigans.Architectures: architecture
 using Oceananigans.BoundaryConditions: DefaultBoundaryCondition
 using Oceananigans.ImmersedBoundaries: immersed_peripheral_node, inactive_node, MutableGridOfSomeKind
-using OrthogonalSphericalShellGrids
+using Oceananigans.OrthogonalSphericalShellGrids
 
 using Oceananigans.TurbulenceClosures: VerticallyImplicitTimeDiscretization
 
diff --git a/src/SeaIceSimulations.jl b/src/SeaIceSimulations.jl
@@ -8,7 +8,7 @@ using Oceananigans.Utils: with_tracers
 using Oceananigans.Advection: FluxFormAdvection
 using Oceananigans.BoundaryConditions: DefaultBoundaryCondition
 using Oceananigans.ImmersedBoundaries: immersed_peripheral_node, inactive_node
-using OrthogonalSphericalShellGrids
+using Oceananigans.OrthogonalSphericalShellGrids
 
 using Oceananigans.BuoyancyFormulations: g_Earth
 using Oceananigans.Coriolis: Ω_Earth
diff --git a/test/test_ocean_sea_ice_model_parameter_space.jl b/test/test_ocean_sea_ice_model_parameter_space.jl
@@ -1,6 +1,6 @@
 using Oceananigans
 using ClimaOcean
-using OrthogonalSphericalShellGrids
+using Oceananigans.OrthogonalSphericalShellGrids
 
 start_time = time_ns()
 arch = GPU() 
diff --git a/test/test_simulations.jl b/test/test_simulations.jl
@@ -1,7 +1,7 @@
 include("runtests_setup.jl")
 
 using CUDA
-using OrthogonalSphericalShellGrids
+using Oceananigans.OrthogonalSphericalShellGrids
 using ClimaOcean.OceanSeaIceModels: above_freezing_ocean_temperature!
 using ClimaSeaIce.SeaIceThermodynamics: melting_temperature
 
