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

ECCO Restoring for OMIP simulations #89

Merged
merged 676 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
676 commits
Select commit Hold shift + click to select a range
d15097f
some changes
simone-silvestri May 2, 2024
f5fa977
first commit
simone-silvestri May 2, 2024
c80c206
some restructuring
simone-silvestri May 5, 2024
c9d0165
some fixes
simone-silvestri May 5, 2024
6c5957c
check what happens with atmospheric velocity instead of du, dv
simone-silvestri May 5, 2024
343b1cd
add similarity theory to the model
simone-silvestri May 5, 2024
3a6dc87
more changes
simone-silvestri May 5, 2024
e7d6f72
some changes
simone-silvestri May 5, 2024
16169e9
small typo
simone-silvestri May 5, 2024
3bf60f9
almost working
simone-silvestri May 5, 2024
c6c7e2e
new changes
simone-silvestri May 5, 2024
4813cd9
some changes
simone-silvestri May 6, 2024
c548384
change bulk coefficients function
simone-silvestri May 6, 2024
c507434
better comment
simone-silvestri May 6, 2024
bb3049b
Merge remote-tracking branch 'origin/ss/omip-simulation' into ss/omip…
simone-silvestri May 6, 2024
6ab58e7
All this works!
simone-silvestri May 7, 2024
1658b46
should work?
simone-silvestri May 7, 2024
d65decf
bunch of changes
simone-silvestri May 7, 2024
95d5dc1
changes
simone-silvestri May 7, 2024
199256d
test stuff
simone-silvestri May 7, 2024
5dd4dfa
bugfix
simone-silvestri May 7, 2024
5f2d29f
import instead of use
simone-silvestri May 7, 2024
2f3814d
using Adapt
simone-silvestri May 7, 2024
f8bb025
let's try it out!
simone-silvestri May 7, 2024
4a7a594
bugfix
simone-silvestri May 7, 2024
1d7522f
some bugfixes
simone-silvestri May 7, 2024
754e8b9
some other changes
simone-silvestri May 7, 2024
067677c
correction
simone-silvestri May 7, 2024
d09ec57
remove maxiter
simone-silvestri May 7, 2024
ec63733
ok now this should work?
simone-silvestri May 7, 2024
b53305b
try this out
simone-silvestri May 7, 2024
5cfb336
can start the first simulation
simone-silvestri May 8, 2024
df21dc8
typo
simone-silvestri May 8, 2024
72ba24d
add a timescale
simone-silvestri May 8, 2024
d19913f
clearing some bugs
simone-silvestri May 9, 2024
4fa8bc4
some change
simone-silvestri May 9, 2024
90e8123
bugfixes here and there
simone-silvestri May 9, 2024
5328879
add links
simone-silvestri May 9, 2024
a59d17b
correct line reference
simone-silvestri May 9, 2024
34c3a6d
correct reference
simone-silvestri May 9, 2024
d9be32c
correct comment
simone-silvestri May 9, 2024
5d8f0ee
update forcing fts
simone-silvestri May 13, 2024
68e98ea
Merge branch 'ss/omip-with-restoring' of https://github.com/CliMA/Cli…
simone-silvestri May 13, 2024
e6d020e
Some documentation of the radiation
simone-silvestri May 14, 2024
356d973
pretty massive bug in the iterative solver. Now onto checking the rad…
simone-silvestri May 16, 2024
c2531eb
changes
simone-silvestri May 16, 2024
290a645
updated changes
simone-silvestri May 16, 2024
bf8e5e5
remove warped grid
simone-silvestri May 16, 2024
e773839
new toml files
simone-silvestri May 16, 2024
e804a4c
add tripolar methods
simone-silvestri May 16, 2024
d2277c9
Merge branch 'ss/omip-with-restoring' of github.com:CliMA/ClimaOcean.…
simone-silvestri May 16, 2024
53e000e
removing some useless code
simone-silvestri May 16, 2024
bccf5da
remove the WarpedGrid from the omip
simone-silvestri May 16, 2024
d9cc663
typo of function name
simone-silvestri May 16, 2024
e029b9c
Merge remote-tracking branch 'origin/main' into ss/omip-with-restoring
simone-silvestri May 16, 2024
8128419
Merge remote-tracking branch 'origin/ss/omip-simulation' into ss/omip…
simone-silvestri May 16, 2024
a81808d
correct omip
simone-silvestri May 16, 2024
fc5b1f4
some changes
simone-silvestri May 16, 2024
662b60c
do not require username and password if file is there
simone-silvestri May 19, 2024
35e0c33
Merge branch 'main' into ss/omip-simulation
simone-silvestri May 20, 2024
e1486de
remove symbols from ECCO restoring
simone-silvestri May 20, 2024
1dd0dfe
add to gitignore
simone-silvestri May 20, 2024
a3ee1c2
couple of bugfixes
simone-silvestri May 20, 2024
eba3163
couple of bugfixes
simone-silvestri May 20, 2024
8d2ffdc
maybe saving the location it works?
simone-silvestri May 21, 2024
90a17be
not sure it will work but it might
simone-silvestri May 21, 2024
c513af2
bugfix
simone-silvestri May 21, 2024
e82c45b
do not restrict oceananigans
simone-silvestri May 21, 2024
51a5778
bugfix
simone-silvestri May 21, 2024
d06ea0b
changes
simone-silvestri May 21, 2024
d8f9d5f
Update pipeline.yml
glwagner May 21, 2024
da361fe
unify gpu and cpu ecco restorings
simone-silvestri Jun 6, 2024
b2560ee
some bugfix
simone-silvestri Jun 6, 2024
64e63a8
some small changes
simone-silvestri Jun 6, 2024
ca269d8
a couple of improvements
simone-silvestri Jun 7, 2024
fd94299
better restoring
simone-silvestri Jun 8, 2024
934e706
small test
simone-silvestri Jun 8, 2024
5c1eb98
add a couple comments
simone-silvestri Jun 8, 2024
1205cd9
fix the example
simone-silvestri Jun 8, 2024
e8136ba
correct prototype
simone-silvestri Jun 8, 2024
d63542c
Merge branch 'ss/omip-with-restoring' of github.com:CliMA/ClimaOcean.…
simone-silvestri Jun 8, 2024
ed466dd
try it like this?
simone-silvestri Jun 8, 2024
6fd977b
try like this
simone-silvestri Jun 8, 2024
b4a163e
new simulation
simone-silvestri Jun 9, 2024
b3e877c
try with custom stateindex
simone-silvestri Jun 9, 2024
0d5535f
near global example
simone-silvestri Jun 9, 2024
a8a2d31
prototype on latlong
simone-silvestri Jun 9, 2024
7263d61
probably better?
simone-silvestri Jun 9, 2024
5f67398
maybe like this is works
simone-silvestri Jun 9, 2024
938d39e
show the backend
simone-silvestri Jun 9, 2024
8934281
Merge branch 'main' into glw/buildkite-docs
simone-silvestri Jun 9, 2024
150e084
Merge remote-tracking branch 'origin/glw/buildkite-docs' into ss/omip…
simone-silvestri Jun 9, 2024
2492e0d
Merge remote-tracking branch 'origin/glw/buildkite-docs' into ss/omip…
simone-silvestri Jun 9, 2024
86dc7fc
should it work with the examples like this?
simone-silvestri Jun 9, 2024
dc88b7d
remove docs manifest
simone-silvestri Jun 9, 2024
e6c1996
use correct time in mask
simone-silvestri Jun 9, 2024
5007b7c
bugfixes in docs
simone-silvestri Jun 9, 2024
285d614
single column simulation works
simone-silvestri Jun 9, 2024
a3bd0e4
running
simone-silvestri Jun 9, 2024
0455dde
bugfixes
simone-silvestri Jun 10, 2024
fb4c35c
some restructuring
simone-silvestri Jun 10, 2024
8d837e3
try running this?
simone-silvestri Jun 10, 2024
895be66
update it
simone-silvestri Jun 10, 2024
19af1cc
export stuff
simone-silvestri Jun 10, 2024
b87b723
bugfix
simone-silvestri Jun 10, 2024
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
25b3449
just run docs on the caltech cluster
simone-silvestri Jul 23, 2024
22a3f8e
bugfix
simone-silvestri Jul 23, 2024
5299dbe
update manifest
simone-silvestri Jul 23, 2024
dfafbae
update docs project
simone-silvestri Jul 23, 2024
f86185c
test removing video
simone-silvestri Jul 24, 2024
4762797
no limit on generated size
simone-silvestri Jul 24, 2024
195f6dd
make without examples for the moment
simone-silvestri Jul 25, 2024
5868548
CLIMAOCEAN_ECCO_USERNAME
simone-silvestri Jul 25, 2024
56dac7c
typos
simone-silvestri Jul 25, 2024
a4e739f
another typo in the docs
simone-silvestri Jul 25, 2024
bc4ec43
back to ECCO_USERNAME and ECCO_PASSWORD
simone-silvestri Jul 25, 2024
c7d7e92
Update src/OceanSeaIceModels/minimum_temperature_sea_ice.jl
simone-silvestri Jul 25, 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
27 changes: 14 additions & 13 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ agents:

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

Expand All @@ -20,6 +21,9 @@ steps:
agents:
slurm_mem: 32G
slurm_cpus_per_task: 8
slurm_gpus: 1
slurm_ntasks: 1
slurm_gpus_per_task: 1
env:
JULIA_NUM_PRECOMPILE_TASKS: 8

Expand All @@ -33,11 +37,11 @@ steps:
commands:
- "julia --project -e 'using Pkg; Pkg.test()'"

- label: "Run ECCO2 tests"
key: "tests_ecco2"
- label: "Run ECCO tests"
key: "tests_ecco"
env:
CUDA_VISIBLE_DEVICES: "-1"
TEST_GROUP: "ecco2"
TEST_GROUP: "ecco"
commands:
- "julia --project -e 'using Pkg; Pkg.test()'"

Expand All @@ -49,16 +53,13 @@ steps:
commands:
- "julia --project -e 'using Pkg; Pkg.test()'"

# - label: "documentation"
# env:
# JULIA_DEBUG: "Documenter"
# commands:
# - "julia --color=yes --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'"
# - "julia --color=yes --project=docs/ docs/make.jl"
# agents:
# slurm_mem: 120G
# slurm_ntasks: 1
# slurm_gpus_per_task: 1
- label: "Run documentation"
key: "build_documentation"
env:
CUDA_VISIBLE_DEVICES: "0"
commands:
- "julia --color=yes --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'"
- "julia --color=yes --project=docs/ docs/make.jl"

- wait: ~
continue_on_failure: true
6 changes: 4 additions & 2 deletions .github/workflows/Documenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key
JULIA_DEBUG: Documenter
run: julia --color=yes --project=docs/ docs/make.jl
JULIA_DEBUG: Documenter
ECCO_USERNAME: ${{ secrets.ECCO_USERNAME }} # To download ECCO data from the podaac website
ECCO_PASSWORD: ${{ secrets.ECCO_PASSWORD }} # To download ECCO data from the podaac website
run: julia --color=yes --project=docs/ docs/make_without_examples.jl
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ jobs:
julia --color=yes --project -e 'using Pkg; Pkg.test()'
env:
TEST_GROUP: "downloading"
ECCO_USERNAME: ${{ secrets.ECCO_USERNAME }} # To download ECCO data from the podaac website
ECCO_PASSWORD: ${{ secrets.ECCO_PASSWORD }} # To download ECCO data from the podaac website
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v3
with:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ docs/src/literated/
*.qdrep
*.nsys-rep
*.ncu-rep
*.sq
*.sqlite
Loading
Loading