Time step with predictor velocities #666
Merged
Conversation
This file contains 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
|
@ali-ramadhan I may need some help with the checkpointer... |
|
I'll have a look |
ali-ramadhan
reviewed
Mar 5, 2020
| if solver.type isa Channel && arch isa GPU | ||
| ϕ = RHS = solver.storage.storage1 | ||
| else | ||
| ϕ = RHS = solver.storage | ||
| end | ||
|
|
||
| @launch(device(arch), config=launch_config(grid, :xyz), | ||
| calculate_pressure_right_hand_side!(RHS, solver.type, arch, grid, U, G, Δt)) | ||
| calculate_pressure_right_hand_side!(RHS, solver.type, arch, grid, Δt, U★)) | ||
|
|
||
| solve_poisson_equation!(solver, grid) |
There was a problem hiding this comment.
Not sure why but one of the Travis builds hits a ReadOnlyMemoryError on this line and I get a segmentation fault on my computer at this line.
Perhaps part of the model is corrupted after restoring from checkpoint? I'll try to find out.
Travis build log: https://travis-ci.com/climate-machine/Oceananigans.jl/jobs/294185099#L453
|
Think I fixed it. At least checkpointer tests pass on my laptop. |
Codecov Report
@@ Coverage Diff @@
## master #666 +/- ##
=========================================
+ Coverage 78.28% 78.38% +0.1%
=========================================
Files 118 119 +1
Lines 2390 2383 -7
=========================================
- Hits 1871 1868 -3
+ Misses 519 515 -4
Continue to review full report at Codecov.
|
ali-ramadhan
approved these changes
Mar 5, 2020
There was a problem hiding this comment.
Performance seems unaffected although we should be careful about CPU allocations, they seems to have gotten out of hand (same on master so this PR isn't at fault):
Julia Version 1.3.1
Commit 2d5741174c (2019-12-30 21:36 UTC)
Platform Info:
OS: Linux (x86_64-pc-linux-gnu)
CPU: Intel(R) Xeon(R) Silver 4214 CPU @ 2.20GHz
WORD_SIZE: 64
LIBM: libopenlibm
LLVM: libLLVM-6.0.1 (ORCJIT, skylake)
GPU: TITAN V
──────────────────────────────────────────────────────────────────────────────────────
Static ocean benchmarks Time Allocations
────────────────────── ───────────────────────
Tot / % measured: 173s / 51.2% 43.6GiB / 64.5%
Section ncalls time %tot avg alloc %tot avg
──────────────────────────────────────────────────────────────────────────────────────
32× 32× 32 [CPU, Float32] 10 127ms 0.14% 12.7ms 170MiB 0.59% 17.0MiB
32× 32× 32 [CPU, Float64] 10 153ms 0.17% 15.3ms 170MiB 0.59% 17.0MiB
32× 32× 32 [GPU, Float32] 10 24.4ms 0.03% 2.44ms 10.0MiB 0.03% 1.00MiB
32× 32× 32 [GPU, Float64] 10 24.2ms 0.03% 2.42ms 10.0MiB 0.03% 1.00MiB
64× 64× 64 [CPU, Float32] 10 713ms 0.81% 71.3ms 676MiB 2.35% 67.6MiB
64× 64× 64 [CPU, Float64] 10 868ms 0.98% 86.8ms 676MiB 2.35% 67.6MiB
64× 64× 64 [GPU, Float32] 10 24.8ms 0.03% 2.48ms 10.0MiB 0.03% 1.00MiB
64× 64× 64 [GPU, Float64] 10 25.2ms 0.03% 2.52ms 10.0MiB 0.03% 1.00MiB
128×128×128 [CPU, Float32] 10 5.22s 5.90% 522ms 2.64GiB 9.39% 270MiB
128×128×128 [CPU, Float64] 10 5.44s 6.14% 544ms 2.64GiB 9.39% 270MiB
128×128×128 [GPU, Float32] 10 46.3ms 0.05% 4.63ms 10.0MiB 0.03% 1.00MiB
128×128×128 [GPU, Float64] 10 45.6ms 0.05% 4.56ms 10.0MiB 0.03% 1.00MiB
256×256×256 [CPU, Float32] 10 37.4s 42.3% 3.74s 10.5GiB 37.5% 1.05GiB
256×256×256 [CPU, Float64] 10 37.7s 42.6% 3.77s 10.5GiB 37.5% 1.05GiB
256×256×256 [GPU, Float32] 10 338ms 0.38% 33.8ms 10.0MiB 0.03% 1.00MiB
256×256×256 [GPU, Float64] 10 336ms 0.38% 33.6ms 10.0MiB 0.03% 1.00MiB
──────────────────────────────────────────────────────────────────────────────────────
This was referenced Mar 5, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR refactors the time-stepping algorithm to use the "predictor velocities" abstraction in the fractional step method. This brings the implemented algorithm in line with the algorithm described in the documentation.