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.

Sign up for GitHub

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

Jump to bottom

Update/dem #215

Merged
merged 68 commits into from
Jun 16, 2023
Merged

Update/dem #215

merged 68 commits into from
Jun 16, 2023

Conversation

jmpearl
Copy link
Collaborator

@jmpearl jmpearl commented May 8, 2023 •
edited
Loading

Summary

  • This is a significant overhaul of the DEM package (may break scripts)
  • It does the following:
    • adds solid boundary conditions to DEM package
      • infinite plane
      • finite planes (disk/rectangle)
      • finite cylinder
      • sphere and half sphere
    • moves some DEM fieldLists from phys package to nodeList
    • simplifies node generation w/ DEM (no more nPerh)
    • makes initialization on start up more robust
      • Hfield guaranteed to be appropriate
      • unique indices always valid
    • modified fast timestepping to allow variable neighbor-search buffer distances
    • fixes the "exploding" composite particle bug

ToDo :

  • Annotate RELEASE_NOTES.md with notable changes.
  • Create LLNLSpheral PR pointing at this branch. (PR#)
  • LLNLSpheral PR has passed all tests.

jmpearl added 30 commits April 1, 2023 22:33
@jmpearl
modifying overlap initialization
02d5078 
1) old implementation allowed eq overlap to be negative, now the initialize force eq overlap >= 0. 2) Shifted the if statment for efficiency, probably pretty insigificant in the grand scheme. 3) eq overlap initializer now takes a additional integer input which is used to limit the initialization to composite particle with id's greater than a specified value. This should come in handy for on the fly particle generation through a periodic work function.
@jmpearl
exposing overlap initializer to python
2d6af9a
@jmpearl
move overlap initialization to initializeOnStartUp method
7f1598e 
what was in DEM was basically a hack using the initialize method and a bool flag to get initializeOnStartUp behavior. The new implementation is more consistent with the physics package structure. I also cut out that flag since it was no longer necessary
@jmpearl
checkout point
a979b35
@jmpearl
adding method to enable on-the-fly particle generation
3e1c398
@jmpearl
script to implement and test on-the-fly composite-particle generation
cfa79eb
@jmpearl
revamping H treatment
283994f 
dem base class now initializes H from the particle radius on simulation start up. H is set such that the particle will 'see' neighbors when they are within a 'buffer distance' set through a new input neighborSearchBuffer in units of particle radii.
@jmpearl
syntax error
e8ec093
@jmpearl
exposing DEM's initializeHfield
977f863
@jmpearl
updating particleGen test for new H initialization
b68bb36
@jmpearl
LinearSpringDEM class deserves its own name
da1ce8d
@jmpearl
controller modified so DEM users don't have to instantiate a kernel
d023c58
@jmpearl
stowing
7f00ed8
@jmpearl
checkpoint on a bug hunt
54e0cf7
@jmpearl
maybe there's not a bug?
2c5167f
@jmpearl
moving fields and H initialization to nodelist
6538298
@jmpearl
moving fields and H initialization to NodeList
24f92fc
@jmpearl
check point adding contact boundaries to DEM
3c71256
@jmpearl
Merge branch 'develop' into update/DEM
d268f14
@jmpearl
adding SolidBoundaries to DEM
51642f1
@jmpearl
which to the make_shared policy format
720702a
@jmpearl
SolidBC now in DEMBase and ref'ed by update policy
454f45a 
this is designed to allow the solid bc position and velocity to be update overtime for simple moving boundaries. The user could do more complicated things with periodic work functions to control the boundary dynamics
@jmpearl
simplifying a largely redundent method in DEM
cf308fd
@jmpearl
first pass adding solid bcs to contact pipeline
e1fa2bb
@jmpearl
Merge branch 'develop' into update/DEM
8b52983
@jmpearl
DEM python exposure for solid boundaries
3fcbe32 
 also cleaned up some types and const-ing
@jmpearl
edits to comments
d570cda
@jmpearl
more comments
637d9c7
@jmpearl
simplifying eval derivs DEM LinearSpring model
d396fed
@jmpearl
DEMBase renaming contact counts and switch to unsigned int
9be6cb0
jmpearl and others added 18 commits May 8, 2023 12:33
@jmpearl
fixed omp threading bug
48f8d48 
added pybind for contact list and contactIndex struct
@jmpearl
updating DEM node generation
45f554e 
changings the switching up some things in DEM node generation to move away from nPerh-based radius definition and toward explicit user defined radii. This should make the DEM interface more straight forward.
@jmpearl
ats tests for finite solid planes
2fabeb8
@jmpearl
bug fix DEM rectangularFinitePlane
16fc6df 
needs to map back from natural coordinates to real coordinates
@jmpearl
implement velocity in DEM solid boundary
16abfa6
@jmpearl
adding cylinder solid boundary to DEM
04150a5
@jmpearl
fixing merge conficts
6c64b0b
@jmpearl
fixing cylinder implementation and python3 merge
7a7b9be
@jmpearl
renaming solidbcs
e39ae74 
this is a little more consistent w/ convention in spheral
@jmpearl
spherical bc for DEM
581f5da
@jmpearl
Merge branch 'develop' into update/DEM
83dcaa0
@jmpearl
test ats issue
6786331
@jmpearl
DEM: update 5-particle test to py3
25b95bb
@jmpearl
DEM solid bc tests updated
04052f5
@jmpearl
DEM cleans test set
7bed4b2
@jmpearl
DEM ats typo
624b28a
@jmpearl
DEM more info from check
710a71a
@jmpearl
DEM thread safety fix and fix for ats
eb764db
@jmpearl jmpearl added this to the 2023.06.0 Release milestone Jun 9, 2023
@jmpearl jmpearl requested a review from mdavis36 June 13, 2023 00:21
mdavis36
mdavis36 requested changes Jun 13, 2023
View reviewed changes
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.

Just a few empty files and some nitpicking but otherwise looks good 👍

src/DEM/CMakeLists.txt Show resolved Hide resolved
src/DEM/SolidBoundary/CMakeLists.txt Outdated Show resolved Hide resolved
src/DEM/SolidBoundary/DEMBoundaryPolicyInline.hh Outdated Show resolved Hide resolved
src/DEM/SolidBoundary/SolidBoundaryBase.hh Outdated Show resolved Hide resolved
src/DEM/SolidBoundary/SolidBoundaryBaseInline.hh Outdated Show resolved Hide resolved
@jmpearl jmpearl requested a review from jmikeowen June 14, 2023 23:30
@jmpearl jmpearl merged commit 1617379 into develop Jun 16, 2023
@mdavis36 mdavis36 deleted the update/DEM branch June 16, 2023 19:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mdavis36 mdavis36 mdavis36 approved these changes

@jmikeowen jmikeowen Awaiting requested review from jmikeowen

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2023.06.0 Release
Development

Successfully merging this pull request may close these issues.
2 participants
@jmpearl @mdavis36