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

Add Grids, make them mutable objects #1487

Merged
merged 71 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
d4b1945
Memoize SpectralElementSpace2D
simonbyrne Mar 1, 2023
deb27b6
memoize Topology2D
simonbyrne Mar 4, 2023
10ce546
FD WIP
simonbyrne Mar 7, 2023
da4bfa8
fix type
simonbyrne Sep 21, 2023
ccbb4ec
more work
simonbyrne Sep 27, 2023
9b5b178
WIP
simonbyrne Sep 28, 2023
e16e591
WIP
simonbyrne Oct 2, 2023
8b74636
more
simonbyrne Oct 2, 2023
872aef1
more
simonbyrne Oct 2, 2023
4eb2b14
more changes
simonbyrne Oct 3, 2023
987515e
IO
simonbyrne Oct 4, 2023
6749231
create Grids submodule
simonbyrne Oct 4, 2023
07564bb
Merge remote-tracking branch 'origin/main' into sb/mutable-grid
simonbyrne Oct 18, 2023
a1e3b74
move DSS (WIP)
simonbyrne Oct 19, 2023
aac67b8
WIP
simonbyrne Oct 20, 2023
b87e589
more fixes
simonbyrne Oct 20, 2023
4c7b89e
more
simonbyrne Oct 20, 2023
c776d92
more
simonbyrne Oct 20, 2023
5bc3b95
more fixes
simonbyrne Oct 20, 2023
4d226da
Merge remote-tracking branch 'origin/main' into sb/mutable-grid
simonbyrne Oct 23, 2023
1e22894
Merge branch 'sb/rm-distributed-remap' into sb/mutable-grid
simonbyrne Oct 23, 2023
1220593
format
simonbyrne Oct 23, 2023
d2bf291
upgrade subpackages
simonbyrne Oct 23, 2023
c97208d
update manifests
simonbyrne Oct 23, 2023
4ab276e
Merge remote-tracking branch 'origin/main' into sb/mutable-grid
simonbyrne Oct 23, 2023
dce8683
use accessors
simonbyrne Oct 24, 2023
907bf20
Merge remote-tracking branch 'origin/main' into sb/mutable-grid
simonbyrne Oct 24, 2023
c41d589
qualify cuda macro
simonbyrne Oct 24, 2023
65ff812
more fixes
simonbyrne Oct 24, 2023
4efb0a6
fix function name
simonbyrne Oct 24, 2023
1973dac
more fixes
simonbyrne Oct 24, 2023
529d48b
more fixes
simonbyrne Oct 24, 2023
bf5f5fd
fix plots
simonbyrne Oct 24, 2023
fa3bcdd
add create_dss_buffer method
simonbyrne Oct 24, 2023
51757ea
fix docs
simonbyrne Oct 24, 2023
e37a0c4
more fixes
simonbyrne Oct 24, 2023
918dbe6
fix arg order
simonbyrne Oct 24, 2023
2ba3e70
update benchmarks
simonbyrne Oct 25, 2023
212dd83
pass through keyword args
simonbyrne Oct 25, 2023
f807b99
add deprecations for getproperty on space
simonbyrne Oct 25, 2023
5c75025
qualify _get_idx
simonbyrne Oct 25, 2023
a37ad48
using CUDA
simonbyrne Oct 25, 2023
375c854
inline getproperty
simonbyrne Oct 25, 2023
dede3a2
more fixes
simonbyrne Oct 25, 2023
0a2b793
import dss_ghost
simonbyrne Oct 25, 2023
4fe4a86
fix level of FD space
simonbyrne Oct 25, 2023
c48a3e9
support for writing level grids
simonbyrne Oct 25, 2023
47bcecf
switch PointSpace constructor
simonbyrne Oct 25, 2023
6f1f449
Merge remote-tracking branch 'origin/main' into sb/mutable-grid
simonbyrne Oct 25, 2023
c00779b
define column properly
simonbyrne Oct 25, 2023
4643ed0
import PlusHalf
simonbyrne Oct 25, 2023
bc182d7
plushalf
simonbyrne Oct 25, 2023
5d60b50
use getfield
simonbyrne Oct 25, 2023
8674ac5
Update extruded.jl
simonbyrne Oct 26, 2023
8af3b82
Update extruded.jl
simonbyrne Oct 26, 2023
9b86361
bunch o fixes
simonbyrne Oct 26, 2023
09a88ef
add Grids to import
simonbyrne Oct 26, 2023
a0dc517
more fixes
simonbyrne Oct 26, 2023
a8bf94e
adapt vertical topography
simonbyrne Oct 26, 2023
c4a4150
more fixes
simonbyrne Oct 26, 2023
83efe9a
Merge remote-tracking branch 'origin/main' into sb/mutable-grid
simonbyrne Oct 26, 2023
ad1f1f2
some more fixes
simonbyrne Oct 27, 2023
4964fb3
increase ClimaCoreMakie timeout
simonbyrne Oct 27, 2023
f5873d3
more fixes
simonbyrne Oct 27, 2023
3f4a2f0
add back dss2 functions
simonbyrne Oct 27, 2023
0c2b978
fix level IO
simonbyrne Oct 27, 2023
d8f0afb
fix read_grid
simonbyrne Oct 28, 2023
2ddd02d
fix space for LevelGrid
simonbyrne Oct 28, 2023
15d5d07
Update src/Grids/extruded.jl
simonbyrne Nov 1, 2023
3638ce0
Merge remote-tracking branch 'origin/main' into sb/mutable-grid
simonbyrne Nov 16, 2023
73cc16f
fix _configure_threadblock
simonbyrne Nov 16, 2023
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
10 changes: 5 additions & 5 deletions .dev/Manifest.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is machine-generated - editing it directly is not advised

julia_version = "1.9.3"
julia_version = "1.9.4"
manifest_format = "2.0"
project_hash = "30b405be1c677184b7703a9bfb3d2100029ccad0"

Expand Down Expand Up @@ -86,12 +86,12 @@ version = "1.0.42"
[[deps.LibCURL]]
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
version = "0.6.3"
version = "0.6.4"

[[deps.LibCURL_jll]]
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
version = "7.84.0+0"
version = "8.4.0+0"

[[deps.LibGit2]]
deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
Expand All @@ -100,7 +100,7 @@ uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
[[deps.LibSSH2_jll]]
deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
version = "1.10.2+0"
version = "1.11.0+1"

[[deps.Libdl]]
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
Expand Down Expand Up @@ -213,7 +213,7 @@ version = "1.2.13+0"
[[deps.nghttp2_jll]]
deps = ["Artifacts", "Libdl"]
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
version = "1.48.0+0"
version = "1.52.0+1"

[[deps.p7zip_jll]]
deps = ["Artifacts", "Libdl"]
Expand Down
1 change: 1 addition & 0 deletions .dev/up_deps.jl
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dirs = (
joinpath(root, "perf"),
joinpath(root, "docs"),
joinpath(root, "test"),
joinpath(root, "benchmarks", "bickleyjet"),
joinpath(root, "lib", "ClimaCoreMakie"),
joinpath(root, "lib", "ClimaCorePlots"),
joinpath(root, "lib", "ClimaCoreTempestRemap"),
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ClimaCoreMakie.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
jobs:
lib-climacore-makie:
runs-on: ubuntu-20.04
timeout-minutes: 30
timeout-minutes: 45
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
4 changes: 4 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Memoize = "c03570c3-d221-55d1-a50c-7939bbd78826"
PkgVersion = "eebad327-c553-4316-9ea0-9fa01ccd7688"
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
Expand All @@ -28,6 +29,7 @@ Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
WeakValueDicts = "897b6980-f191-5a31-bcb0-bf3c4585e0c1"

[compat]
Adapt = "3"
Expand All @@ -44,6 +46,7 @@ GilbertCurves = "0.1"
HDF5 = "0.16, 0.17"
InteractiveUtils = "1"
IntervalSets = "0.5, 0.6, 0.7"
Memoize = "0.4"
LinearAlgebra = "1"
PkgVersion = "0.1, 0.2, 0.3"
RecursiveArrayTools = "2"
Expand All @@ -54,4 +57,5 @@ Static = "0.4, 0.5, 0.6, 0.7, 0.8"
StaticArrays = "1"
Statistics = "1"
UnPack = "1"
WeakValueDicts = "0.1"
julia = "1.8"
Loading