merge develop and fix conflicts #4
Closed
Conversation
This file contains hidden or 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
This commit fixes #440 which will now work with any number of components.
Update apfElement.cc
the warning with GCC 12.3.0
loop variable 'm' creates a copy from type 'const std::pair<const int, {anonymous}::MeshData>' [-Werror=range-loop-construct]
when compiling with cgns enabled c++14 is enabled and these were being flagged as warnings which were promotted to errors
implement gmi_closest_point implement gmi_is_point_in_region implement gmi_is_in_closure_of Signed-off-by: Aiden Woodruff <[email protected]>
- Fixes issues on 64bit systems when LIBDIR=lib64. CMake would relink to $ORIGIN:$ORIGIN/../lib64 and all the libs would be in lib. Signed-off-by: Aiden Woodruff <[email protected]>
- Update CMake exported target install dir to CMAKE_INSTALL_LIBDIR. - Update executable destination to CMAKE_INSTALL_BINDIR. - Add quotes to directory names in case of spaces. Signed-off-by: Aiden Woodruff <[email protected]>
Signed-off-by: Aiden Woodruff <[email protected]>
Set bob install dir to CMAKE_INSTALL_LIBDIR
- retab (fix indentation). - Use apf::transpose instead of apf::invert with orthogonal frames guarantee. - Convert size field lengths to eigenvalues. - Convert eigenvalues from apf::eigen back to size field lengths. - Transpose apf::eigen eigenvectors into columns for MeshAdapt. Signed-off-by: Aiden Woodruff <[email protected]>
- Update declaration to match definition. Signed-off-by: Aiden Woodruff <[email protected]>
Implement capstone gmi functions
Fix smoothCAPAnisoSizes eigenvalues and transpose eigenvectors
Fix smoothCAPAnisoSizes parameter order
Support latest Simmetrix SimModSuite 2025.0
Added a 'bob' cmake helper function to set the C++ standard. The modifications do not change the default behavior of using C++11. The user is given the ability to increase the standard to > C++11, or enable the use of extensions, by passing CMAKE_CXX_STANDARD and CMAKE_CXX_EXTENSIONS, respectively, to cmake. Following approach given in "Professional CMake: 19th Edition".
calling it more than once could be done if the standard was decreased, otherwise, the check against CMAKE_CXX_STANDARD will fail
Clean up setting of C++ standard
use var for smoke test meshes dir
copy inputs needed for smoke tests to repo
Signed-off-by: Aiden Woodruff <[email protected]>
- My rationale is that these are old ad-hoc tests. - Removed B737 test as well. The CRE is not available so it should not be a test. Signed-off-by: Aiden Woodruff <[email protected]>
- Moved capStoneCheckParameterization because it's a good utility to confirm the curved mesh is correct. - Moved capStoneGeomTest because it can be used to examine a geometry. Signed-off-by: Aiden Woodruff <[email protected]>
- It is a copy of capStoneAnisoAdapt with a specific shock field. Signed-off-by: Aiden Woodruff <[email protected]>
- Remove capStoneAnisoAdapt which became capVol. - Move capStoneSizeFields.h to test/capVolSizeFields.h. - Update `#include` and CMake include_directories. Signed-off-by: Aiden Woodruff <[email protected]>
- Remove capstone_clis CMake file. - Remove capStoneAttachSolution.cc. I thought robin-data would be the input but couldn't figure out how to use this test. Signed-off-by: Aiden Woodruff <[email protected]>
Remove capstone_clis
fixes #465 running valgrind memcheck on a 28M upright mesh generation on 16 ranks reports no leaks on all ranks ==1567914== HEAP SUMMARY: ==1567914== in use at exit: 40 bytes in 1 blocks ==1567914== total heap usage: 293,194,361 allocs, 293,194,360 frees, 27,011,094,588 bytes allocated ==1567914== ==1567914== LEAK SUMMARY: ==1567914== definitely lost: 0 bytes in 0 blocks ==1567914== indirectly lost: 0 bytes in 0 blocks ==1567914== possibly lost: 0 bytes in 0 blocks ==1567914== still reachable: 40 bytes in 1 blocks ==1567914== suppressed: 0 bytes in 0 blocks ==1567914== Rerun with --leak-check=full to see details of leaked memory
see issue #405
Suppress warning by casting to void. Signed-off-by: Aiden Woodruff <[email protected]>
- Moves all of the files that globus uses unto Github. - Moves globus code to separate repository so that it can be reused.
|
Resolved conflicts using web interface. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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 merges scorec/core develop @ 0191626 into pcu-object-breaking.
The resulting branch can be merged back into scorec/core develop without conflicts.