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.

Sign up for GitHub

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

Jump to bottom

Interpolated inital conditions #60

Merged
merged 61 commits into from
Mar 28, 2024
Merged

Interpolated inital conditions #60

Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
99ec13e
stuff
simone-silvestri Nov 16, 2023
fad2080
run decaying med
simone-silvestri Nov 16, 2023
b8c915e
some changes
simone-silvestri Nov 16, 2023
f94d25e
some change
simone-silvestri Nov 16, 2023
f6eece4
try on tartarus
simone-silvestri Nov 16, 2023
b2af7c1
try it out on tartarus
simone-silvestri Nov 16, 2023
3eab9e7
test it on GPU
simone-silvestri Nov 16, 2023
fe2e521
bugfix
simone-silvestri Nov 16, 2023
29a61d4
bugfix
simone-silvestri Nov 16, 2023
9d90b08
some changes
simone-silvestri Nov 17, 2023
f10b9f1
change example
simone-silvestri Nov 17, 2023
9f22cfd
some exports
simone-silvestri Nov 17, 2023
02112d1
depth instead of minimum_depth
simone-silvestri Nov 17, 2023
59a39cf
works without diffusion?
simone-silvestri Nov 21, 2023
8f39ee1
better
simone-silvestri Nov 21, 2023
9f29882
little more "blackboxy"
simone-silvestri Nov 21, 2023
9790836
forgot to regrid
simone-silvestri Nov 21, 2023
aa7c2d8
works
simone-silvestri Nov 21, 2023
be3bff8
take away show
simone-silvestri Nov 21, 2023
351debc
take away show
simone-silvestri Nov 21, 2023
75dbdf7
some changes
simone-silvestri Nov 21, 2023
a2aff1a
name change
simone-silvestri Nov 21, 2023
fc59ff8
this works!
simone-silvestri Nov 21, 2023
c3d145b
fine
simone-silvestri Nov 21, 2023
0a04d6a
some comments
simone-silvestri Nov 21, 2023
7caf635
some changes
simone-silvestri Nov 21, 2023
a611a27
some comments
simone-silvestri Nov 21, 2023
0f9ec22
comment
simone-silvestri Nov 21, 2023
aae87fd
bugfix
simone-silvestri Nov 21, 2023
90ec6f8
more restructuring
simone-silvestri Nov 21, 2023
7a81f63
more cleanup
simone-silvestri Nov 21, 2023
84ae45d
small bugfix
simone-silvestri Nov 21, 2023
1923c2d
organize a bit
simone-silvestri Nov 21, 2023
6822280
comment
simone-silvestri Nov 21, 2023
a81496e
finished
simone-silvestri Nov 21, 2023
7c52982
freely decaying med simpler set!
simone-silvestri Nov 29, 2023
333a15b
bugfix
simone-silvestri Nov 29, 2023
2ca7a89
return a value
simone-silvestri Nov 29, 2023
a4f7e1d
some changes
simone-silvestri Nov 29, 2023
a4a7185
test it out
simone-silvestri Nov 29, 2023
cb1c451
bugfix
simone-silvestri Nov 29, 2023
9ab3093
probably ready to go?
simone-silvestri Dec 13, 2023
abf3b25
fixes CI
simone-silvestri Dec 13, 2023
48109ca
fiox download test
simone-silvestri Dec 13, 2023
9ce454b
small fix
simone-silvestri Dec 19, 2023
60393b9
tests should pass
simone-silvestri Jan 24, 2024
6efc275
comment on interpolation passes
simone-silvestri Jan 24, 2024
3844970
comment
simone-silvestri Jan 24, 2024
dbb7256
comment
simone-silvestri Jan 24, 2024
1cfe3f9
better name
simone-silvestri Jan 24, 2024
cf2beaa
Change name to inpaint_mask and update ECCO2 initialization
glwagner Feb 26, 2024
4cc11de
update Oceananigans
simone-silvestri Feb 27, 2024
67ba1e7
Merge branch 'ss/inital-conditions' of github.com:CliMA/ClimaOcean.jl…
simone-silvestri Feb 27, 2024
8f7e2ea
change some docstrings
simone-silvestri Feb 27, 2024
3234942
include submodules in docs + don't error when missing_docs
navidcy Feb 27, 2024
6f08f78
bugfix
simone-silvestri Feb 27, 2024
dc1303b
Merge branch 'ss/inital-conditions' of github.com:CliMA/ClimaOcean.jl…
simone-silvestri Feb 27, 2024
353992b
bigfix
simone-silvestri Feb 28, 2024
a9fe0a5
Merge branch 'main' into ss/inital-conditions
simone-silvestri Mar 1, 2024
fd4aaf0
Merge branch 'main' into ss/inital-conditions
navidcy Mar 25, 2024
6bb9422
Merge branch 'main' into ss/inital-conditions
navidcy Mar 27, 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
2 changes: 1 addition & 1 deletion src/DataWrangling/inpaint_mask.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ end
propagate_horizontally!(field, ::Nothing, tmp_field=deepcopy(field); kw...) = field

function propagating(field, mask, iter, max_iter)
mask_sum = sum(field; condition=mask)
mask_sum = sum(field; condition=interior(mask))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just checking a thing, apparently, we cannot use condition::AbstractField (because there is no arch_array method for fields). We could do two things: (1) extend the reductions for field conditions or (2) have an arch_array also for fields. I think the nice thing to do come up with a single function on_architecture that is valid for arrays, grids and fields alike

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agree that is needed. I guess there is an invalid assumption somewhere that arch_array works for AbstractArray.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

x-ref: CliMA/Oceananigans.jl#3490

return isnan(mask_sum) && iter < max_iter
end

Expand Down
Loading