Remove most deprecated declarations #2291
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
UpXSplitIndex and DownXSplitIndex are still used in the unit tests
|
clang-tidy review says "All clean, LGTM! 👍" |
* next: (1828 commits) Use MPI_COMM_NULL rather than nullptr Apply clang-format changes Apply clang-format changes Don't compile LaplaceXY2 with 3D metrics Apply clang-format changes Apply clang-format changes Laplacexy2 modifications Apply clang-format changes Apply clang-format changes nvcc needs toString(HYPRE_SOLVER_TYPE) nvcc now seems to need the factory flags Update fmt to latest version Apply clang-format changes Output BoutException.what() in PhysicsModel main() use hasParallelSlices Apply clang-format changes Only destroy if it exists Backgrounds don't work with parallel BCs Ensure that parallel slices exist CI: Remove unused stage from clang-tidy-review job ...
This was referenced Jul 22, 2022
* next: Apply clang-format CI: Don't update submodules (already updated) CI: Workaround for git ownership checks in container CI: Bump actions/checkout version CI: Use latest version of cmake in clang-tidy-review Add 'u' format flag to BOUT.settings output Adds a 'u' format, commenting unused options Print wether an option was marked as conditionally used
This reverts commit 21f720e.
`vecops.hxx` requires `Field/Vector` headers to be used, so may as well always include them
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -225,17 +225,13 @@ public: | |||
| // return the appropriate index. Some corners cells are actually | |||
| // sent along with the rest of the edge. This can be predicted | |||
| // based on teh value of xy[In|Out][Up|Down]Mesh_SendsInner. | |||
| if (mesh->yUpMesh && wait_any_count < 0 && mesh->communicatingY && | |||
| mesh->UpXSplitIndex() > 0) { | |||
| if (mesh->yUpMesh && wait_any_count < 0 && mesh->communicatingY) { | |||
There was a problem hiding this comment.
warning: implicit conversion 'FakeParallelMesh *' -> bool [readability-implicit-bool-conversion]
Suggested change
| if (mesh->yUpMesh && wait_any_count < 0 && mesh->communicatingY) { | |
| if ((mesh->yUpMesh != nullptr) && wait_any_count < 0 && mesh->communicatingY) { |
| *indx = wait_any_count = 0; | ||
| } else if (mesh->yDownMesh && wait_any_count < 1 && mesh->communicatingY && | ||
| mesh->UpXSplitIndex() == 0) { | ||
| } else if (mesh->yDownMesh && wait_any_count < 1 && mesh->communicatingY) { |
There was a problem hiding this comment.
warning: implicit conversion 'FakeParallelMesh *' -> bool [readability-implicit-bool-conversion]
Suggested change
| } else if (mesh->yDownMesh && wait_any_count < 1 && mesh->communicatingY) { | |
| } else if ((mesh->yDownMesh != nullptr) && wait_any_count < 1 && mesh->communicatingY) { |
| *indx = wait_any_count = 1; | ||
| } else if (mesh->yDownMesh && wait_any_count < 2 && mesh->communicatingY && | ||
| mesh->DownXSplitIndex() > 0) { | ||
| } else if (mesh->yDownMesh && wait_any_count < 2 && mesh->communicatingY) { |
There was a problem hiding this comment.
warning: implicit conversion 'FakeParallelMesh *' -> bool [readability-implicit-bool-conversion]
Suggested change
| } else if (mesh->yDownMesh && wait_any_count < 2 && mesh->communicatingY) { | |
| } else if ((mesh->yDownMesh != nullptr) && wait_any_count < 2 && mesh->communicatingY) { |
| *indx = wait_any_count = 2; | ||
| } else if (mesh->yDownMesh && wait_any_count < 3 && mesh->communicatingY && | ||
| mesh->DownXSplitIndex() == 0) { | ||
| } else if (mesh->yDownMesh && wait_any_count < 3 && mesh->communicatingY) { |
There was a problem hiding this comment.
warning: implicit conversion 'FakeParallelMesh *' -> bool [readability-implicit-bool-conversion]
Suggested change
| } else if (mesh->yDownMesh && wait_any_count < 3 && mesh->communicatingY) { | |
| } else if ((mesh->yDownMesh != nullptr) && wait_any_count < 3 && mesh->communicatingY) { |
bendudson
approved these changes
Jul 27, 2022
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.
I'm reasonably certain everything removed here is marked deprecated in v4.4, but it's plausible there's something I've missed that should be deprecated there first.
There's a small number of things that are still in use and so can't be removed yet:
FieldGenerator::generate(BoutReal x, BoutReal y, BoutReal z, BoutReal t): this basically needs the boundary conditions rewrite before we can remove this, which is upsettingMesh::UpXSplitIndex/DownXSplitIndex: used in the unit tests for the fake parallel mesh. Could be removed fromMeshand made aprotectedmethod ofBoutMeshlowpass: we changed thekeep_zonalargument frominttobool. Unfortunately,ints are implicitly convertable tobools, and theintversion, while deprecated, doesASSERT0that only 0s or 1s are passed. A better solution might be to use an enum to strongly type the argument: