Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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 @@ -49,7 +49,7 @@ ClimaOceanSpeedyWeatherExt = ["SpeedyWeather", "XESMF"]
Adapt = "4"
CFTime = "0.1, 0.2"
CUDA = "4, 5, 6"
ClimaSeaIce = "0.4.2"
ClimaSeaIce = "0.4.8"
CopernicusClimateDataStore = "0.1"
CopernicusMarine = "0.1.1"
CubicSplines = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion src/OceanSeaIceModels/ocean_sea_ice_model.jl
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ function OceanSeaIceModel(ocean, sea_ice=default_sea_ice();
above_freezing_ocean_temperature!(ocean, interfaces.exchanger.grid, sea_ice)


initialize!(ocean_sea_ice_model.interfaces.exchanger)
initialize!(ocean_sea_ice_model)
update_state!(ocean_sea_ice_model)

return ocean_sea_ice_model
Expand Down
18 changes: 9 additions & 9 deletions src/SeaIces/sea_ice_simulation.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using ClimaSeaIce
using ClimaSeaIce: SeaIceModel, SlabSeaIceThermodynamics, PhaseTransitions, ConductiveFlux
using ClimaSeaIce: SeaIceModel, SlabThermodynamics, PhaseTransitions, ConductiveFlux
using ClimaSeaIce.SeaIceThermodynamics: IceWaterThermalEquilibrium
using ClimaSeaIce.SeaIceDynamics: SplitExplicitSolver, SemiImplicitStress, SeaIceMomentumEquation, StressBalanceFreeDrift
using ClimaSeaIce.Rheologies: IceStrength, ElastoViscoPlasticRheology
Expand All @@ -23,7 +23,7 @@ function sea_ice_simulation(grid, ocean=nothing;
dynamics = sea_ice_dynamics(grid, ocean),
bottom_heat_boundary_condition = nothing,
top_heat_boundary_condition = nothing,
phase_transitions = PhaseTransitions(; ice_heat_capacity, ice_density),
phase_transitions = PhaseTransitions(; heat_capacity=ice_heat_capacity, density=ice_density),
conductivity = 2, # kg m s⁻³ K⁻¹
internal_heat_flux = ConductiveFlux(; conductivity))

Expand All @@ -46,11 +46,11 @@ function sea_ice_simulation(grid, ocean=nothing;
bottom_heat_boundary_condition = IceWaterThermalEquilibrium(surface_ocean_salinity)
end

ice_thermodynamics = SlabSeaIceThermodynamics(grid;
internal_heat_flux,
phase_transitions,
top_heat_boundary_condition,
bottom_heat_boundary_condition)
ice_thermodynamics = SlabThermodynamics(grid;
internal_heat_flux,
phase_transitions,
top_heat_boundary_condition,
bottom_heat_boundary_condition)

bottom_heat_flux = Field{Center, Center, Nothing}(grid)
top_heat_flux = Field{Center, Center, Nothing}(grid)
Expand Down Expand Up @@ -109,8 +109,8 @@ end
sea_ice_thickness(sea_ice::Simulation{<:SeaIceModel}) = sea_ice.model.ice_thickness
sea_ice_concentration(sea_ice::Simulation{<:SeaIceModel}) = sea_ice.model.ice_concentration

heat_capacity(sea_ice::Simulation{<:SeaIceModel}) = sea_ice.model.ice_thermodynamics.phase_transitions.ice_heat_capacity
reference_density(sea_ice::Simulation{<:SeaIceModel}) = sea_ice.model.ice_thermodynamics.phase_transitions.ice_density
heat_capacity(sea_ice::Simulation{<:SeaIceModel}) = sea_ice.model.ice_thermodynamics.phase_transitions.heat_capacity
reference_density(sea_ice::Simulation{<:SeaIceModel}) = sea_ice.model.ice_thermodynamics.phase_transitions.density

function net_fluxes(sea_ice::Simulation{<:SeaIceModel})
net_momentum_fluxes = if isnothing(sea_ice.model.dynamics)
Expand Down
Loading