Skip to content

Commit bf23df7

Browse files
back to previous stuff
1 parent 7792990 commit bf23df7

File tree

16 files changed

+655
-630
lines changed

16 files changed

+655
-630
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@ MPIPreferences = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267"
7676
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
7777

7878
[targets]
79-
test = ["Coverage", "Test", "MPIPreferences", "CUDA_Runtime_jll"]
79+
test = ["Coverage", "Test", "MPIPreferences", "CUDA_Runtime_jll", "Reactant", "PythonCall", "CondaPkg"]

docs/make.jl

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,6 @@ using
44
DocumenterCitations,
55
Literate
66

7-
# temporary to enforce Oceananigans to use a specific branch
8-
using Pkg
9-
Pkg.add(PackageSpec(
10-
name = "Oceananigans",
11-
url = "https://github.com/CliMA/Oceananigans.jl",
12-
rev = "ss/omip-branch-2"
13-
))
14-
Pkg.resolve()
15-
@show Pkg.status()
16-
177
ENV["DATADEPS_ALWAYS_ACCEPT"] = "true"
188

199
bib_filepath = joinpath(dirname(@__FILE__), "climaocean.bib")

docs/src/interface_fluxes.md

Lines changed: 635 additions & 0 deletions
Large diffs are not rendered by default.

examples/one_degree_simulation.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ grid = ImmersedBoundaryGrid(underlying_grid, GridFittedBottom(bottom_height);
5252
# parameterization. We also include some explicit horizontal diffusivity.
5353

5454
eddy_closure = Oceananigans.TurbulenceClosures.IsopycnalSkewSymmetricDiffusivity(κ_skew=2e3, κ_symmetric=2e3)
55-
horizontal_viscosity = HorizontalScalarDiffusivity=4000)
5655
vertical_mixing = ClimaOcean.OceanSimulations.default_ocean_closure()
57-
56+
horizontal_viscosity = HorizontalScalarDiffusivity=4000)
57+
5858
# ### Ocean simulation
5959
# Now we bring everything together to construct the ocean simulation.
6060
# We use a split-explicit timestepping with 70 substeps for the barotropic

experiments/omip_prototype/download_data.jl

Lines changed: 0 additions & 8 deletions
This file was deleted.

experiments/omip_prototype/one_degree_omip.jl

Lines changed: 0 additions & 155 deletions
This file was deleted.

experiments/omip_prototype/sixth_degree_omip.jl

Lines changed: 0 additions & 153 deletions
This file was deleted.

0 commit comments

Comments
 (0)