0d17647

adding gravity to ibip...was quite easy actually

jgostick Mar 3, 2022

fff7610

cranking up the Bo

jgostick Mar 4, 2022

1e55419

adding heapq version

jgostick Mar 7, 2022

52b23de

working, and very fast!

jgostick Mar 7, 2022

450e10d

adding to import

jgostick Mar 7, 2022

e4fc96c

adding docstring

jgostick Mar 7, 2022

0120625

fixing up the name==main bits

jgostick Mar 7, 2022

ba045ad

This now gives a nearly perfect match to original ibip

jgostick Mar 8, 2022

a1be847

adding empty file

jgostick Sep 9, 2022

0ce7652

adding imbibition func to simulations

jgostick Sep 9, 2022

e843665

moved more, not done yet though

jgostick Sep 9, 2022

f338290

seems to be mostly inplace, needs fine tuning though

jgostick Sep 9, 2022

cdf5f72

Imbibition working quite well, writing tests to catch details

jgostick Sep 16, 2022

0f3b17d

Working quite well

jgostick Sep 16, 2022

473adb6

starting to add detailed tests

jgostick Sep 19, 2022

0878ed3

Merge branch 'dev' into adding_gravity_to_ibip

jgostick Nov 7, 2022

3e8b29d

try to get heap method working in 3d

jgostick Nov 8, 2022

77f61f8

speed comparison script

jgostick Jan 9, 2023

3c55902

fixed z axis in find_neighbors

Ni2M Jan 12, 2023

e683392

Merge branch 'dev' into adding_imbibition_2

jgostick Mar 15, 2023

308913f

Updated the branch with local files

Ni2M Mar 23, 2023

55a5c4f

invasion stopping criterion

Ni2M Mar 31, 2023

5545679

tidying var names

jgostick May 11, 2023

6eb006a

working, seems very fast, even without final njit

jgostick Jun 29, 2023

6094fb5

for some reason, this is faster

jgostick Jun 29, 2023

74f9d5a

done, 8s on 800x800 image

jgostick Jun 29, 2023

012bfa6

Tidying up...btw, only works for 2D atm

jgostick Jun 29, 2023

092390c

more tweaks

jgostick Jun 29, 2023

0b108d2

Merge branch 'dev' into adding_gravity_to_ibip

jgostick Jun 29, 2023

b50591b

added some logic to find_trapped_regions to remvoe trivially trapped …

jgostick Jun 30, 2023

323b007

Fixing importent edge-case / bug in find_trapped_region when invasion…

jgostick Jul 1, 2023

fed34d3

adding some njit stuff to ibip+g

jgostick Jul 1, 2023

d10e08b

removing name=main stuff

jgostick Jul 6, 2023

cfb5d65

this is now pixel perfect with previous version, but many X faster

jgostick Jul 7, 2023

ed2f482

removed all the make disk business, now fast and clean

jgostick Jul 8, 2023

f1e085e

making size and pressure arrays optional

jgostick Jul 8, 2023

f8af6c3

touchups

jgostick Jul 10, 2023

aad2227

adding ability to specify mask, seems to work

jgostick Jul 10, 2023

9bbcdf7

changing step counter to only increment if something is actually added

jgostick Jul 10, 2023

86a14cf

Merge branch 'dev' into adding_gravity_to_ibip

jgostick Jul 11, 2023

9dce14b

actually works in 3D!...though noticeably slower

jgostick Jul 12, 2023

69e496f

fixed poor speed on 3D images

jgostick Jul 12, 2023

0611fdd

adding step number to queue to break ties

jgostick Jul 24, 2023

12377fb

new find_trapped_regions using reverse ip

jgostick Jul 31, 2023

a603655

tidying up

jgostick Jul 31, 2023

a805c18

Merge branch 'dev' into adding_gravity_to_ibip

jgostick Aug 25, 2023

66cce90

house keeping

jgostick Aug 29, 2023

daf8658

allowing residual in drainge function

jgostick Sep 9, 2023

da7a821

finally got it, I think

jgostick Sep 9, 2023

34b07c4

fixing mask in pc_curve

jgostick Sep 10, 2023

bb6f7e4

final touches on drainage2

jgostick Sep 10, 2023

2efa5fd

Merge branch 'dev' into adding_imbibition_2

jgostick Sep 10, 2023

16e60f9

battling with imbibition again!

jgostick Sep 10, 2023

9a705a1

fiddling with printout and plots

jgostick Sep 10, 2023

f97a780

allowing return_seq and return_sizes as optional

jgostick Sep 11, 2023

e060da6

seems tight, but on wrong side of drainage curve

jgostick Sep 11, 2023

f72ebc6

Merge branch 'adding_imbibition_2' into adding_gravity_to_ibip

jgostick Sep 11, 2023

e3bc580

added drainage_dt method to give a solid reference implementation

jgostick Sep 11, 2023

2138e5f

optionally return satn from imbibition

jgostick Sep 11, 2023

28c7d0c

adding residual to reference dt implementation

jgostick Sep 11, 2023

eb89762

adding drainage_dt to drainage2 file

jgostick Sep 11, 2023

72df66b

tidying drainage_dt file, though it's not imported

jgostick Sep 11, 2023

4248cc7

drainge matches drainage_dt perfect.

jgostick Sep 11, 2023

e8749da

moved drainage_dt to drainage2 file, so deleting this

jgostick Sep 11, 2023

aa95571

adding docstring to drainge_dt

jgostick Sep 11, 2023

ca48dbc

dt implementation of imbibition, almost working

jgostick Sep 12, 2023

3d24eb2

imbibition is working perfectly

jgostick Sep 12, 2023

d55cedf

returning sequence automatically

jgostick Sep 12, 2023

862ec21

working in residual in imbibition

jgostick Sep 13, 2023

659a12b

tidy up imports

jgostick Oct 2, 2023

9a24732

augmenting spacing arg and docstring

jgostick Oct 2, 2023

68f81b1

more work on new imbibition/drainage funcs [WIP]

jgostick Oct 2, 2023

f484921

better but not quite there yet

jgostick Oct 2, 2023

4fd4497

wip

jgostick Oct 3, 2023

c46e38e

fixing output of trapping

jgostick Oct 3, 2023

e88a727

Merge branch 'dev' into adding_gravity_to_ibip

jgostick Feb 29, 2024

3f83145

updating doc string and converting to shape ndarray in generator func

jgostick Mar 6, 2024

8fc8e54

minor changes

jgostick Mar 10, 2024

1be596f

Merge branch 'dev' into adding_gravity_to_ibip

jgostick Mar 13, 2024

9f0e02d

gettign pixel-perfect match between ibip and qbip

jgostick Mar 14, 2024

07ce397

fixed bug that essentially skipped to step 2, allows perfect match wi…

jgostick Mar 15, 2024

a185215

lot's of small improvements to match ibip

jgostick Mar 15, 2024

332b611

removing capillary pressure calc from within drainage

jgostick Mar 15, 2024

f9d78d0

refactoring drainage/invasion as wrappers around ibop/qbip

jgostick Mar 19, 2024

b7aa0b6

Adding strel to region_size, which passes it to spim.label

jgostick Mar 21, 2024

a572fca

used wrong keyword for label

jgostick Mar 21, 2024

5b932a9

Merge branch 'dev' into adding_gravity_to_ibip

jgostick Mar 26, 2024

44568c2

playing with docstrings

jgostick Mar 26, 2024

d8a841b

fiddling with things while I get warmed up

jgostick Mar 26, 2024

44d6b13

updating refs in docstring

jgostick Mar 26, 2024

fcc98ab

Merge branch 'dev' into adding_gravity_to_ibip

jgostick Mar 28, 2024

da1bab0

merge conflict from stash

jgostick Mar 28, 2024

16a9bb9

working in trapped voxels on wall

jgostick Mar 29, 2024

94cc950

refactors, tidy-up, documentation

jgostick Apr 3, 2024

c543ea0

adding some optimized sphere insertion functions to beta from the IBS…

jgostick Apr 11, 2024

f38dd33

Merge branch 'dev' into adding_gravity_to_ibip

jgostick Apr 11, 2024

25eede7

Merge branch 'dev' into adding_gravity_to_ibip

jgostick Jun 10, 2024

2a129c9

fixing bad merge

jgostick Jun 10, 2024

071a5cf

updating examples

jgostick Jun 10, 2024

361edb8

edits to drainage

jgostick Jun 13, 2024

c137db3

improving plotting, found bug in residual

jgostick Jul 1, 2024

ea1e61e

fixed bug in find_trapped_regions

jgostick Jul 1, 2024

56a5f57

drainage now seems to work for w/wo trapping and w/wo residual

jgostick Jul 1, 2024

8e8cf4d

promoting elevation to generators

jgostick Jul 1, 2024

e895cea

removing drainage from beta module since version in simulations is mo…

jgostick Jul 1, 2024

3823b9d

touchups to drainage

jgostick Jul 1, 2024

bb55e29

removing deprecated ibip funcs from filters

jgostick Jul 1, 2024

55a1d4d

deleting find_trapped_pixels file since this is all in qbip file

jgostick Jul 1, 2024

e42de14

working on imbibition [wip]

jgostick Jul 2, 2024

6eb4bfa

Seems to work...again

jgostick Jul 5, 2024

c9f2727

adjusting drainage to do no access limitations, and optionally return…

jgostick Jul 5, 2024

ec63caf

no inlets means no access limitations in drainage

jgostick Jul 7, 2024

c6d9bee

wip

jgostick Jul 16, 2024

813625a

fixed bug in seq_to_satn when mode was imbibition

jgostick Aug 7, 2024

aa7b9c0

catching use of pyedt

jgostick Aug 7, 2024

9e643e1

trying to understand why tests are giving different results [WIP]

jgostick Aug 12, 2024

d062538

Merge branch 'dev' into adding_gravity_to_ibip

jgostick Aug 12, 2024

4370dd4

got qbip and ibip agreeing, but ibip is failing it's old tests

jgostick Aug 22, 2024

d29b498

updated tests to reflect the new ibip code, which does not convert dt…

jgostick Aug 22, 2024

679a4e8

fixing api on integration tests

jgostick Aug 22, 2024

3ffcda6

fixing api in visualization tests

jgostick Aug 22, 2024

499a17c

fixing spacing error

jgostick Aug 22, 2024

8c76df9

more spacing changes

jgostick Aug 22, 2024

5faf05b

skipping fmm test if np>2

jgostick Aug 22, 2024

0a1c243

Merge branch 'dev' into adding_gravity_to_ibip

jgostick Aug 24, 2024

e84d83e

removing gdd tests

jgostick Aug 24, 2024

23dff1b

moving funcs from qbip file to new home(s)

jgostick Aug 25, 2024

dfaf2df

tidying up loose ends after big move

jgostick Aug 25, 2024

cd27cec

updating docstring for rev func

jgostick Aug 25, 2024

373b739

adding tables to docstrings in several places

jgostick Aug 25, 2024

6b4423a

Updating tests after moves

jgostick Aug 25, 2024

ea40305

updating import of find_regions2

jgostick Aug 26, 2024

2ac6247

adding __all__ to imports of marching_cubes/squares files

jgostick Aug 26, 2024

3402325

Updating show_docstring func (a little off topic for this PR)

jgostick Aug 26, 2024

a1aa821

fixing typos

jgostick Aug 26, 2024

4255c3d

adding tests for the qbip, ibip, and ibop functions

jgostick Aug 27, 2024

71725bb

fixing imports in integration tests

jgostick Aug 27, 2024

80ba868

removing speed test file

jgostick Aug 27, 2024

da3dd3e

adding test for elevation, adding # pragma: no cover in places

jgostick Aug 27, 2024

b80ee21

adding test for bond_number metric

jgostick Aug 27, 2024

805ee92

convert voxelsize to voxel_size throughout

jgostick Aug 27, 2024

85d10cb

readding imshow to top level

jgostick Aug 27, 2024

8e6ed3d

updating examples, docstrings and tests

jgostick Sep 9, 2024

459d9ed

added copy to find_trapped_regions

jgostick Sep 11, 2024

96c004e

typo

jgostick Sep 11, 2024

c126b3b

Touch ups to ibip, ibop, and qbop to get all tests passing

jgostick Sep 15, 2024

c1996f6

tidying notebooks

jgostick Sep 15, 2024

9bb7e3a

fixed an example and an integration test

jgostick Sep 15, 2024

2fa610f

updating failing examples that used filters.ibip instead of simulatio…

jgostick Sep 16, 2024