Fill halos of conformal cubed sphere grid coordinates and metrics in a single pass

src/AbstractOperations/conditional_operations.jl

@@ -1,5 +1,6 @@
 using Oceananigans.Fields: OneField
 using Oceananigans.Grids: architecture
+
 import Oceananigans.Architectures: on_architecture
 import Oceananigans.Fields: condition_operand, conditional_length, set!, compute_at!, indices
 

src/DistributedComputations/distributed_on_architecture.jl

@@ -1,5 +1,6 @@
 using CUDA: CuArray
 using OffsetArrays
+
 import Oceananigans.Architectures: on_architecture
 
 # We do not support switching from distributed and serial through `on_architecture`.

src/Grids/orthogonal_spherical_shell_grid.jl

@@ -774,28 +774,17 @@ conformal_cubed_sphere_panel(FT::DataType; kwargs...) = conformal_cubed_sphere_p
 
 function load_and_offset_cubed_sphere_data(file, FT, arch, field_name, loc, topo, N, H)
 
-    ii = interior_indices(loc[1](), topo[1](), N[1])
-    jj = interior_indices(loc[2](), topo[2](), N[2])
+    data = on_architecture(arch, file[field_name])
+    data = convert.(FT, data)
 
-    interior_data = on_architecture(arch, file[field_name][ii, jj])
-
-    underlying_data = zeros(FT, arch,
-                            total_length(loc[1](), topo[1](), N[1], H[1]),
-                            total_length(loc[2](), topo[2](), N[2], H[2]))
-
-    ip = interior_parent_indices(loc[1](), topo[1](), N[1], H[1])
-    jp = interior_parent_indices(loc[2](), topo[2](), N[2], H[2])
-
-    view(underlying_data, ip, jp) .= interior_data
-
-    return offset_data(underlying_data, loc[1:2], topo[1:2], N[1:2], H[1:2])
+    return offset_data(data, loc[1:2], topo[1:2], N[1:2], H[1:2])
 end
 
 function conformal_cubed_sphere_panel(filepath::AbstractString, architecture = CPU(), FT = Float64;
                                       panel, Nz, z,
-                                      topology = (Bounded, Bounded, Bounded),
+                                      topology = (FullyConnected, FullyConnected, Bounded),
                                         radius = R_Earth,
-                                          halo = (1, 1, 1),
+                                          halo = (4, 4, 4),
                                       rotation = nothing)
 
     TX, TY, TZ = topology
@@ -815,9 +804,12 @@ function conformal_cubed_sphere_panel(filepath::AbstractString, architecture = C
 
     ## Read everything else from the file
 
-    file = jldopen(filepath, "r")["face$panel"]
+    file = jldopen(filepath, "r")["panel$panel"]
 
-    Nξ, Nη = size(file["λᶠᶠᵃ"]) .- 1
+    Nξ, Nη = size(file["λᶠᶠᵃ"])
+    Hξ, Hη = halo[1], halo[2]
+    Nξ -= 2Hξ
+    Nη -= 2Hη
 
     N = (Nξ, Nη, Nz)
     H = halo

src/Models/HydrostaticFreeSurfaceModels/update_hydrostatic_free_surface_model_state.jl

@@ -5,13 +5,12 @@ using Oceananigans: UpdateStateCallsite
 using Oceananigans.Biogeochemistry: update_biogeochemical_state!
 using Oceananigans.TurbulenceClosures: compute_diffusivities!
 using Oceananigans.ImmersedBoundaries: mask_immersed_field!, mask_immersed_field_xy!, inactive_node
+using Oceananigans.Models: update_model_field_time_series!
 using Oceananigans.Models.NonhydrostaticModels: update_hydrostatic_pressure!, p_kernel_parameters
 using Oceananigans.Fields: replace_horizontal_vector_halos!
 
-import Oceananigans.TimeSteppers: update_state!
 import Oceananigans.Models.NonhydrostaticModels: compute_auxiliaries!
-
-using Oceananigans.Models: update_model_field_time_series!
+import Oceananigans.TimeSteppers: update_state!
 
 compute_auxiliary_fields!(auxiliary_fields) = Tuple(compute!(a) for a in auxiliary_fields)
 
@@ -29,7 +28,6 @@ update_state!(model::HydrostaticFreeSurfaceModel, callbacks=[]; compute_tendenci
          update_state!(model, model.grid, callbacks; compute_tendencies)
 
 function update_state!(model::HydrostaticFreeSurfaceModel, grid, callbacks; compute_tendencies = true)
-
     @apply_regionally mask_immersed_model_fields!(model, grid)
 
     # Update possible FieldTimeSeries used in the model

src/MultiRegion/MultiRegion.jl

@@ -81,6 +81,7 @@ include("cubed_sphere_connectivity.jl")
 include("multi_region_grid.jl")
 include("multi_region_cubed_sphere_grid.jl")
 include("cubed_sphere_field.jl")
+include("cubed_sphere_boundary_conditions.jl")
 include("multi_region_field.jl")
 include("multi_region_abstract_operations.jl")
 include("multi_region_boundary_conditions.jl")