Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ KernelAbstractions = "0.9"
MPI = "0.20"
MeshArrays = "0.3, 0.4"
NCDatasets = "0.12, 0.13, 0.14"
Oceananigans = "0.101"
Oceananigans = "0.102"
OffsetArrays = "1.14"
PrecompileTools = "1"
Reactant = "0.2.45"
Expand Down
2 changes: 1 addition & 1 deletion src/DataWrangling/metadata.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using CFTime
using Dates
using Base: @propagate_inbounds
import Oceananigans.Utils: prettysummary
import Oceananigans.Grids: prettysummary

struct BoundingBox{X, Y, Z}
longitude :: X
Expand Down
2 changes: 1 addition & 1 deletion src/DataWrangling/restoring.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ using Oceananigans: location
using Oceananigans.Grids: node
using Oceananigans.Fields: interpolate, instantiated_location
using Oceananigans.OutputReaders: Cyclical
using Oceananigans.Utils: Time
using Oceananigans.Units: Time
using Oceananigans.Architectures: AbstractArchitecture

using JLD2
Expand Down
2 changes: 1 addition & 1 deletion src/Diagnostics/Diagnostics.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export MixedLayerDepthField, MixedLayerDepthOperand

using Oceananigans
using Oceananigans.Architectures: architecture
using Oceananigans.BuoyancyFormulations: buoyancy
using Oceananigans.Models: buoyancy_operation
using Oceananigans.Grids: new_data, inactive_cell, znode
using Oceananigans.BoundaryConditions: FieldBoundaryConditions, fill_halo_regions!
using Oceananigans.Fields: FieldStatus
Expand Down
2 changes: 1 addition & 1 deletion src/Diagnostics/mixed_layer_depth.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ end
Base.summary(mldo::MixedLayerDepthOperand) = "MixedLayerDepthOperand"

function MixedLayerDepthOperand(bm, grid, tracers; difference_criterion=1e-4)
buoyancy_perturbation = buoyancy(bm, grid, tracers)
buoyancy_perturbation = buoyancy_operation(bm, grid, tracers)
difference_criterion = convert(eltype(grid), difference_criterion)
return MixedLayerDepthOperand(buoyancy_perturbation, difference_criterion)
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ using ..OceanSeaIceModels.PrescribedAtmospheres:
using ClimaSeaIce: SeaIceModel

using Oceananigans: HydrostaticFreeSurfaceModel, architecture
using Oceananigans.Units: Time
using Oceananigans.Grids: inactive_node, node, topology
using Oceananigans.BoundaryConditions: fill_halo_regions!
using Oceananigans.Fields: ConstantField, interpolate, FractionalIndices
using Oceananigans.Utils: launch!, Time, KernelParameters
using Oceananigans.Utils: launch!, KernelParameters
using Oceananigans.Operators: ℑxᶜᵃᵃ, ℑyᵃᶜᵃ, ℑxᶠᵃᵃ, ℑyᵃᶠᵃ

using KernelAbstractions: @kernel, @index
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Oceananigans.Utils: prettysummary
using Oceananigans.Grids: AbstractGrid
=using Oceananigans.Grids: AbstractGrid, prettysummary

using Adapt
using Printf
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Oceananigans.Fields: interpolator
using Oceananigans.Grids: on_architecture
using Oceananigans.Utils: Time
using Oceananigans.Units: Time
using Base

using ClimaOcean.OceanSeaIceModels:
Expand Down
3 changes: 2 additions & 1 deletion src/OceanSeaIceModels/OceanSeaIceModels.jl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ using SeawaterPolynomials

using Oceananigans
using Oceananigans.Operators
using Oceananigans.Utils: launch!, Time, KernelParameters
using Oceananigans.Utils: launch!, KernelParameters
using Oceananigans.Units: Time
using Oceananigans.Architectures: architecture
using Oceananigans.BoundaryConditions: fill_halo_regions!, BoundaryCondition
using Oceananigans.Grids: architecture
Expand Down
3 changes: 2 additions & 1 deletion src/OceanSeaIceModels/PrescribedAtmospheres.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ using Oceananigans.Fields: Center
using Oceananigans.Grids: grid_name
using Oceananigans.OutputReaders: FieldTimeSeries, update_field_time_series!, extract_field_time_series
using Oceananigans.TimeSteppers: Clock, tick!
using Oceananigans.Utils: prettysummary, Time
using Oceananigans.Grids: prettysummary
using Oceananigans.Units: Time

using Adapt
using Thermodynamics.Parameters: AbstractThermodynamicsParameters
Expand Down
Loading