Feature/gridedit 588 change to bounded array #182
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
Smaller changes to be able to build using gcc 13.1. Added missing header Changed unique_ptr with "new char" to std::array Added default_delete to shared_ptr
In a 2d mesh, for the edges-faces array, change the std::vector to a std::array constrained with size 2. This change is ok, because each edge can only have, at most, two neighbouring faces (boundary edges will have 1). This results in fewer allocations of small (size 2) vectors and a small performace improvement.
Changed interface for IsEqual, the third parameter is now the relative tolerance rather than a tolerance multiplier. This gives a more meaningful statement if the value is passed and saves on a multiply in the function. FindFacesRecursive Replaced some emplace_back with push_back, this has a small improvement on performance. ComputeFaceCircumenter Replaced vector with array, the maximum size is known at compile time.
ahmad-el-sayed
requested changes
Jun 29, 2023
tools/test_utils/src/MakeMeshes.cpp
Outdated
| std::shared_ptr<int> edge_nodes(new int[num_edges * 2]); | ||
| std::shared_ptr<int> edge_type(new int[num_edges]); | ||
| nc_inq_dim(ncidp, dimid, read_name.data(), &num_edges); | ||
| std::shared_ptr<double> node_x(new double[num_nodes], std::default_delete<double[]>()); |
There was a problem hiding this comment.
Can't we simply use vectors instead of shared_ptr? this requires using the data method instead of get in the calls nc_* below.
There was a problem hiding this comment.
Yes, I did think about that, but went for the least disruptive option.
I will change these to std::vector.
There was a problem hiding this comment.
can we use make_shared, and avoid new?
tools/test_utils/src/MakeMeshes.cpp
Outdated
| @@ -251,8 +253,8 @@ MakeRectangularMeshForApiTesting( | |||
| auto num_x = num_columns + static_cast<size_t>(1); | |||
|
|
|||
| std::vector<std::vector<size_t>> indicesValues(num_x, std::vector<size_t>(num_y)); | |||
| std::shared_ptr<double> node_x(new double[num_x * num_y]); | |||
| std::shared_ptr<double> node_y(new double[num_x * num_y]); | |||
| std::shared_ptr<double> node_x(new double[num_x * num_y], std::default_delete<double[]>()); | |||
tools/test_utils/src/MakeMeshes.cpp
Outdated
| std::shared_ptr<double> node_x(new double[num_x * num_y]); | ||
| std::shared_ptr<double> node_y(new double[num_x * num_y]); | ||
| std::shared_ptr<double> node_x(new double[num_x * num_y], std::default_delete<double[]>()); | ||
| std::shared_ptr<double> node_y(new double[num_x * num_y], std::default_delete<double[]>()); |
tools/test_utils/src/MakeMeshes.cpp
Outdated
| @@ -267,7 +269,7 @@ MakeRectangularMeshForApiTesting( | |||
| } | |||
| } | |||
|
|
|||
| std::shared_ptr<int> edge_nodes(new int[((num_x - 1) * num_y + (num_y - 1) * num_x) * 2]); | |||
| std::shared_ptr<int> edge_nodes(new int[((num_x - 1) * num_y + (num_y - 1) * num_x) * 2], std::default_delete<int[]>()); | |||
In places where compilation failed using gcc 13.1
lucacarniato
approved these changes
Jun 29, 2023
lucacarniato
requested changes
Jun 29, 2023
tools/test_utils/src/MakeMeshes.cpp
Outdated
| std::shared_ptr<int> edge_nodes(new int[num_edges * 2]); | ||
| std::shared_ptr<int> edge_type(new int[num_edges]); | ||
| nc_inq_dim(ncidp, dimid, read_name.data(), &num_edges); | ||
| std::shared_ptr<double> node_x(new double[num_nodes], std::default_delete<double[]>()); |
There was a problem hiding this comment.
can we use make_shared, and avoid new?
ahmad-el-sayed
approved these changes
Jun 29, 2023
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.
No description provided.