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

Open
wants to merge 155 commits into
base: develop
Choose a base branch
from
Open

ale3d #248

wants to merge 155 commits into from

Conversation

ptsuji
Copy link
Collaborator

@ptsuji ptsuji commented Nov 28, 2023

Summary

  • This PR is a mergeback of ALE3D changes
    • Syncs with the what's on the current ALE3D develop branch
    • Remove Windows Visual Studio files
    • Protections to enable the serial build after the CInterface was moved out
    • 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.
@ptsuji ptsuji requested review from mdavis36 and adayton1 May 13, 2024 17:34
adayton1
adayton1 previously approved these changes May 21, 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

Comment on lines +2 to +10

if(APPLE)
set(SHARED_EXT "dylib")
set(${lib_name}_libs libpolytope.${SHARED_EXT})
endif()

if(ENABLE_STATIC_TPL)
string(REPLACE ".${SHARED_EXT}" ".a;" ${lib_name}_libs ${${lib_name}_libs})
endif()
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can we make this a more generic Macro?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Which macro do you want changed, the APPLE or SHARED_EXT?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Not the CMake variable names but creating a CMake macro/function (we define some of them in spheral/cmake/spheral/) for switching out the library extensions to reduce code duplication in each tpl file.

@@ -369,7 +371,11 @@ minimumScale() const {
result = std::min(result, (face.position() - zonePosition).magnitude2());
}
}
#ifdef USE_MPI
Copy link
Collaborator

Choose a reason for hiding this comment

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

The allReduce interface is already guarded by USE_MPI, the changes guarding all of these calls shouldn't be necessary. I think the issue here is that our usual thin interface for communicator when building without MPI support is also guarded out. Communicator headers should be included with or without MPI support in order to support the current allReduce interface.

@ptsuji
Copy link
Collaborator Author

ptsuji commented May 22, 2024

@mdavis36 for some reason I can't respond to your comment about allReduce; I've moved the Communicator.hh stuff to Utilities, and have removed all of the unnecessary ifdefs with USE_MPI.

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.

None yet

9 participants