CliMA · glwagner · Nov 19, 2024 · Nov 18, 2024 · Nov 18, 2024 · Nov 19, 2024
diff --git a/experiments/one_degree_simulation/one_degree_simulation.jl b/experiments/one_degree_simulation/one_degree_simulation.jl
@@ -10,7 +10,6 @@ using CUDA: @allowscalar, device!
 
 using Oceananigans.Grids: znode
 
-device!(3)
 arch = GPU()
 
 #####
@@ -47,7 +46,7 @@ grid = ImmersedBoundaryGrid(underlying_grid, GridFittedBottom(tampered_bottom_he
 
 gm = Oceananigans.TurbulenceClosures.IsopycnalSkewSymmetricDiffusivity(κ_skew=1000, κ_symmetric=1000)
 catke = ClimaOcean.OceanSimulations.default_ocean_closure()
-viscous_closure = Oceananigans.TurbulenceClosures.HorizontalScalarDiffusivity(ν=10000)
+viscous_closure = Oceananigans.TurbulenceClosures.HorizontalScalarDiffusivity(ν=2000)
 
 closure = (gm, catke, viscous_closure)
 
@@ -74,7 +73,7 @@ forcing = (T=FT, S=FS)
 ##### 
 
 momentum_advection = VectorInvariant()
-tracer_advection   = Centered(order=2)
+tracer_advection   = WENO()
 
 # Should we add a side drag since this is at a coarser resolution?
 ocean = ocean_simulation(grid; momentum_advection, tracer_advection,
@@ -95,10 +94,10 @@ atmosphere = JRA55_prescribed_atmosphere(arch; backend=JRA55NetCDFBackend(20))
 ##### Coupled simulation
 #####
 
-sea_ice = ClimaOcean.OceanSeaIceModels.MinimumTemperatureSeaIce()
-coupled_model = OceanSeaIceModel(ocean, sea_ice; atmosphere, radiation)
+# similarity = SimilarityTheoryTurbulentFluxes(grid; gustiness_parameter = 0.5)
+coupled_model = OceanSeaIceModel(ocean; atmosphere, radiation) #, similarity_theory = similarity)
 
-simulation = Simulation(coupled_model; Δt=15minutes, stop_time=2*365days)
+simulation = Simulation(coupled_model; Δt=1minutes, stop_time=2*365days, stop_iteration=1)
 
 #####
 ##### Run it!

diff --git a/src/DataWrangling/ECCO/ECCO.jl b/src/DataWrangling/ECCO/ECCO.jl
@@ -162,6 +162,8 @@ function ECCO_field(metadata::ECCOMetadata;
             copyto!(parent(field), data)
             return field
         end
+
+        close(file)
     end
 
     download_dataset(metadata)

diff --git a/src/DataWrangling/inpaint_mask.jl b/src/DataWrangling/inpaint_mask.jl
@@ -140,7 +140,7 @@ Arguments
 - `inpainting`: The inpainting algorithm to use. For the moment, the only option is `NearestNeighborInpainting(maxiter)`, 
                 where an average of the valid surrounding values is used `maxiter` times.
 """
-function inpaint_mask!(field, mask; inpainting=NearestNeighborInpainting(10))
+function inpaint_mask!(field, mask; inpainting=NearestNeighborInpainting(Inf))
 
     if inpainting isa Int
         inpainting = NearestNeighborInpainting(inpainting)