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

Fixing pseudo packing functions #922

Merged
merged 28 commits into from
Mar 25, 2024
Merged

Fixing pseudo packing functions #922

merged 28 commits into from
Mar 25, 2024

Conversation

jgostick
Copy link
Member

@jgostick jgostick commented Mar 10, 2024

Fixes #916
Fixes #757
Fixes #649
Fixes #647
Fixes #575
Fixes #805

Dont' Merge This PR Yet, Wait for V3

This PR contains reimplementations of the pseudo-packing functions. I rewrote them using a totally different logic so they don't output the same results as the previous ones (quantitatively different, qualitatively the same). The new algorithms both use a queue based method and share a good chunk of code. They seem to be about the same speed, but are much easier to understand now. They also work a lot better. Not only do the original features all work now, but I have added several new args such as phi (solid volume fraction).

Anyway, because these functions return different results, it is technically mandatory to wait until releasing version 3 to merge this PR.

clearance and edges args now work fine.
@jgostick
Copy link
Member Author

Got pseudo_gravity_packing working well, the clearance and mode args now work. And adding new spheres to existing structures works...

Figure_1

Copy link

codecov bot commented Mar 12, 2024

Codecov Report

Merging #922 (d3417c0) into dev (f053893) will decrease coverage by 0.2%.
Report is 22 commits behind head on dev.
The diff coverage is 84.1%.

Additional details and impacted files
@@           Coverage Diff           @@
##             dev    #922     +/-   ##
=======================================
- Coverage   83.1%   83.0%   -0.2%     
=======================================
  Files         36      36             
  Lines       4577    4662     +85     
=======================================
+ Hits        3807    3872     +65     
- Misses       770     790     +20     

@jgostick
Copy link
Member Author

Now that we have declared the dev branch to be "version 3" I think we can merge this PR.

@jgostick jgostick merged commit 8ca4395 into dev Mar 25, 2024
15 checks passed
@jgostick jgostick deleted the fixing_pseudo_packing branch June 5, 2024 02:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment