Skip to content
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.

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

Run Examples on GPU for Documentation #104

Merged
merged 781 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
781 commits
Select commit Hold shift + click to select a range
027a74b
add single column to docs
simone-silvestri Jun 11, 2024
4c0c30a
changed filename
simone-silvestri Jun 11, 2024
597757c
this should work, now start with documenting
simone-silvestri Jun 11, 2024
8599005
Merge branch 'main' into ss/omip-simulation
simone-silvestri Jun 11, 2024
7d5f10f
updating Oceananigans
simone-silvestri Jun 11, 2024
15acee3
small bugfix
simone-silvestri Jun 11, 2024
437d6e9
new compact
simone-silvestri Jun 11, 2024
f5eeff9
bugfix
simone-silvestri Jun 11, 2024
029b3b4
might be right now
simone-silvestri Jun 11, 2024
09f298d
start without near global omip
simone-silvestri Jun 11, 2024
c3498f4
fix ecco test
simone-silvestri Jun 12, 2024
470c65e
another bugfix
simone-silvestri Jun 12, 2024
7f74a6a
Update src/OceanSeaIceModels/CrossRealmFluxes/roughness_lengths.jl
simone-silvestri Jun 13, 2024
bd710fc
Update src/OceanSeaIceModels/CrossRealmFluxes/tabulated_albedo.jl
simone-silvestri Jun 13, 2024
881b5b0
Update src/OceanSeaIceModels/CrossRealmFluxes/tabulated_albedo.jl
simone-silvestri Jun 13, 2024
21a3e2c
correct typo
simone-silvestri Jun 13, 2024
3f7149a
Update src/OceanSeaIceModels/ocean_only_model.jl
simone-silvestri Jun 13, 2024
03533f4
TemperatureDependentAirViscosity and ReynoldsScalingFunction
simone-silvestri Jun 13, 2024
454f85b
Merge branch 'ss/omip-simulation' of github.com:CliMA/ClimaOcean.jl i…
simone-silvestri Jun 13, 2024
5ac8c83
update ScalarRoughnessLength
simone-silvestri Jun 13, 2024
28eb46c
correct FT in albedo
simone-silvestri Jun 13, 2024
a1f3669
bugfix
simone-silvestri Jun 13, 2024
1202a84
bugfix
simone-silvestri Jun 13, 2024
3d6bb8f
FT for tabulated albedo
simone-silvestri Jun 13, 2024
03f35ce
using zstar
simone-silvestri Jun 14, 2024
74190cb
small bugfix
simone-silvestri Jun 16, 2024
c9824ab
Merge branch 'ss/omip-with-restoring' of github.com:CliMA/ClimaOcean.…
simone-silvestri Jun 16, 2024
8859c50
bugfix
simone-silvestri Jun 16, 2024
2625a04
another try
simone-silvestri Jun 16, 2024
688eb57
better default for ECCOMetadata
simone-silvestri Jun 16, 2024
4e96e69
some initial comments
simone-silvestri Jun 17, 2024
d3138c3
exposing al parameters
simone-silvestri Jun 17, 2024
a187d81
better stability functions
simone-silvestri Jun 17, 2024
366d564
bugfixes
simone-silvestri Jun 17, 2024
d2f5e82
bugfixxed
simone-silvestri Jun 17, 2024
988f8f2
some refactoring + adding flux examples
simone-silvestri Jun 18, 2024
4a0164f
some grammar improvements
simone-silvestri Jun 18, 2024
0c35023
bugfix in docs
simone-silvestri Jun 18, 2024
6a43a52
Merge remote-tracking branch 'origin/ss/omip-simulation' into ss/omip…
simone-silvestri Jun 18, 2024
6a53bf5
remove useless file
simone-silvestri Jun 18, 2024
50fe313
bugfix
simone-silvestri Jun 18, 2024
5862a0a
functions for time quantities
simone-silvestri Jun 18, 2024
ebf14fe
bottom drag coefficient
simone-silvestri Jun 18, 2024
103b504
back to reference height
simone-silvestri Jun 18, 2024
7d4eb0e
some improvements
simone-silvestri Jun 18, 2024
8c165b9
bugfix
simone-silvestri Jun 18, 2024
34b6265
revert to chloride
simone-silvestri Jun 18, 2024
c5babb7
changed pipeline
simone-silvestri Jun 18, 2024
215b692
use github documenter for the moment
simone-silvestri Jun 18, 2024
a1ce58b
bugfix
simone-silvestri Jun 18, 2024
31add81
change measurement to reference
simone-silvestri Jun 18, 2024
df0456e
conversion depending on k
simone-silvestri Jun 18, 2024
beaeacf
change to the
simone-silvestri Jun 18, 2024
f235888
change name
simone-silvestri Jun 18, 2024
f3487d9
bugfix
simone-silvestri Jun 18, 2024
c695266
namechange
simone-silvestri Jun 18, 2024
8473926
add surface flux tests
simone-silvestri Jun 19, 2024
2a6b1a4
change name to "gusty" velocity difference
simone-silvestri Jun 19, 2024
36a3e17
typo
simone-silvestri Jun 19, 2024
29993f6
bugfix
simone-silvestri Jun 19, 2024
24a551c
correctly include runoff in forcing
simone-silvestri Jun 19, 2024
f1099d9
bugfix
simone-silvestri Jun 19, 2024
a0682f0
speed up generate fluxes
simone-silvestri Jun 19, 2024
4f1f75e
Merge remote-tracking branch 'origin/ss/omip-simulation' into ss/omip…
simone-silvestri Jun 19, 2024
fc53863
error in project
simone-silvestri Jun 19, 2024
26b8dee
ok found the issue!
simone-silvestri Jun 19, 2024
8de82f2
Merge branch 'ss/omip-with-restoring' of github.com:CliMA/ClimaOcean.…
simone-silvestri Jun 19, 2024
e1f386d
correct the functions
simone-silvestri Jun 19, 2024
0309ddd
change to z_data
simone-silvestri Jun 20, 2024
2378460
improve example
simone-silvestri Jun 20, 2024
f9ba0ca
closure
simone-silvestri Jun 20, 2024
bf8e2e8
Merge remote-tracking branch 'origin/main' into ss/omip-with-restoring
simone-silvestri Jun 20, 2024
05e4c0e
extrinsic-intrinsic
simone-silvestri Jun 20, 2024
7fed375
remove interpolate
simone-silvestri Jun 20, 2024
88bd8fd
z_data instead of h_data
simone-silvestri Jun 20, 2024
4f459e0
add warning for longitude range
simone-silvestri Jun 20, 2024
662552c
small change
simone-silvestri Jun 20, 2024
2914348
Merge branch 'ss/some-fixes' into ss/omip-with-restoring
simone-silvestri Jun 20, 2024
baa271b
change the CFL
simone-silvestri Jun 20, 2024
2b82a95
comments
simone-silvestri Jun 20, 2024
aa25de7
remove zstar prototype
simone-silvestri Jun 20, 2024
d4a2715
bugfix
simone-silvestri Jun 20, 2024
9aa92e6
Merge branch 'main' into ss/omip-with-restoring
simone-silvestri Jun 21, 2024
4268b5d
small bugfix
simone-silvestri Jun 21, 2024
731ad73
Merge branch 'ss/omip-with-restoring' of github.com:CliMA/ClimaOcean.…
simone-silvestri Jun 21, 2024
5c98a49
Merge remote-tracking branch 'origin/main' into ss/omip-with-restoring
simone-silvestri Jun 21, 2024
3cfcf5a
bugfix
simone-silvestri Jun 23, 2024
122dfd3
allow precompilation
simone-silvestri Jun 23, 2024
559ab98
small bugfix
simone-silvestri Jun 23, 2024
5582b14
change default to ecco2daily
simone-silvestri Jun 23, 2024
6559e96
correct JRA55
simone-silvestri Jun 23, 2024
66afab0
remove one division
simone-silvestri Jun 24, 2024
4bced96
some optimizations
simone-silvestri Jun 24, 2024
e015701
let's see if this speeds up the computation
simone-silvestri Jun 25, 2024
bf340cc
updating catke to new syntax
simone-silvestri Jun 25, 2024
00a9ecc
also new manifest
simone-silvestri Jun 25, 2024
d5279a1
add on_architecture
simone-silvestri Jun 25, 2024
f2eca7f
the conversion is done _inside_ fts
simone-silvestri Jun 25, 2024
1f2582e
another try
simone-silvestri Jun 25, 2024
8dc34cc
small verification
simone-silvestri Jun 25, 2024
d5e0797
fix a typo
simone-silvestri Jun 25, 2024
e91d270
typo
simone-silvestri Jun 25, 2024
8198689
last try
simone-silvestri Jun 25, 2024
8c5ce3f
another bugfix
simone-silvestri Jun 25, 2024
2bb12b4
another bugfix
simone-silvestri Jun 26, 2024
4089fdc
fix back
simone-silvestri Jun 26, 2024
2e2ea63
back to square one. Still very slow
simone-silvestri Jun 26, 2024
3add473
switching to an array
simone-silvestri Jun 26, 2024
dfe9ba6
some changes to the docstring
simone-silvestri Jun 26, 2024
c6a726d
bug with reciprocal of rho
simone-silvestri Jun 26, 2024
7fc9554
more fixes
simone-silvestri Jun 26, 2024
aa17c4e
switch reference frames
simone-silvestri Jun 26, 2024
1a460b2
try fixing tests with secret tokens
simone-silvestri Jun 26, 2024
65327db
take ecco 4 monthly
simone-silvestri Jun 26, 2024
35a086c
maybe here it will work?
simone-silvestri Jun 26, 2024
e8b3396
userame and password in docs
simone-silvestri Jun 28, 2024
d899b48
Merge remote-tracking branch 'origin/main' into ss/omip-with-restoring
simone-silvestri Jul 3, 2024
738aac0
ecco secrets in ci
simone-silvestri Jul 3, 2024
e5aee9f
Merge branch 'main' into ss/omip-with-restoring
simone-silvestri Jul 3, 2024
ac42848
remove all ECCO2 from examples
simone-silvestri Jul 3, 2024
ec0445d
Merge branch 'ss/omip-with-restoring' of github.com:CliMA/ClimaOcean.…
simone-silvestri Jul 3, 2024
a297bf9
more verbose error
simone-silvestri Jul 3, 2024
d691f3b
test new buildkite env variables
simone-silvestri Jul 3, 2024
da0aeab
fix tests
simone-silvestri Jul 3, 2024
98881ff
fix tests
simone-silvestri Jul 4, 2024
ecdad34
fix tests
simone-silvestri Jul 4, 2024
0392145
some fixes
simone-silvestri Jul 5, 2024
9caf8af
Merge branch 'main' into ss/omip-with-restoring
simone-silvestri Jul 6, 2024
0796fab
the simulation that is running
simone-silvestri Jul 8, 2024
aacd2e1
Merge branch 'ss/omip-with-restoring' of github.com:CliMA/ClimaOcean.…
simone-silvestri Jul 8, 2024
699958a
Merge branch 'main' into ss/omip-with-restoring
simone-silvestri Jul 22, 2024
e84613b
name changes
simone-silvestri Jul 23, 2024
0d601f4
some changes to the simulation
simone-silvestri Jul 23, 2024
fb99d65
try it out
simone-silvestri Jul 23, 2024
7dec068
test documentation on GPU
simone-silvestri Jul 24, 2024
d4d9c2f
correct docs key
simone-silvestri Jul 24, 2024
b09c835
timeout the docs after 24 hours instead of the default 2
simone-silvestri Jul 24, 2024
3413721
med example on the GPU
simone-silvestri Jul 24, 2024
841e487
update Oceananigans
simone-silvestri Jul 24, 2024
13cc2f8
namechange to pipeline
simone-silvestri Jul 24, 2024
ddbe363
rename the examples build
simone-silvestri Jul 24, 2024
5ef6fa7
remove size threshold
simone-silvestri Jul 24, 2024
68bc957
GLMakie -> CairoMakie
simone-silvestri Jul 24, 2024
03c9038
add GPUs
simone-silvestri Jul 24, 2024
97c6661
yet another bugfix
simone-silvestri Jul 25, 2024
6406bbc
yet another bugfix
simone-silvestri Jul 25, 2024
2a9d613
test on Oceananigans#main
simone-silvestri Jul 25, 2024
00b5571
test on Oceananigans#main
simone-silvestri Jul 25, 2024
a8da3c7
instantiate first
simone-silvestri Jul 25, 2024
f1d6dc9
Oceananigans#main
simone-silvestri Jul 25, 2024
2e7d15b
smooth out a couple of bugs
simone-silvestri Jul 25, 2024
7e4028f
Merge remote-tracking branch 'origin/main' into ss/documentation-on-c…
simone-silvestri Jul 25, 2024
565f4b3
remove Oceananigans from docs Project.toml
simone-silvestri Jul 25, 2024
051e590
fix gpu problem
simone-silvestri Jul 25, 2024
f2a741d
try only the near global at the moment
simone-silvestri Jul 25, 2024
57c2ca9
remove reaive humidity
simone-silvestri Jul 25, 2024
af4649a
remove reative humidity cause not used
simone-silvestri Jul 25, 2024
74d48c0
bugfix
simone-silvestri Jul 26, 2024
91dcf9d
just check the near global configuration
simone-silvestri Jul 26, 2024
d69ae9a
try with everything together
simone-silvestri Jul 26, 2024
48269d6
typo
simone-silvestri Jul 26, 2024
edce55f
try without the giba simulation
simone-silvestri Jul 29, 2024
908066b
simple cpu example
simone-silvestri Jul 29, 2024
f2f9d6b
adding a slurm time
simone-silvestri Jul 30, 2024
d375f0b
try with SSL_no_verify
simone-silvestri Jul 30, 2024
7a7d0a3
try with wget
simone-silvestri Jul 30, 2024
ef8ca0a
typo
simone-silvestri Jul 30, 2024
a12ceee
full fledged model on GPU
simone-silvestri Jul 31, 2024
6d6b0cc
Update .buildkite/examples_build.yml
simone-silvestri Jul 31, 2024
40f75d3
add literate debug
simone-silvestri Jul 31, 2024
3e9bdfc
back to previous project / manifest
simone-silvestri Jul 31, 2024
836b94f
Merge branch 'ss/documentation-on-caltech' of github.com:CliMA/ClimaO…
simone-silvestri Jul 31, 2024
c88ea50
add visualization
simone-silvestri Jul 31, 2024
23ddab5
check if it deploys
simone-silvestri Jul 31, 2024
1f18b8e
test the deploy keys
simone-silvestri Aug 1, 2024
b15e3ac
test reading the ssh key
simone-silvestri Aug 1, 2024
ec7e027
Merge branch 'ss/documentation-on-caltech' of github.com:CliMA/ClimaO…
simone-silvestri Aug 1, 2024
4f5550e
typo
simone-silvestri Aug 1, 2024
e81ef73
the docs deploy?
simone-silvestri Aug 1, 2024
6008b79
check deployment again
simone-silvestri Aug 1, 2024
87a1ad4
test docs deployment
simone-silvestri Aug 1, 2024
447666e
remove `winthenv`
simone-silvestri Aug 1, 2024
3b92297
near global simulation in docs
simone-silvestri Aug 1, 2024
b7c1713
better comments
simone-silvestri Aug 1, 2024
e3c4908
another test
simone-silvestri Aug 1, 2024
297bacd
try new keys
simone-silvestri Aug 2, 2024
2a6d7a9
progress it stuck on single_column_grid
simone-silvestri Aug 2, 2024
8013eef
test only with snapshot
simone-silvestri Aug 2, 2024
5df3f22
gif -> mp4
navidcy Aug 3, 2024
cf46b69
remove also "inspect_ecco_data.jl"
simone-silvestri Aug 3, 2024
91e0139
try with a video?
simone-silvestri Aug 3, 2024
4a007d9
print every 500 iterations
simone-silvestri Aug 3, 2024
70f7c5e
max abs
simone-silvestri Aug 3, 2024
7463008
some changes to simulation details
simone-silvestri Aug 3, 2024
665e88d
smaller titles
simone-silvestri Aug 3, 2024
dc00749
lift correct variables
simone-silvestri Aug 3, 2024
b8a4d0b
reduce frames by a factor of two
simone-silvestri Aug 3, 2024
45f1f91
Merge branch 'main' into ss/documentation-on-caltech
simone-silvestri Aug 3, 2024
5f622a4
bugfix
simone-silvestri Aug 3, 2024
52bb4df
Merge branch 'ss/documentation-on-caltech' of github.com:CliMA/ClimaO…
simone-silvestri Aug 3, 2024
7f2936f
another bugfix
simone-silvestri Aug 3, 2024
51ca046
adding generate bathymetry
simone-silvestri Aug 3, 2024
91f3c5d
some bugfixes
simone-silvestri Aug 3, 2024
6fcd1ce
better colormaps
simone-silvestri Aug 3, 2024
9be7044
more massaging
simone-silvestri Aug 3, 2024
b0e95ac
try the full global ocean
simone-silvestri Aug 3, 2024
a6f80f5
global ocean simulation
simone-silvestri Aug 3, 2024
baaa569
Parameter space problem
simone-silvestri Aug 3, 2024
b89e12f
unfortunately we cannot use active cells map
simone-silvestri Aug 3, 2024
638eb78
few tweaks
navidcy Aug 3, 2024
34a1cfd
code cleanup
navidcy Aug 3, 2024
365472b
code cleanup
navidcy Aug 3, 2024
6f3982c
code cleanup
navidcy Aug 3, 2024
c818e52
clearer explanation
navidcy Aug 3, 2024
c61f648
clearer explanation
navidcy Aug 3, 2024
e2cae09
try the global ocean
simone-silvestri Aug 4, 2024
ea6453f
Merge branch 'ss/documentation-on-caltech' of github.com:CliMA/ClimaO…
simone-silvestri Aug 4, 2024
eead6e5
better visualizations
simone-silvestri Aug 4, 2024
1691ffc
try again
simone-silvestri Aug 4, 2024
34fc86b
Merge branch 'main' into ss/documentation-on-caltech
simone-silvestri Aug 4, 2024
20468f8
fix bug
navidcy Aug 5, 2024
32d25db
change figure size
simone-silvestri Aug 5, 2024
826208d
Merge branch 'ss/documentation-on-caltech' of github.com:CliMA/ClimaO…
simone-silvestri Aug 5, 2024
e76f053
one movie per quantity
simone-silvestri Aug 5, 2024
85c6872
Merge branch 'main' into ss/documentation-on-caltech
simone-silvestri Aug 5, 2024
0cc5af0
bugfix
simone-silvestri Aug 5, 2024
eedc8b7
fix typo
simone-silvestri Aug 5, 2024
21386db
some more bugfixes
simone-silvestri Aug 5, 2024
ec6ddd2
Merge remote-tracking branch 'origin/ss/bugfix' into ss/documentation…
simone-silvestri Aug 5, 2024
e72d56c
first small change
simone-silvestri Aug 6, 2024
2cfa937
lakes -> connected regions
navidcy Aug 6, 2024
832803f
warm up -> spin up
navidcy Aug 6, 2024
906341e
add colorbars
navidcy Aug 6, 2024
d7afd8a
code alignment
navidcy Aug 6, 2024
2696891
bugfix
simone-silvestri Aug 7, 2024
1ed5af1
Merge branch 'ss/documentation-on-caltech' of github.com:CliMA/ClimaO…
simone-silvestri Aug 7, 2024
62cde16
Merge branch 'main' into ss/documentation-on-caltech
simone-silvestri Aug 7, 2024
be69b32
Merge branch 'main' into ss/documentation-on-caltech
simone-silvestri Aug 8, 2024
1418c46
some formatting changes
simone-silvestri Aug 9, 2024
7672837
Merge branch 'ss/documentation-on-caltech' of github.com:CliMA/ClimaO…
simone-silvestri Aug 9, 2024
3613f05
bugfix
simone-silvestri Aug 10, 2024
92f2d9a
typo
simone-silvestri Aug 10, 2024
7938345
bugfix
simone-silvestri Aug 10, 2024
a2a37fd
back to how it was
simone-silvestri Aug 10, 2024
86e8517
fix precompilation issue
simone-silvestri Aug 13, 2024
ca6ce9b
Merge branch 'ss/documentation-on-caltech' of github.com:CliMA/ClimaO…
simone-silvestri Aug 13, 2024
29defef
Update examples/near_global_ocean_simulation.jl
simone-silvestri Aug 13, 2024
7056623
fix examples then merge
simone-silvestri Aug 13, 2024
0c0ce6c
different unit of measure
simone-silvestri Aug 13, 2024
a8f0a01
Merge branch 'main' into ss/documentation-on-caltech
simone-silvestri Aug 13, 2024
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
57 changes: 57 additions & 0 deletions .buildkite/examples_build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
agents:
queue: new-central
slurm_mem: 8G
modules: climacommon/2024_05_27
slurm_time: 48:00:00

timeout_in_minutes: 1440

env:
JULIA_LOAD_PATH: "${JULIA_LOAD_PATH}:${BUILDKITE_BUILD_CHECKOUT_PATH}/.buildkite"
OPENBLAS_NUM_THREADS: 1
OMPI_MCA_opal_warn_on_missing_libcuda: 0

steps:
- label: "initialize"
key: "init"
command:
- "echo '--- Instantiate project'"
- "julia --project -e 'using Pkg; Pkg.instantiate(; verbose=true); Pkg.precompile(; strict=true)'"
# force the initialization of the CUDA runtime as it is lazily loaded by default
- "julia --project -e 'using CUDA; CUDA.precompile_runtime()'"

agents:
slurm_mem: 120G
slurm_gpus: 1
slurm_cpus_per_task: 8
env:
JULIA_NUM_PRECOMPILE_TASKS: 8

- wait

- label: "Run documentation"
key: "build_documentation"
commands:
- "julia --color=yes --project=docs/ -e 'using Pkg; Pkg.instantiate(); Pkg.develop(PackageSpec(path=pwd()))'"
- "julia --color=yes --project=docs/ docs/make.jl"

agents:
slurm_mem: 120G
slurm_gpus: 1
slurm_cpus_per_task: 8
slurm_ntasks: 1
slurm_gpus_per_task: 1
slurm_time: 48:00:00

env:
JULIA_NUM_PRECOMPILE_TASKS: 8
JULIA_DEBUG: "Documenter"
# This environment variable is needed to avoid SSL verification errors when Downloads.jl
# tries to download the bathymetry data. It should not be required so we need to fix our certificates.
# and remove this environment variable. ref: https://github.com/JuliaLang/Downloads.jl/issues/97
JULIA_SSL_NO_VERIFY: "**"

timeout_in_minutes: 1440

- wait: ~
continue_on_failure: true
1 change: 1 addition & 0 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ steps:

agents:
slurm_mem: 32G
slurm_gpus: 1
slurm_cpus_per_task: 8
slurm_gpus: 1
slurm_ntasks: 1
Expand Down
4 changes: 3 additions & 1 deletion Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,9 @@ version = "1.2.0"

[[deps.Oceananigans]]
deps = ["Adapt", "CUDA", "Crayons", "CubedSphere", "Dates", "Distances", "DocStringExtensions", "FFTW", "Glob", "IncompleteLU", "InteractiveUtils", "IterativeSolvers", "JLD2", "KernelAbstractions", "LinearAlgebra", "Logging", "MPI", "NCDatasets", "OffsetArrays", "OrderedCollections", "PencilArrays", "PencilFFTs", "Pkg", "Printf", "Random", "Rotations", "SeawaterPolynomials", "SparseArrays", "Statistics", "StructArrays"]
git-tree-sha1 = "942c78ad3c95e47bcbab3eeacb0b8a846bcfb33b"
git-tree-sha1 = "937a5ba25152cbcd0b74e66d21ce931a620a6cc4"
repo-rev = "main"
repo-url = "https://github.com/CliMA/Oceananigans.jl.git"
uuid = "9e8cae18-63c1-5223-a75c-80ca9d6e9a09"
version = "0.91.4"

Expand Down
3 changes: 1 addition & 2 deletions docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
DataDeps = "124859b0-ceae-595e-8997-d05f6a7a8dfe"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
Oceananigans = "9e8cae18-63c1-5223-a75c-80ca9d6e9a09"
OrthogonalSphericalShellGrids = "c2be9673-fb75-4747-82dc-aa2bb9f4aed0"

[compat]
CairoMakie = "0.10.12"
DataDeps = "0.7"
Documenter = "1"
Oceananigans = "0.91.4"
39 changes: 22 additions & 17 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,30 @@ const EXAMPLES_DIR = joinpath(@__DIR__, "..", "examples")
const OUTPUT_DIR = joinpath(@__DIR__, "src/literated")

to_be_literated = [
"inspect_ecco_data.jl",
# "inspect_ecco_data.jl",
"generate_bathymetry.jl",
"generate_surface_fluxes.jl",
"single_column_simulation.jl",
# "near_global_omip_simulation.jl"
# "single_column_simulation.jl",
# "mediterranean_simulation_with_ecco_restoring.jl",
"near_global_ocean_simulation.jl"
]

for file in to_be_literated
filepath = joinpath(EXAMPLES_DIR, file)
Literate.markdown(filepath, OUTPUT_DIR; flavor = Literate.DocumenterFlavor())
withenv("JULIA_DEBUG" => "Literate") do
Literate.markdown(filepath, OUTPUT_DIR; flavor = Literate.DocumenterFlavor(), execute = true)
end
end

#####
##### Build and deploy docs
#####

format = Documenter.HTML(
collapselevel = 2,
size_threshold = nothing,
prettyurls = get(ENV, "CI", nothing) == "true",
canonical = "https://clima.github.io/ClimaOceanDocumentation/dev/",
collapselevel = 2,
size_threshold = nothing,
prettyurls = get(ENV, "CI", nothing) == "true",
canonical = "https://clima.github.io/ClimaOceanDocumentation/dev/",
)

pages = [
Expand All @@ -48,9 +52,12 @@ pages = [
],

"Examples" => [
"Inspect ECCO2 data" => "literated/inspect_ecco_data.md",
# "Inspect ECCO2 data" => "literated/inspect_ecco_data.md",
"Generate bathymetry" => "literated/generate_bathymetry.md",
"Surface fluxes" => "literated/generate_surface_fluxes.md",
"Single column simulation" => "literated/single_column_simulation.md",
# "Single column simulation" => "literated/single_column_simulation.md",
# "Mediterranean simulation with ECCO restoring" => "literated/mediterranean_simulation_with_ecco_restoring.md",
"Near-global Ocean simulation" => "literated/near_global_ocean_simulation.md",
]
]

Expand Down Expand Up @@ -86,10 +93,8 @@ for file in files
rm(file)
end

withenv("GITHUB_REPOSITORY" => "CliMA/ClimaOceanDocumentation") do
deploydocs( repo = "github.com/CliMA/ClimaOceanDocumentation.git",
versions = ["stable" => "v^", "v#.#.#", "dev" => "dev"],
forcepush = true,
devbranch = "main",
push_preview = true)
end
deploydocs(repo = "github.com/CliMA/ClimaOceanDocumentation.git",
versions = ["stable" => "v^", "v#.#.#", "dev" => "dev"],
forcepush = true,
devbranch = "main",
push_preview = true)
189 changes: 0 additions & 189 deletions examples/freely_decaying_mediterranean.jl

This file was deleted.

Loading
Loading