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

Some revisitation of turbulent fluxes #80

Merged
merged 506 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
506 commits
Select commit Hold shift + click to select a range
a94daf4
oncean only timestepping
simone-silvestri Mar 5, 2024
86c87f7
replace with zero
simone-silvestri Mar 5, 2024
743512e
small change
simone-silvestri Mar 5, 2024
3c9d35f
fill ecco halo regions
simone-silvestri Mar 5, 2024
bb9e5a0
first commit
simone-silvestri Mar 6, 2024
8ef9d74
working
Mar 6, 2024
852efa2
let's see
simone-silvestri Mar 6, 2024
0447f4a
try
simone-silvestri Mar 6, 2024
495e686
uff
simone-silvestri Mar 6, 2024
d1964ae
try like this?
simone-silvestri Mar 6, 2024
32eb73c
Try it on CPU
simone-silvestri Mar 6, 2024
8145778
better
simone-silvestri Mar 6, 2024
30a4bee
hmmm
simone-silvestri Mar 6, 2024
ca01216
rename file
simone-silvestri Mar 6, 2024
247d685
try it now?
simone-silvestri Mar 6, 2024
7fa0924
more changes
simone-silvestri Mar 6, 2024
e1f7917
bugfix
simone-silvestri Mar 6, 2024
d99a93a
other bugfix
simone-silvestri Mar 6, 2024
155191d
better inpaint
simone-silvestri Mar 6, 2024
2404cad
add comment
simone-silvestri Mar 6, 2024
cb23185
remove vestigial code
simone-silvestri Mar 6, 2024
d784f5e
better
simone-silvestri Mar 6, 2024
64a4d1d
let's see
simone-silvestri Mar 6, 2024
b270d04
another fix
simone-silvestri Mar 6, 2024
ca503de
show method
simone-silvestri Mar 6, 2024
7000816
let's use a barrier
simone-silvestri Mar 6, 2024
39104f7
let's try like this?
simone-silvestri Mar 6, 2024
1e0f909
this should work?
simone-silvestri Mar 6, 2024
018bda7
infer load on CPU
simone-silvestri Mar 6, 2024
7a995ef
show stuff
simone-silvestri Mar 6, 2024
5b41825
try it out
simone-silvestri Mar 6, 2024
2bfa96b
try it like this
simone-silvestri Mar 6, 2024
f124a0b
test
simone-silvestri Mar 6, 2024
99def85
test it out
simone-silvestri Mar 6, 2024
6726dd6
let's see
simone-silvestri Mar 6, 2024
d42aa1c
let's go
simone-silvestri Mar 6, 2024
4062311
now it will work!
simone-silvestri Mar 6, 2024
b560bcf
let's go here!
simone-silvestri Mar 6, 2024
699c07b
let's go!
simone-silvestri Mar 6, 2024
b73c7c3
better!
simone-silvestri Mar 6, 2024
26c31ec
bugfix
simone-silvestri Mar 6, 2024
00bd8a2
now it will work
simone-silvestri Mar 6, 2024
08cdad3
fixes
simone-silvestri Mar 6, 2024
fbce7d7
maximum size
simone-silvestri Mar 6, 2024
6c0e338
performance measure
simone-silvestri Mar 6, 2024
c139932
test it out
simone-silvestri Mar 6, 2024
9b97714
not working?
simone-silvestri Mar 6, 2024
518556d
another test
simone-silvestri Mar 6, 2024
8427467
gogogo
simone-silvestri Mar 6, 2024
e50c80a
let's see
simone-silvestri Mar 6, 2024
4ef2f7a
try it again
simone-silvestri Mar 6, 2024
51d75cd
try again
simone-silvestri Mar 6, 2024
1b8fa06
another try?
simone-silvestri Mar 6, 2024
12ed322
ok, now it works, remove workings
simone-silvestri Mar 6, 2024
10a217a
let's go
simone-silvestri Mar 6, 2024
ac70703
better progress
simone-silvestri Mar 6, 2024
2989126
hmmmm
simone-silvestri Mar 6, 2024
0e9de40
now it will work?
simone-silvestri Mar 6, 2024
4e907aa
allow interpolation on distributed grids
simone-silvestri Mar 6, 2024
b2b8633
let's go!
simone-silvestri Mar 6, 2024
61f4e06
small test
simone-silvestri Mar 6, 2024
3731a07
bugfix
simone-silvestri Mar 6, 2024
c6de168
try it like this
simone-silvestri Mar 6, 2024
e6afc9e
try like this?
simone-silvestri Mar 6, 2024
565395b
try it now
simone-silvestri Mar 6, 2024
908da86
another bugfix
simone-silvestri Mar 6, 2024
40b2477
add drag
simone-silvestri Mar 7, 2024
b56a1d1
add bottom drag
simone-silvestri Mar 7, 2024
6744537
small correction
simone-silvestri Mar 11, 2024
f06ea26
bugfix
simone-silvestri Apr 14, 2024
2ec4a62
now this should work!
simone-silvestri Apr 14, 2024
7423f48
small correction
simone-silvestri Apr 14, 2024
577c6ea
ocean only model
simone-silvestri Apr 14, 2024
b2f8c8f
small fixes
simone-silvestri Apr 14, 2024
2123baf
try it out
simone-silvestri Apr 16, 2024
9ba6725
try like this
simone-silvestri Apr 16, 2024
450d3bf
try this
simone-silvestri Apr 16, 2024
2ba3394
try it like this
simone-silvestri Apr 16, 2024
233a1e5
small bugfix
simone-silvestri Apr 16, 2024
5d82011
add docstring
simone-silvestri Apr 16, 2024
09370fa
bugfix
simone-silvestri Apr 16, 2024
ee2eb8d
try again
simone-silvestri Apr 16, 2024
ddeac08
bugfix
simone-silvestri Apr 16, 2024
155c407
bugfix again
simone-silvestri Apr 16, 2024
2bd5f8b
cmon!!
simone-silvestri Apr 16, 2024
d4c0ea8
typo
simone-silvestri Apr 17, 2024
0b27ffe
tidying up a bit
simone-silvestri Apr 17, 2024
de99c18
bugfix
simone-silvestri Apr 17, 2024
3525cc1
another typo
simone-silvestri Apr 17, 2024
6536997
limit _all_ the fluxes (also radiative ones)
simone-silvestri Apr 17, 2024
3d445ad
better explanation
simone-silvestri Apr 17, 2024
74dff24
working now
simone-silvestri Apr 18, 2024
9a03996
remove duplicate definition
simone-silvestri Apr 18, 2024
fcaaba0
more changes
simone-silvestri Apr 19, 2024
fa8d471
omip branch
simone-silvestri Apr 19, 2024
e49973b
let's go
simone-silvestri Apr 19, 2024
f816fbd
progress
simone-silvestri Apr 19, 2024
0ff1516
we're ready to go!
simone-silvestri Apr 20, 2024
75e884f
change name
simone-silvestri Apr 20, 2024
001799f
bugfix
simone-silvestri Apr 20, 2024
4349f54
bugfix
simone-silvestri Apr 20, 2024
8f64c34
add new stuff
simone-silvestri Apr 22, 2024
c815b45
bugfix
simone-silvestri Apr 22, 2024
1037c77
convert correctly
simone-silvestri Apr 23, 2024
f06f53a
give it another try
simone-silvestri Apr 23, 2024
6d50adf
all the stuff
simone-silvestri Apr 23, 2024
ca29a42
changes
simone-silvestri Apr 23, 2024
a6f62d3
go ahead
simone-silvestri Apr 23, 2024
6a17c02
tests
simone-silvestri Apr 23, 2024
e9aeda3
comparison to coare
simone-silvestri Apr 23, 2024
bfc38a6
adding main
simone-silvestri Apr 23, 2024
ee606a7
some changes
simone-silvestri Apr 23, 2024
98bb98e
chnages
simone-silvestri Apr 24, 2024
ecba76c
maybe now it works?
simone-silvestri Apr 24, 2024
c15d95b
try it like this?
simone-silvestri Apr 24, 2024
6af635c
hail mary!
simone-silvestri Apr 24, 2024
b5d1ba5
go now!
simone-silvestri Apr 24, 2024
c96f7c4
try with forcing instead of immersed boundary
simone-silvestri Apr 24, 2024
0ded51b
set connected regions to zero
simone-silvestri Apr 24, 2024
ca5458f
remove small lakes?
simone-silvestri Apr 24, 2024
6eaebfc
let's go with connected regions!
simone-silvestri Apr 25, 2024
1a545ff
Let's go!
simone-silvestri Apr 27, 2024
79410a4
should be ready to run?
simone-silvestri Apr 27, 2024
a065e3f
this should work!
simone-silvestri Apr 27, 2024
775539f
small bugfix
simone-silvestri Apr 27, 2024
628bcdf
using Adapt
simone-silvestri Apr 27, 2024
aa4556c
Merge branch 'ss/omip-simulation' of github.com:CliMA/ClimaOcean.jl i…
simone-silvestri Apr 27, 2024
d6e0196
changing the parameters for TabulatedAlbedo
simone-silvestri Apr 27, 2024
8327c0b
small bugfix
simone-silvestri Apr 27, 2024
8b8fa2a
try like this?
simone-silvestri Apr 27, 2024
4f20c02
cleanup a bit
simone-silvestri Apr 27, 2024
dee662c
give it a try
simone-silvestri Apr 27, 2024
a96df8d
back to previous formulation
simone-silvestri Apr 27, 2024
28ac1cd
this should work now!
simone-silvestri Apr 29, 2024
756a987
some changes
simone-silvestri Apr 29, 2024
b06d315
updating
simone-silvestri Apr 29, 2024
0f3da21
10 meters
simone-silvestri Apr 29, 2024
a5bc9cf
bugfix
simone-silvestri Apr 29, 2024
68ea2eb
correct one
simone-silvestri Apr 29, 2024
1b74321
add a maximum
simone-silvestri Apr 29, 2024
f942fec
remove show
simone-silvestri Apr 30, 2024
f5a78fa
this works
simone-silvestri Apr 30, 2024
3c20264
Merge remote-tracking branch 'origin/main' into ss/omip-simulation
simone-silvestri Apr 30, 2024
b179f87
fix ocean simulations
simone-silvestri Apr 30, 2024
e52a08f
change manifests
simone-silvestri Apr 30, 2024
6d064c6
guess this is the closest we get!
simone-silvestri May 1, 2024
51fc880
Finally I got it!
simone-silvestri May 1, 2024
9be9fea
small fixes
simone-silvestri May 1, 2024
084f826
try it now
simone-silvestri May 1, 2024
eec09a6
bugfix
simone-silvestri May 1, 2024
8dff60e
remove vestigial files
simone-silvestri May 2, 2024
7e2a900
remove some vestigial files
simone-silvestri May 2, 2024
f59977d
some small changes
simone-silvestri May 2, 2024
522a182
some small bugfixes
simone-silvestri May 2, 2024
90b2f5a
more bugfixes
simone-silvestri May 2, 2024
1a1d25e
removing useless interpolation
simone-silvestri May 2, 2024
a3766b8
some correcting
simone-silvestri May 2, 2024
91bc4b0
some changes
simone-silvestri May 2, 2024
a0a58ec
a comment
simone-silvestri May 2, 2024
1f8ecb0
more comments
simone-silvestri May 2, 2024
aa852a2
changing folder
simone-silvestri May 2, 2024
9954202
arch in radiation
simone-silvestri May 2, 2024
8528f32
better default
simone-silvestri May 2, 2024
7509dba
some changes
simone-silvestri May 2, 2024
a2eb628
name change
simone-silvestri May 2, 2024
0b6e502
another bugfix
simone-silvestri May 2, 2024
d88ad0a
Update src/OceanSimulations/OceanSimulations.jl
simone-silvestri May 2, 2024
bdfb264
convert_to_native_frame
simone-silvestri May 2, 2024
c941dbb
Merge branch 'ss/omip-simulation' of https://github.com/CliMA/ClimaOc…
simone-silvestri May 2, 2024
4ab2eb5
correct reference name
simone-silvestri May 2, 2024
d15097f
some changes
simone-silvestri May 2, 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
16169e9
small typo
simone-silvestri May 5, 2024
c548384
change bulk coefficients function
simone-silvestri May 6, 2024
c507434
better comment
simone-silvestri May 6, 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
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
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
35e0c33
Merge branch 'main' into ss/omip-simulation
simone-silvestri May 20, 2024
d8f9d5f
Update pipeline.yml
glwagner May 21, 2024
5c1eb98
add a couple comments
simone-silvestri Jun 8, 2024
1205cd9
fix the example
simone-silvestri Jun 8, 2024
0d5535f
near global example
simone-silvestri Jun 9, 2024
a8a2d31
prototype on latlong
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
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
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
f5eeff9
bugfix
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
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
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
7f16190
bugfix in the bathymetry
simone-silvestri Jun 19, 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
24 changes: 18 additions & 6 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ agents:

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"
Expand Down Expand Up @@ -39,14 +41,24 @@ steps:
commands:
- "julia --project -e 'using Pkg; Pkg.test()'"

- label: "documentation"
- label: "Run surface flux tests"
key: "tests_fluxes"
env:
CUDA_VISIBLE_DEVICES: "-1"
JULIA_DEBUG: "Documenter"
# TMPDIR: "$TARTARUS_HOME/tmp"
TEST_GROUP: "fluxes"
commands:
- "julia --color=yes --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'"
- "julia --color=yes --project=docs/ docs/make.jl"

- "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

- wait: ~
continue_on_failure: true
14 changes: 8 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,19 @@ docs/build/
docs/site/
docs/src/literated/

# Output files
*.nc
*.jld2
*.mp4
*.png
*.svg
*.gif

# File generated by Pkg, the package manager, based on a corresponding Project.toml
# It records a fixed state of all packages used by the project. As such, it should not be
# committed for packages, but should be committed for applications that require a static
# environment.
# Manifest.toml

*.nc
*.jld2
*.mp4
*.DS_Store
*.swp
*.svg
*.gif
*.zip
Loading
Loading