Skip to content

Commit cedc703

Browse files
committed
don't pass area fraction to clima sea ice
1 parent d258d06 commit cedc703

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

experiments/ClimaEarth/components/ocean/clima_seaice.jl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ previous step is provided to the coupler to be used in computing fluxes.
5353
Specific details about the default model configuration
5454
can be found in the documentation for `ClimaOcean.ocean_simulation`.
5555
"""
56-
function ClimaSeaIceSimulation(land_fraction, ocean; output_dir, start_date = nothing)
56+
function ClimaSeaIceSimulation(ocean; output_dir, start_date = nothing)
5757
# Initialize the sea ice with the same grid as the ocean
5858
grid = ocean.ocean.model.grid
5959
arch = OC.Architectures.architecture(grid)
@@ -119,10 +119,6 @@ function ClimaSeaIceSimulation(land_fraction, ocean; output_dir, start_date = no
119119
FT = CC.Spaces.undertype(boundary_space)
120120
area_fraction = Interfacer.remap(ice.model.ice_concentration, boundary_space)
121121

122-
# Overwrite ice fraction with the static land area fraction anywhere we have nonzero land area
123-
# max needed to avoid Float32 errors (see issue #271; Heisenbug on HPC)
124-
@. area_fraction = max(min(area_fraction, FT(1) - land_fraction), FT(0))
125-
126122
sim = ClimaSeaIceSimulation(
127123
ice,
128124
area_fraction,

experiments/ClimaEarth/setup_run.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,6 @@ function CoupledSimulation(config_dict::AbstractDict)
369369
## sea ice model
370370
if ice_model == "clima_seaice"
371371
ice_sim = ClimaSeaIceSimulation(
372-
ice_fraction,
373372
ocean_sim;
374373
output_dir = dir_paths.ice_output_dir,
375374
start_date,

src/FieldExchanger.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function update_surface_fractions!(cs::Interfacer.CoupledSimulation)
7171

7272
# Apply any additional constraints on the ocean and ice fractions if necessary
7373
if haskey(cs.model_sims, :ice_sim)
74-
resolve_area_fractions!(ocean_sim, cs.model_sims.ice_sim, land_fraction)
74+
FieldExchanger.resolve_area_fractions!(ocean_sim, cs.model_sims.ice_sim, land_fraction)
7575
end
7676
else
7777
cs.fields.scalar_temp1 .= 0

0 commit comments

Comments
 (0)