Skip to content

Commit 5eec6fe

Browse files
authored
Add missing import when extending FieldBoundaryConditions in MultiRegion (#4860)
* add missing import when extending FieldBoundaryConditions for MultiRegionGrids * imports alphabetically * move FieldBoundaryConditions(mrg::MultiRegionGrids...)
1 parent ae07f22 commit 5eec6fe

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/MultiRegion/multi_region_field.jl

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1+
using Oceananigans.AbstractOperations: AbstractOperation, compute_computed_field!
12
using Oceananigans.BoundaryConditions: default_auxiliary_bc
23
using Oceananigans.Fields: FunctionField, data_summary, AbstractField, instantiated_location
3-
using Oceananigans.AbstractOperations: AbstractOperation, compute_computed_field!
44
using Oceananigans.Operators: assumed_field_location
55
using Oceananigans.OutputWriters: output_indices
66

77
using Base: @propagate_inbounds
88

9-
import Oceananigans.DistributedComputations: reconstruct_global_field, CommunicationBuffers
109
import Oceananigans.BoundaryConditions: regularize_field_boundary_conditions
11-
import Oceananigans.Grids: xnodes, ynodes
12-
import Oceananigans.Fields: set!, compute!, compute_at!, interior, validate_field_data, validate_boundary_conditions
13-
import Oceananigans.Fields: validate_indices, communication_buffers
1410
import Oceananigans.Diagnostics: hasnan
11+
import Oceananigans.DistributedComputations: reconstruct_global_field, CommunicationBuffers
12+
import Oceananigans.Fields: set!, compute!, compute_at!, interior, communication_buffers,
13+
validate_field_data, validate_boundary_conditions, validate_indices
14+
import Oceananigans.Grids: xnodes, ynodes
1515

1616
import Base: fill!, axes
1717

@@ -193,9 +193,6 @@ function inject_regional_bcs(grid, connectivity, loc, indices;
193193
return FieldBoundaryConditions(indices, west, east, south, north, bottom, top, immersed)
194194
end
195195

196-
FieldBoundaryConditions(mrg::MultiRegionGrids, loc, indices; kwargs...) =
197-
construct_regionally(inject_regional_bcs, mrg, mrg.connectivity, Reference(loc), indices; kwargs...)
198-
199196
function Base.show(io::IO, field::MultiRegionField)
200197
bcs = getregion(field, 1).boundary_conditions
201198

src/MultiRegion/multi_region_grid.jl

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using Oceananigans.Grids: metrics_precomputed, on_architecture, pop_flat_elements, grid_name
22
using Oceananigans.ImmersedBoundaries: GridFittedBottom, PartialCellBottom, GridFittedBoundary
33

4-
import Oceananigans.Grids: architecture, size, new_data, halo_size
5-
import Oceananigans.Grids: with_halo, on_architecture
6-
import Oceananigans.Grids: destantiate
7-
import Oceananigans.Grids: minimum_xspacing, minimum_yspacing, minimum_zspacing
8-
import Oceananigans.Models.HydrostaticFreeSurfaceModels: default_free_surface
4+
import Oceananigans.BoundaryConditions: FieldBoundaryConditions
95
import Oceananigans.DistributedComputations: reconstruct_global_grid
6+
import Oceananigans.Grids: architecture, size, new_data, halo_size,
7+
with_halo, on_architecture, destantiate,
8+
minimum_xspacing, minimum_yspacing, minimum_zspacing
9+
import Oceananigans.Models.HydrostaticFreeSurfaceModels: default_free_surface
1010

1111
struct MultiRegionGrid{FT, TX, TY, TZ, CZ, P, C, G, Arch} <: AbstractUnderlyingGrid{FT, TX, TY, TZ, CZ, Arch}
1212
architecture :: Arch
@@ -60,6 +60,9 @@ minimum_zspacing(grid::MultiRegionGrid, ℓx, ℓy, ℓz) =
6060
default_free_surface(grid::MultiRegionGrid; gravitational_acceleration=Oceananigans.defaults.gravitational_acceleration) =
6161
SplitExplicitFreeSurface(; substeps=50, gravitational_acceleration)
6262

63+
FieldBoundaryConditions(mrg::MultiRegionGrids, loc, indices; kwargs...) =
64+
construct_regionally(inject_regional_bcs, mrg, mrg.connectivity, Reference(loc), indices; kwargs...)
65+
6366
"""
6467
MultiRegionGrid(global_grid; partition = XPartition(2))
6568

0 commit comments

Comments
 (0)