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

ale3d #248

Merged
merged 217 commits into from
Aug 13, 2024
Merged

ale3d #248

merged 217 commits into from
Aug 13, 2024

Conversation

ptsuji
Copy link
Collaborator

@ptsuji ptsuji commented Nov 28, 2023

Summary

  • This PR is a mergeback of ALE3D changes
    • Syncs with what's on the current ALE3D develop branch
    • Remove Windows Visual Studio files
    • Add a field to mask certain SPH points from the computeFragmentField calculation
    • Fix in SolidSPHHydroBase to turn off tensile forces when fragments are separating (allows "bouncing")
    • Fix for time step estimate due to velocity divergence in RZ space
    • Change some boost::unordered_maps to std::unordered_map or std::map to build with nvcc

AlbertNichols3 and others added 30 commits January 27, 2023 13:55
numbers as the fragment IDs. Using fragment IDs in evaluateDerivatives
to turn off forces between fragments when they are moving away from
each other.
This happens in FEusion/SPH when we update the smoothing lengths
with the scaling factor.
…ABLE_STATIC_TPL.

Even with ENABLE_STATIC_TPL=OFF, the default build sets polytope and silo extensions
to .a, so we set it to .dylib on MacOSX here.
…itlab/CI

stuff again, since the tests seem to be failing inconsistently.
cmake/SetupSpheral.cmake Outdated Show resolved Hide resolved
adayton1
adayton1 previously approved these changes Jul 29, 2024
Copy link
Member

@adayton1 adayton1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Collaborator

@mdavis36 mdavis36 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One last change on the CMake flag, after that I'm good with all the changes I can approve. We do need @jmikeowen to review this as well before merge.

cmake/SetupSpheral.cmake Outdated Show resolved Hide resolved
@ptsuji
Copy link
Collaborator Author

ptsuji commented Aug 5, 2024

@mdavis36 I believe I made the changes you requested for the CMake stuff, but I'm not sure how to change the status of that request (it still appears as "1 change requested" in the review). Can you resolve or update?

mdavis36
mdavis36 previously approved these changes Aug 6, 2024
Copy link
Collaborator

@mdavis36 mdavis36 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm happy with CS related changes, but we still want @jmikeowen to look over this and approve before merging.

@ptsuji
Copy link
Collaborator Author

ptsuji commented Aug 9, 2024

@jmikeowen I've reverted the changes to make the "mask" variable automatically registered in the state. I've also changed some of the logic in computeFragmentField to look like computeVoronoiVolume, let me know if that looks good.

adayton1
adayton1 previously approved these changes Aug 9, 2024
Copy link
Member

@adayton1 adayton1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Collaborator

@jmikeowen jmikeowen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to go again!

Copy link
Member

@adayton1 adayton1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ptsuji ptsuji merged commit 8ba2e8c into develop Aug 13, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants