Precompute interpolation indices + BarotropicPotentialForcing (#353)

* Some bugfixes

* Clean up OS paper sim

* Integrate barotropic pressure calculation into interpolate_atmosphere_state

* Extract the data

* Bugfix

* Import KernelParameters

* Trigger downloading JRA55

* Updates

* Add Manifest and Project to one deg

* Updates

* Implement exchanger

* Precompute interpolation

* Add architecture to ocean_simulation

* bugfix

* Updates

* Raise Oceananigans compat

* Update to TimeInterpolator

* Fix bug in computation of FractionalIndices plus uncomment interpolation step

* Fix problem in runtests setup?

* Update value test for jra55

* Better way to generate FractionalIndices array

* Relax test tol a bit

* Adapt BarotropicPotentialForcing

* Pretty up ECCO tests

* Increase compat for OrthogonalSphericalShellGrids to 0.2.2

* retry tests

* Add a few files for generating tidal forcing

* Bump version to 0.95.17 with bugfix

* Typo in docstring

* Add allowscalar for FractionalIndices array construction

---------

Co-authored-by: Simone Silvestri <[email protected]>

Author: glwagner

.gitignore

@@ -47,3 +47,11 @@ docs/src/literated/
 *.ncu-rep
 *.sq
 *.sqlite
+
+# NASA NAIF kernel files
+*.bsp
+*.bpc
+*.tf
+*.tls
+*.tpc
+*.txt

Project.toml

@@ -42,9 +42,9 @@ JLD2 = "0.4, 0.5"
 KernelAbstractions = "0.9"
 MPI = "0.20"
 NCDatasets = "0.12, 0.13, 0.14"
-Oceananigans = "0.95.7 - 0.99"
+Oceananigans = "0.95.17 - 0.99"
 OffsetArrays = "1.14"
-OrthogonalSphericalShellGrids = "0.2.1"
+OrthogonalSphericalShellGrids = "0.2.2"
 Scratch = "1"
 SeawaterPolynomials = "0.3.4"
 StaticArrays = "1"

examples/single_column_os_papa_simulation.jl

@@ -97,11 +97,8 @@ lines!(axq, t_days, qa)
 current_figure()
 
 # We continue constructing a simulation.
-# For the fluxes computation we use a `SkinTemperature` formulation that computes
-# the skin temperature from a balance between internal and external heat fluxes.
-
 radiation = Radiation()
-coupled_model = OceanSeaIceModel(ocean; atmosphere, radiation) 
+coupled_model = OceanSeaIceModel(ocean; atmosphere, radiation)
 simulation = Simulation(coupled_model, Δt=ocean.Δt, stop_time=30days)
 
 wall_clock = Ref(time_ns())
@@ -136,20 +133,22 @@ function progress(sim)
     msg *= @sprintf(", e₀: %.2e m² s⁻²", first(interior(e, 1, 1, Nz)))
 
     @info msg
+
+    return nothing
 end
 
 simulation.callbacks[:progress] = Callback(progress, IterationInterval(100))
 
 # Build flux outputs
-τx = coupled_model.interfaces.atmosphere_ocean_interface.fluxes.x_momentum
-τy = coupled_model.interfaces.atmosphere_ocean_interface.fluxes.y_momentum
-JT = coupled_model.interfaces.net_fluxes.ocean_surface.T
-Js = coupled_model.interfaces.net_fluxes.ocean_surface.S
-E  = coupled_model.interfaces.atmosphere_ocean_interface.fluxes.water_vapor
-Qc = coupled_model.interfaces.atmosphere_ocean_interface.fluxes.sensible_heat
-Qv = coupled_model.interfaces.atmosphere_ocean_interface.fluxes.latent_heat
-ρₒ = coupled_model.interfaces.ocean_properties.reference_density
-cₚ = coupled_model.interfaces.ocean_properties.heat_capacity
+τx = simulation.model.interfaces.net_fluxes.ocean_surface.u
+τy = simulation.model.interfaces.net_fluxes.ocean_surface.v
+JT = simulation.model.interfaces.net_fluxes.ocean_surface.T
+Js = simulation.model.interfaces.net_fluxes.ocean_surface.S
+E  = simulation.model.interfaces.atmosphere_ocean_interface.fluxes.water_vapor
+Qc = simulation.model.interfaces.atmosphere_ocean_interface.fluxes.sensible_heat
+Qv = simulation.model.interfaces.atmosphere_ocean_interface.fluxes.latent_heat
+ρₒ = simulation.model.interfaces.ocean_properties.reference_density
+cₚ = simulation.model.interfaces.ocean_properties.heat_capacity
 
 Q = ρₒ * cₚ * JT
 ρτx = ρₒ * τx