diff --git a/Project.toml b/Project.toml index e905f6d4..9d817fcf 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "ClimaSeaIce" uuid = "6ba0ff68-24e6-4315-936c-2e99227c95a4" -version = "0.3.10" authors = ["Climate Modeling Alliance and contributors"] +version = "0.3.11" [deps] Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" @@ -16,7 +16,7 @@ SeawaterPolynomials = "d496a93d-167e-4197-9f49-d3af4ff8fe40" Adapt = "3, 4" KernelAbstractions = "0.9" JLD2 = "0.6.2" -Oceananigans = "0.100, 0.101, 0.102, 0.103, 0.104" +Oceananigans = "0.101.2, 0.102, 0.103, 0.104" RootSolvers = "0.3, 0.4" Roots = "2" SeawaterPolynomials = "0.3.4" diff --git a/src/sea_ice_model.jl b/src/sea_ice_model.jl index 99564116..8e3efbf0 100644 --- a/src/sea_ice_model.jl +++ b/src/sea_ice_model.jl @@ -136,7 +136,8 @@ function SeaIceModel(grid; end end - forcing = model_forcing(prognostic_fields; forcing...) + model_fields = isnothing(dynamics) ? prognostic_fields : merge(prognostic_fields, fields(dynamics)) + forcing = model_forcing(forcing, model_fields, prognostic_fields) # Package the external fluxes and boundary conditions external_heat_fluxes = (top = top_heat_flux,