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

Pull request to merge MAGNET into dev branch #975

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

Pull request to merge MAGNET into dev branch #975

wants to merge 141 commits into from

Conversation

mkaguer
Copy link
Contributor

@mkaguer mkaguer commented Jul 10, 2024

No description provided.

@mkaguer
Removed reduce_peaks from _snows
e3e5a34
@mkaguer
Created new _magnet file including filters for magnet extraction
d77cd32
@mkaguer
Now importing filters from _magnet
8d5cedc
@mkaguer
Added unit tests
b2a68a8
@mkaguer
Fixed two pores with same number bug
18b2e5c
@mkaguer
Remove properties from spheres_to_network that are nonsensical
dcad569
@mkaguer
ensur the shape of t_conns is nt by 2
d0349fe
@mkaguer
remove phases from spheres_to_network
6130425
@mkaguer
Added if " __name__" == "__main__" simualtion
a429ac9
@mkaguer
Added parallelization to loops using dask
7c568f2
@mkaguer
Delete junctions with dt < 3
282021a
@mkaguer
Remove erroneous P12 definition
559299a
@mkaguer
Prevent pores from being inserted in constrictions
4460691
@mkaguer
Added simulation to end of file for testing
456d447
@mkaguer
Deleted pores with dt < 3 along long throats
b11626f
@mkaguer
Remove print(d) line
15307b3
@mkaguer
Merge branch 'MAGNET_Mike' into MAGNET_fix_bugs
8aadd99 
# Conflicts:
#	porespy/filters/_magnet.py
@mkaguer
Attempted to fix throats, almost!
29272f9
@mkaguer
Fixed missing throats
cdbabd1
@mkaguer
Merge branch 'dev' into MAGNET_Mike
1f6de58
@mkaguer
Fixed magnet to work with 3D images
15a2bef
@mkaguer
use fft to find junctions
c37d299
@mkaguer
cleaned up find_pore_bodies and find_throat_skeleton
8850ba7
@mkaguer
simplified spheres_to_network in order to speed up
9ad85e5
@mkaguer
Updated test simulation to match changes to functions
bca6f11
@mkaguer
Use Pn_l = Pn_l[0:2] for now
69dac56
@mkaguer
Removed volume and equivalent diamter and added radius
bef86c7
@mkaguer
removed get_tqdm
a7ed3c1
@mkaguer
replace insert_sphere with _insert_disk_at_points
7058112
@mkaguer
Reshape according to number of dimensions
bbedc63
mkaguer and others added 30 commits October 12, 2023 18:38
@mkaguer
Added magnet permeability script and berea.raw image
24280ca
@jgostick
some housekeeping
0bcfcc1
@jgostick
testing on blobs
a1e0023
@jgostick
combing through code
0923740
@jgostick
Merge branch 'dev' into MAGNET_Mike
a0a6f52
@jgostick
adding few changes
f27c82c
@jgostick
adding a big overall script for bentheimer
72f75e4
@mkaguer
new _magnet file with changes discussed on feb 22 with Jeff
4c1a623
@mkaguer
Added get_throat_area method using random walk
62b13e8
@mkaguer
Cleaned up get_throat_area code
1939fd6
@mkaguer
Added adaptive stepping to walk by using dt
36ab54e
@mkaguer
Included throat_area calc in MAGNET wrapper
9d7e724
@mkaguer
Cleaned up magnet wrapper function
803db20
@mkaguer
Cleaned up pore and throat properties in junctions_to_network
dec1cb3
@mkaguer
Cleaned up some remaining FIXME items in _magnet
a2d9e70
@mkaguer
calculate inscribed throat diameter using F_approx
869974a
@mkaguer
Wrote walk in JIT
3612bc3
@mkaguer
Return minimum throat area with magnet extraction
26fce0e
@mkaguer
Rename clipped diameter to equivalent diameter
991b8c3
@mkaguer
Defined MAGNET arguments explicitly for easier debugging
6c243f9
@mkaguer
Edited docstring on walk function
f660c99
@mkaguer
Measuring time it takes to calculate area and print
f0a77c8
@mkaguer
speed up dt and maximum filter by chunking
5dcfef4
@mkaguer
If dt is calculated in find_throat_junctions, use parallel
1b48f80
@mkaguer
Use dt_max for finding pore diameters
c5c7792
@mkaguer
Merge branch 'dev' into MAGNET_Mike
3f83286 
# Conflicts:
#	src/porespy/networks/Berea.raw
#	src/porespy/networks/MAGNET_permeability.py
#	src/porespy/networks/__init__.py
#	src/porespy/networks/_magnet.py
#	src/porespy/networks/script_magnet2D.py
#	src/porespy/networks/script_magnet3D.py
#	src/porespy/networks/script_magnet_steps.py
@mkaguer
Rmoved some scripts that were being ued to test magnet
0fd2e3e
@mkaguer
Removed a berea image
7bb2a4e
@mkaguer
magnet now returns a results object
a2354a9
@mkaguer
Wrote a bunch of unit tests for magnet
12580b2
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.
2 participants
@mkaguer @jgostick