-
Notifications
You must be signed in to change notification settings - Fork 261
(0.95.7) Yet another ZStar implementation #3956
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
Merged
Merged
Changes from 250 commits
Commits
Show all changes
700 commits
Select commit
Hold shift + click to select a range
3ecd318
Merge branch 'main' into ss/new-bottom-height
simone-silvestri b967754
static_column_depth
simone-silvestri 3f36846
Merge branch 'ss/new-bottom-height' of github.com:CliMA/Oceananigans.…
simone-silvestri 9ff305e
Merge branch 'main' into ss/new-bottom-height
simone-silvestri 6046d2d
Update src/Grids/grid_utils.jl
simone-silvestri 8106a70
Merge branch 'main' into ss/new-bottom-height
simone-silvestri a10df16
address comments
simone-silvestri 5ee7623
new comment
simone-silvestri 9777ee6
another name change
simone-silvestri 34bf768
Merge remote-tracking branch 'origin/ss/new-bottom-height' into ss/z-…
simone-silvestri 1d219af
AGFBIBG istead of AGFBIB and z_bottom only in TurbulenceClosures
simone-silvestri 4510adf
Merge remote-tracking branch 'origin/ss/new-bottom-height' into ss/z-…
simone-silvestri 238fa74
some bugfixes
simone-silvestri f97f9e0
Merge remote-tracking branch 'origin/ss/new-bottom-height' into ss/z-…
simone-silvestri d12fea0
adapting to new interface
simone-silvestri 5286440
should change these operators
simone-silvestri f1aab48
remove orthogonalsphericalshellgrids for the moment
simone-silvestri ace678b
better bottom height
simone-silvestri 210ead1
bugfix in bottom height
simone-silvestri 90dfa7a
better definition of bottom height
simone-silvestri 99a152a
fixed partial cells?
simone-silvestri f2402f0
fixed partial cell
simone-silvestri 55d7432
fixed partial cells
simone-silvestri 525f4be
fix split explicit tests
simone-silvestri c25d67d
check if these pass on a GPU for the moment
simone-silvestri 849c253
remove OrthogonalSphericalShellGrids while we decide what to do
simone-silvestri 510a858
these files shouldn't go here
simone-silvestri c2102dc
nothing was happening
simone-silvestri 6e560a4
correct coordinate test
simone-silvestri 926feda
Merge branch 'main' into ss/new-bottom-height
simone-silvestri aea0601
Merge branch 'main' into ss/new-bottom-height
simone-silvestri dfd0b30
Merge remote-tracking branch 'origin/main' into ss/new-bottom-height
simone-silvestri fe2d552
new operators
simone-silvestri 7d53e21
Merge branch 'main' into ss/z-star-coordinate
simone-silvestri 5227a13
fix pipeline
simone-silvestri 1225061
mpi test and gpu test
simone-silvestri 1652c6b
do we need to precompile it inside?
simone-silvestri 9323203
precompile inside the node
simone-silvestri 37b17ff
try previous climacommon version
simone-silvestri 2ac8cde
go even more back
simone-silvestri 0eb2720
use the ClimaOcean implementation
simone-silvestri 50d0ec3
using the ClimaOcean implementation
simone-silvestri 070c179
try removing boundary conditoin on barotropic velocity
simone-silvestri 8feff8b
found the bug
simone-silvestri dea8f30
remove the show
simone-silvestri 97b41e4
check where it is failing
simone-silvestri 040bcad
fairer comparison
simone-silvestri 6e183bd
see if this test passes
simone-silvestri d66baf2
Merge branch 'main' into ss/new-bottom-height
simone-silvestri c57a321
this was removed
simone-silvestri cfc6ad0
Merge branch 'main' into ss/new-bottom-height
simone-silvestri bd84d38
Merge branch 'main' into ss/fix-gpu-tests
simone-silvestri c56b15b
maybe precompiling before...
simone-silvestri 371a45b
Merge branch 'ss/fix-gpu-tests' of github.com:CliMA/Oceananigans.jl i…
simone-silvestri e30973f
double O0
simone-silvestri e4cb16e
back to previous clima_common
simone-silvestri 0c1f01c
another quick test
simone-silvestri 88c5d3a
Merge branch 'main' into ss/new-bottom-height
simone-silvestri bec1cd1
change environment
simone-silvestri 75546af
correct the utils
simone-silvestri 5f49ec0
Merge branch 'main' into ss/fix-gpu-tests
simone-silvestri 9b334af
this should load mpitrampoline
simone-silvestri f8c6401
Fix formatting
glwagner 1dc42bb
Go back to latest climacommon
glwagner 5a870e7
try adding Manifest
simone-silvestri 9e63f56
Manifest from julia 1.10
simone-silvestri 59548f8
we probably need to initialize on a GPU
simone-silvestri 642cfd9
these options should not create problems
simone-silvestri db58da1
restart the tests
simone-silvestri 4cee49a
let's see if this differs
simone-silvestri a46b25d
just version infos
simone-silvestri 4dffbe5
fiddling with O0
simone-silvestri 9c3c6cd
why are we using 8 threads?
simone-silvestri 3b28ecb
memory requirements are not this huge
simone-silvestri 00f87a4
update enzyme
simone-silvestri 7126c7c
speed up the precompilation a bit, to revert later
simone-silvestri 733ab2b
might this be the culprit?
simone-silvestri 2dbf1a0
revert to 8 tasks to precompile
simone-silvestri a4b129a
final version?
simone-silvestri 29f7d69
return to previous state of affairs
simone-silvestri 56ded6a
Merge branch 'ss/fix-gpu-tests' into ss/new-bottom-height
simone-silvestri 3154a34
bugfix
simone-silvestri 3803ff3
cuda runtime version
simone-silvestri cd0e05e
Merge remote-tracking branch 'origin/ss/new-bottom-height' into ss/z-…
simone-silvestri a60185c
Merge branch 'main' into ss/z-star-coordinate
simone-silvestri 43dc001
Merge branch 'main' into ss/z-star-coordinate
simone-silvestri d738760
Merge branch 'main' into ss/z-star-coordinate
simone-silvestri a4d4bc6
Merge remote-tracking branch 'origin/main' into ss/z-star-coordinate
simone-silvestri 349f71d
bugfix
simone-silvestri cf7b639
some bugfixes
simone-silvestri 0edb48f
more fixes
simone-silvestri 4b62393
just need to fix immersed boundaries
simone-silvestri 0f69fcb
new zstar
simone-silvestri 3d145da
Merge remote-tracking branch 'origin/main' into ss/new-zstar
simone-silvestri 6321fba
much better!
simone-silvestri 9cbf5d4
this should work nicely
simone-silvestri 96f8d66
more working
simone-silvestri 1bfe7d7
fx grid generation
simone-silvestri a8b1228
delete zstar
simone-silvestri d42e313
should work like this
simone-silvestri 50cd210
going on
simone-silvestri 1fd22c8
some simplification
simone-silvestri a339f6a
this to finish
simone-silvestri 0370864
should compile
simone-silvestri d46cb79
better
simone-silvestri 3520d00
add new definitions
simone-silvestri 1863ef7
should work?
simone-silvestri ca65b6b
This works
simone-silvestri c15ebfd
This seems to work
simone-silvestri 9e05e21
make sure implicit operator works
simone-silvestri e32956a
do not change this
simone-silvestri 8262e16
changes
simone-silvestri eeff71e
some changes
simone-silvestri df33f47
more changes
simone-silvestri 0555e28
more changes
simone-silvestri 662c78a
add some more tests
simone-silvestri 6b83651
better
simone-silvestri 1ef6eef
make it compile
simone-silvestri 1cf9323
make sure adapts work
simone-silvestri 91c811c
some more corrections
simone-silvestri d4effbc
a comment
simone-silvestri a2fba41
remove duplicate field
simone-silvestri eee652f
where is zspacing???
simone-silvestri e6a35c4
works
simone-silvestri 0585e3b
add cpu face constructor
simone-silvestri 48b567a
Merge branch 'main' into ss/new-zstar
simone-silvestri b1276fb
correct aliases
simone-silvestri 34fe9b2
Merge branch 'ss/new-zstar' of github.com:CliMA/Oceananigans.jl into …
simone-silvestri f0511df
at least some tests should pass
simone-silvestri a1a7a4e
sloggin along
simone-silvestri 8ab0d1d
another bugfix
simone-silvestri abf72ce
most of the tests should pass
simone-silvestri 8080929
remove partial cells from this business
simone-silvestri 9b6eed2
transport the correct term
simone-silvestri b62e4a2
some more comment
simone-silvestri f9d71ae
better comment
simone-silvestri 5d30064
some more bugfixes
simone-silvestri ad0f453
add z face constructor for nothing
simone-silvestri fb54ac7
a couple of bugfixes
simone-silvestri cb54a6f
another bugfix
simone-silvestri 0e0c5e7
it works for all free surfaces!!
simone-silvestri b85287f
it works for all free surfaces
simone-silvestri f468109
back to previous cpu face constructor
simone-silvestri 0c06253
change vector invariant upwinding
simone-silvestri 5a2f91b
no need for a loop
simone-silvestri b5a8ed8
simplify
simone-silvestri e3ac54c
couple of fixes
simone-silvestri 5e3a411
some improvements
simone-silvestri c309254
regression tests should pass
simone-silvestri e55cac5
rework the constructor
simone-silvestri ff2e3c0
simplify a bit
simone-silvestri 322373e
change face constructor
simone-silvestri 6d71d86
fix distributed tests
simone-silvestri 8ca1f7f
still debugging
simone-silvestri f1e56c7
fix gpu scripts
simone-silvestri 8a6937f
correct the face constructor
simone-silvestri 4da8c75
comment
simone-silvestri dd98875
all tests should be fixed now except for the distributed
simone-silvestri bda37bf
last bugfix
simone-silvestri ae012de
now it should work
simone-silvestri ee8866d
check which is the test that errors
simone-silvestri 846b27b
remove stackoverflow
simone-silvestri 3f2de73
fix tests
simone-silvestri 677db6b
Merge remote-tracking branch 'origin/main' into ss/new-zstar
simone-silvestri 2d61d0d
revert file
simone-silvestri 500339a
revert file
simone-silvestri 9c55647
removed rk3 by mistake
simone-silvestri 7fed979
revert files
simone-silvestri bb7d8ab
revert to rk3
simone-silvestri eebc1f5
make sure we do not need to use regular grids
simone-silvestri 569b9b3
change e₃ to σ
simone-silvestri 1425c5b
chenga name
simone-silvestri 35780bf
more corrections
simone-silvestri bfd24cc
add a test for active_cells_map
simone-silvestri e576565
make the test a bit smaller
simone-silvestri 1e5573c
improve test
simone-silvestri 5552bcf
xor instead of or
simone-silvestri 70ef066
correct all tests
simone-silvestri 071e14a
on architecture
simone-silvestri 998ce3b
removed the drift in immersed boundary grids
simone-silvestri dc11dd4
better lock_release validation
simone-silvestri e8c6a34
remove extra validation examples
simone-silvestri 0e6f26e
update tests
simone-silvestri 01856ea
increase the time step
simone-silvestri 7eef5cd
works for all free surfaces
simone-silvestri f66a66a
test also rectilinear grids
simone-silvestri e3d7f93
better info msg
simone-silvestri 5c137ed
back to all the grids
simone-silvestri 2835aea
deepcopy before integrating
simone-silvestri 6224b7d
make sure tests do not crash
simone-silvestri 9066f1f
remove space
simone-silvestri cdfa58f
use correct timesteps
simone-silvestri c2d572a
zstar following coordinate
simone-silvestri 3e5ac72
skip the test
simone-silvestri 63d1be3
chnage emojii
simone-silvestri aa6540c
Merge branch 'main' into ss/new-zstar
simone-silvestri 6377362
update to new syntax
simone-silvestri dffbeb5
Merge branch 'ss/new-zstar' of github.com:CliMA/Oceananigans.jl into …
simone-silvestri 2953b06
align
simone-silvestri c94606a
skip the correct tests
simone-silvestri 08ac22e
remove correct tests
simone-silvestri 344308b
Merge branch 'main' into ss/new-zstar
simone-silvestri 68dcb2a
Merge branch 'main' into ss/new-zstar
simone-silvestri 27f0fc9
Merge branch 'main' into ss/new-zstar
simone-silvestri 08cbad8
make sure we don't hit nans
simone-silvestri 3fb5874
Merge branch 'ss/new-zstar' of github.com:CliMA/Oceananigans.jl into …
simone-silvestri c0f5bab
bugfix
simone-silvestri 2dd3238
Update src/Grids/grid_generation.jl
simone-silvestri 609b84d
Update src/Grids/grid_generation.jl
simone-silvestri 0cdb4da
new name
simone-silvestri 6a3ea4b
Merge branch 'ss/new-zstar' of github.com:CliMA/Oceananigans.jl into …
simone-silvestri 06e7eb8
corrections
simone-silvestri fdc8ea5
Merge branch 'main' into ss/new-zstar
simone-silvestri abfe351
Merge branch 'main' into ss/new-zstar
simone-silvestri 38241f7
Update hydrostatic_free_surface_ab2_step.jl
simone-silvestri 688632c
Merge branch 'main' into ss/new-zstar
simone-silvestri 26f30ff
Update step_split_explicit_free_surface.jl
simone-silvestri 752dac0
bugfix
simone-silvestri 34db795
Merge branch 'main' into ss/new-zstar
simone-silvestri f1bd706
Merge branch 'main' into ss/new-zstar
simone-silvestri 96a1ea9
Merge branch 'main' into ss/new-zstar
simone-silvestri 19d6285
Merge branch 'main' into ss/new-zstar
simone-silvestri f027eff
Merge branch 'main' into ss/new-zstar
simone-silvestri 26df996
Merge branch 'main' into ss/new-zstar
simone-silvestri 53505c5
Merge branch 'main' into ss/new-zstar
simone-silvestri 84c82c9
add function support
simone-silvestri 4588e21
add function support
simone-silvestri 8b46f5d
remove convenience functionality
simone-silvestri 309c68b
Update grid_generation.jl
simone-silvestri 1e179ef
Merge branch 'main' into ss/new-zstar
simone-silvestri 92414e5
merge main
simone-silvestri 9825ef8
add a docstring
simone-silvestri 1915982
Merge branch 'main' into ss/new-zstar
simone-silvestri 22d0a91
Update test/test_active_cells_map.jl
simone-silvestri 9361705
Update test/test_split_explicit_vertical_integrals.jl
simone-silvestri 3a4c62e
Update test/test_split_explicit_vertical_integrals.jl
simone-silvestri 597c323
Merge branch 'main' into ss/new-zstar
simone-silvestri 7043914
start implementing suggestions
simone-silvestri 0b8ab4b
continue changing comments
simone-silvestri ec6bb0d
simplify unscale tracer
simone-silvestri 97a35f0
all the refactor
simone-silvestri 7fb6afd
some bugfix
simone-silvestri 3ffa927
remove HydrostaticFreeSurfaceModel
simone-silvestri c290619
Merge branch 'main' into ss/new-zstar
simone-silvestri e7a5445
scale tracers for all moving coordinates
simone-silvestri 1a4324a
Merge branch 'ss/new-zstar' of github.com:CliMA/Oceananigans.jl into …
simone-silvestri d44bace
should work now
simone-silvestri cb50742
bump version
simone-silvestri 036815c
name changes, remove exporting and add test
simone-silvestri 80334f6
make sure that the test is appropriate
simone-silvestri File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.