Skip to content

Remove salinity from tracers #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove salinity from tracers #54

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d46a7a8
try it out
simone-silvestri Mar 6, 2025
b877143
Merge branch 'main' into ss/separate-salinity
simone-silvestri Mar 7, 2025
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
5 changes: 3 additions & 2 deletions src/sea_ice_model.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using Oceananigans.BoundaryConditions: regularize_field_boundary_conditions
using Oceananigans.Forcings: model_forcing
using ClimaSeaIce.SeaIceThermodynamics.HeatBoundaryConditions: flux_summary

struct SeaIceModel{GR, TD, D, TS, CL, U, T, IT, IC, ID, CT, STF, A, F} <: AbstractModel{TS}
struct SeaIceModel{GR, TD, D, TS, CL, U, T, IT, IC, IS, ID, CT, STF, A, F} <: AbstractModel{TS}
grid :: GR
clock :: CL
forcing :: F
Expand All @@ -16,6 +16,7 @@ struct SeaIceModel{GR, TD, D, TS, CL, U, T, IT, IC, ID, CT, STF, A, F} <: Abstra
tracers :: T
ice_thickness :: IT
ice_concentration :: IC
ice_salinity :: IS
ice_density :: ID
ice_consolidation_thickness :: CT
# Thermodynamics
Expand Down Expand Up @@ -94,7 +95,6 @@ function SeaIceModel(grid;

# TODO: should we have ice thickness and concentration as part of the tracers or
# just additional fields of the sea ice model?
tracers = merge(tracers, (; S = ice_salinity))
timestepper = ForwardEulerTimeStepper(grid, prognostic_fields)

if !isnothing(ice_thermodynamics)
Expand Down Expand Up @@ -122,6 +122,7 @@ function SeaIceModel(grid;
tracers,
ice_thickness,
ice_concentration,
ice_salinity,
ice_density,
ice_consolidation_thickness,
ice_thermodynamics,
Expand Down
Loading