Skip to content

Commit 4aaa868

Browse files
authored
Get constants (e.g., g, R_Earth, Ω_Earth) from Oceananigans.defaults (#658)
* get constants from Oceananigans.defaults * Update ClimaSeaIce compatibility version to 0.3.9 this captures CliMA/ClimaSeaIce.jl#94
1 parent 996eaee commit 4aaa868

File tree

6 files changed

+18
-17
lines changed

6 files changed

+18
-17
lines changed

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ClimaOceanReactantExt = "Reactant"
4545
Adapt = "4"
4646
CFTime = "0.1, 0.2"
4747
CUDA = "4, 5"
48-
ClimaSeaIce = "0.3.8"
48+
ClimaSeaIce = "0.3.9"
4949
CondaPkg = "0.2.28"
5050
CubicSplines = "0.2"
5151
DataDeps = "0.7"
@@ -58,7 +58,7 @@ KernelAbstractions = "0.9"
5858
MPI = "0.20"
5959
MeshArrays = "0.3"
6060
NCDatasets = "0.12, 0.13, 0.14"
61-
Oceananigans = "0.100"
61+
Oceananigans = "0.100.3"
6262
OffsetArrays = "1.14"
6363
PrecompileTools = "1"
6464
PythonCall = "0.9"

src/OceanSeaIceModels/InterfaceComputations/coefficient_based_turbulent_fluxes.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using DocStringExtensions
2-
using Oceananigans.BuoyancyFormulations: g_Earth
2+
3+
g_Earth = Oceananigans.defaults.gravitational_acceleration
34

45
"""
56
struct CoefficientBasedFluxes{CD, CH, CQ, S}

src/OceanSeaIceModels/InterfaceComputations/component_interfaces.jl

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,19 @@ using ..OceanSeaIceModels.PrescribedAtmospheres:
1616

1717
using ClimaSeaIce: SeaIceModel
1818

19-
using Oceananigans.BuoyancyFormulations: g_Earth
2019
using Oceananigans: HydrostaticFreeSurfaceModel, architecture
2120
using Oceananigans.Grids: inactive_node, node, topology
2221
using Oceananigans.BoundaryConditions: fill_halo_regions!
23-
2422
using Oceananigans.Fields: ConstantField, interpolate, FractionalIndices
2523
using Oceananigans.Utils: launch!, Time, KernelParameters
26-
2724
using Oceananigans.Operators: ℑxᶜᵃᵃ, ℑyᵃᶜᵃ, ℑxᶠᵃᵃ, ℑyᵃᶠᵃ
2825

2926
using KernelAbstractions: @kernel, @index
3027

3128
import Oceananigans.Simulations: initialize!
3229

30+
g_Earth = Oceananigans.defaults.gravitational_acceleration
31+
3332
#####
3433
##### Container for organizing information related to fluxes
3534
#####
@@ -189,11 +188,11 @@ function atmosphere_ocean_interface(atmos,
189188
downwelling_longwave = Field{Center, Center, Nothing}(ocean.model.grid)
190189
downwelling_shortwave = Field{Center, Center, Nothing}(ocean.model.grid)
191190

192-
ao_fluxes = (; latent_heat,
193-
sensible_heat,
194-
water_vapor,
191+
ao_fluxes = (; latent_heat,
192+
sensible_heat,
193+
water_vapor,
195194
x_momentum,
196-
y_momentum,
195+
y_momentum,
197196
friction_velocity,
198197
temperature_scale,
199198
water_vapor_scale,

src/OceanSeaIceModels/InterfaceComputations/similarity_theory_turbulent_fluxes.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using Oceananigans.Utils: prettysummary
22
using Oceananigans.Grids: AbstractGrid
3-
using Oceananigans.BuoyancyFormulations: g_Earth
43

54
using Adapt
65
using Thermodynamics: Liquid
@@ -14,6 +13,8 @@ using Statistics: norm
1413
import Thermodynamics as AtmosphericThermodynamics
1514
import Thermodynamics.Parameters: Rv_over_Rd
1615

16+
g_Earth = Oceananigans.defaults.gravitational_acceleration
17+
1718
#####
1819
##### Bulk turbulent fluxes based on similarity theory
1920
#####

src/OceanSimulations/OceanSimulations.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ using Oceananigans.Advection: FluxFormAdvection
99
using Oceananigans.BoundaryConditions: DefaultBoundaryCondition
1010
using Oceananigans.ImmersedBoundaries: immersed_peripheral_node, inactive_node, MutableGridOfSomeKind
1111
using Oceananigans.OrthogonalSphericalShellGrids
12+
using Oceananigans.Operators
1213

1314
using Oceananigans.TurbulenceClosures.TKEBasedVerticalDiffusivities:
1415
CATKEVerticalDiffusivity,
@@ -17,9 +18,8 @@ using Oceananigans.TurbulenceClosures.TKEBasedVerticalDiffusivities:
1718

1819
using SeawaterPolynomials.TEOS10: TEOS10EquationOfState
1920

20-
using Oceananigans.BuoyancyFormulations: g_Earth
21-
using Oceananigans.Coriolis: Ω_Earth
22-
using Oceananigans.Operators
21+
g_Earth = Oceananigans.defaults.gravitational_acceleration
22+
Ω_Earth = Oceananigans.defaults.planet_rotation_rate
2323

2424
struct Default{V}
2525
value :: V

src/SeaIceSimulations.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ using Oceananigans.Advection: FluxFormAdvection
99
using Oceananigans.BoundaryConditions: DefaultBoundaryCondition
1010
using Oceananigans.ImmersedBoundaries: immersed_peripheral_node, inactive_node
1111
using Oceananigans.OrthogonalSphericalShellGrids
12-
13-
using Oceananigans.BuoyancyFormulations: g_Earth
14-
using Oceananigans.Coriolis: Ω_Earth
1512
using Oceananigans.Operators
1613

1714
using ClimaSeaIce
@@ -22,6 +19,9 @@ using ClimaSeaIce.Rheologies: IceStrength, ElastoViscoPlasticRheology
2219

2320
using ClimaOcean.OceanSimulations: Default
2421

22+
g_Earth = Oceananigans.defaults.gravitational_acceleration
23+
Ω_Earth = Oceananigans.defaults.planet_rotation_rate
24+
2525
function sea_ice_simulation(grid, ocean=nothing;
2626
Δt = 5minutes,
2727
ice_salinity = 4, # psu

0 commit comments

Comments
 (0)