go for it

Author: simone-silvestri

src/InitialConditions/InitialConditions.jl

@@ -18,7 +18,7 @@ using JLD2
 # Implementation of 3-dimensional regridding
 # TODO: move all the following to Oceananigans!
 
-using Oceananigans.Fields: regrid!, interpolate!
+using Oceananigans.Fields: interpolate!
 using Oceananigans.Grids: cpu_face_constructor_x,
                           cpu_face_constructor_y,
                           cpu_face_constructor_z,
@@ -31,44 +31,6 @@ construct_grid(::Type{<:RectilinearGrid}, arch, size, extent, topology) =
 construct_grid(::Type{<:LatitudeLongitudeGrid}, arch, size, extent, topology) =
     LatitudeLongitudeGrid(arch; size, longitude = extent[1], latitude = extent[2], z = extent[3], topology)
 
-# Regrid a field in three dimensions
-function three_dimensional_regrid!(a, b)
-    target_grid = a.grid isa ImmersedBoundaryGrid ? a.grid.underlying_grid : a.grid
-    source_grid = b.grid isa ImmersedBoundaryGrid ? b.grid.underlying_grid : b.grid
-
-    topo = topology(target_grid)
-    arch = architecture(target_grid)
-    arch = child_architecture(arch)
-
-    target_y = yt = cpu_face_constructor_y(target_grid)
-    target_z = zt = cpu_face_constructor_z(target_grid)
-
-    target_size = Nt = size(target_grid)
-
-    source_x = xs = cpu_face_constructor_x(source_grid)
-    source_y = ys = cpu_face_constructor_y(source_grid)
-
-    source_size = Ns = size(source_grid)
-
-    # Start by regridding in z
-    @debug "Regridding in z"
-    zgrid   = construct_grid(typeof(target_grid), arch, (Ns[1], Ns[2], Nt[3]), (xs, ys, zt), topo)
-    field_z = Field(location(b), zgrid)
-    regrid!(field_z, zgrid, source_grid, b)
-
-    # regrid in y
-    @debug "Regridding in y"
-    ygrid   = construct_grid(typeof(target_grid), arch, (Ns[1], Nt[2], Nt[3]), (xs, yt, zt), topo)
-    field_y = Field(location(b), ygrid);
-    regrid!(field_y, ygrid, zgrid, field_z);
-
-    # Finally regrid in x
-    @debug "Regridding in x"
-    regrid!(a, target_grid, ygrid, field_y)
-
-    return a
-end
-
 include("diffuse_tracers.jl")
 
 end # module

src/SeaIceSimulations.jl

@@ -63,12 +63,6 @@ function sea_ice_simulation(grid, ocean=nothing;
     bottom_heat_flux = Field{Center, Center, Nothing}(grid)
     top_heat_flux    = Field{Center, Center, Nothing}(grid)
 
-    immersed_u_bc = FluxBoundaryCondition(u_immersed_bottom_drag, discrete_form=true, parameters=1e-1)
-    immersed_v_bc = FluxBoundaryCondition(v_immersed_bottom_drag, discrete_form=true, parameters=1e-1)
-    
-    u_bcs = FieldBoundaryConditions(grid, (Face, Center, Nothing); immersed = immersed_u_bc)
-    v_bcs = FieldBoundaryConditions(grid, (Center, Face, Nothing); immersed = immersed_v_bc)
-
     # Build the sea ice model
     sea_ice_model = SeaIceModel(grid;
                                 ice_salinity,