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

Adding gravity to ibip #964

Open
wants to merge 99 commits into
base: dev
Choose a base branch
from
Open

Adding gravity to ibip #964

wants to merge 99 commits into from

Conversation

jgostick
Copy link
Member

@jgostick jgostick commented Jun 5, 2024

This PR adds a new algorithm for performing invasion percolation on images. It uses a priority-queue to provide a major speed improvement over ibip, and adds the ability to incorporate gravity borrowing inspiration from the drainage.

jgostick and others added 30 commits March 3, 2022 14:30
@jgostick
adding gravity to ibip...was quite easy actually
0d17647
@jgostick
cranking up the Bo
fff7610
@jgostick
adding heapq version
1e55419
@jgostick
working, and very fast!
52b23de
@jgostick
adding to import
450e10d
@jgostick
adding docstring
e4fc96c
@jgostick
fixing up the name==main bits
0120625
@jgostick
This now gives a nearly perfect match to original ibip
ba045ad
@jgostick
adding empty file
a1be847
@jgostick
adding imbibition func to simulations
0ce7652
@jgostick
moved more, not done yet though
e843665
@jgostick
seems to be mostly inplace, needs fine tuning though
f338290
@jgostick
Imbibition working quite well, writing tests to catch details
cdf5f72
@jgostick
Working quite well
0f3b17d
@jgostick
starting to add detailed tests
473adb6
@jgostick
Merge branch 'dev' into adding_gravity_to_ibip
0878ed3 
# Conflicts:
#	porespy/filters/_ibip.py
@jgostick
try to get heap method working in 3d
3e8b29d
@jgostick
speed comparison script
77f61f8
@Ni2M
fixed z axis in find_neighbors
3c55902
@jgostick
Merge branch 'dev' into adding_imbibition_2
e683392
@Ni2M
Updated the branch with local files
308913f
@Ni2M
invasion stopping criterion
55a5c4f
@jgostick
tidying var names
5545679
@jgostick
working, seems very fast, even without final njit
6eb006a
@jgostick
for some reason, this is faster
6094fb5
@jgostick
done, 8s on 800x800 image
74f9d5a
@jgostick
Tidying up...btw, only works for 2D atm
012bfa6
@jgostick
more tweaks
092390c
@jgostick
Merge branch 'dev' into adding_gravity_to_ibip
0b108d2 
# Conflicts:
#	porespy/simulations/__init__.py
@jgostick
added some logic to find_trapped_regions to remvoe trivially trapped …
b50591b 
…regions
@jgostick
tidy up imports
659a12b
@jgostick
augmenting spacing arg and docstring
9a24732
@jgostick
more work on new imbibition/drainage funcs [WIP]
68f81b1
@jgostick
better but not quite there yet
f484921
@jgostick
wip
4fd4497
@jgostick
fixing output of trapping
c46e38e
@jgostick
Merge branch 'dev' into adding_gravity_to_ibip
e88a727 
# Conflicts:
#	porespy/beta/__init__.py
@jgostick
updating doc string and converting to shape ndarray in generator func
3f83145
@jgostick
minor changes
8fc8e54
@jgostick
Merge branch 'dev' into adding_gravity_to_ibip
1be596f 
# Conflicts:
#	src/porespy/beta/_gdd.py
#	src/porespy/beta/_imbibition.py
#	src/porespy/simulations/_find_trapped_pixels.py
#	src/porespy/simulations/_ibip_w_gravity.py
@jgostick
gettign pixel-perfect match between ibip and qbip
9f0e02d
@jgostick
fixed bug that essentially skipped to step 2, allows perfect match wi…
07ce397 
…th QBIP
@jgostick
lot's of small improvements to match ibip
a185215
@jgostick
removing capillary pressure calc from within drainage
332b611
@jgostick
refactoring drainage/invasion as wrappers around ibop/qbip
f9d78d0
@jgostick
Adding strel to region_size, which passes it to spim.label
b7aa0b6
@jgostick
used wrong keyword for label
a572fca
@jgostick
Merge branch 'dev' into adding_gravity_to_ibip
5b932a9 
# Conflicts:
#	src/porespy/beta/_generators.py
@jgostick
playing with docstrings
44568c2
@jgostick
fiddling with things while I get warmed up
d8a841b
@jgostick
updating refs in docstring
44d6b13
@jgostick
Merge branch 'dev' into adding_gravity_to_ibip
fcc98ab
@jgostick
merge conflict from stash
da1bab0
@jgostick
working in trapped voxels on wall
16a9bb9
@jgostick
refactors, tidy-up, documentation
94cc950
@jgostick
adding some optimized sphere insertion functions to beta from the IBS…
c543ea0 
…I review
@jgostick
Merge branch 'dev' into adding_gravity_to_ibip
f38dd33
@jgostick
Merge branch 'dev' into adding_gravity_to_ibip
25eede7 
# Conflicts:
#	src/porespy/filters/_funcs.py
#	src/porespy/simulations/_drainage.py
#	src/porespy/simulations/_ibip.py
@jgostick
fixing bad merge
2a129c9
@jgostick
updating examples
071a5cf
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jgostick @Ni2M