James McClure
|
3269a5c2e6
|
fix MLUPs in color model
|
2021-09-01 07:09:45 -04:00 |
|
James McClure
|
81c80ff0f4
|
compiler warnings
|
2021-08-31 20:32:02 -04:00 |
|
James McClure
|
3526c0c9d9
|
Merge branch 'FOM_dev'
|
2021-08-31 07:56:04 -04:00 |
|
James McClure
|
60f4883885
|
removing warnings and errors
|
2021-08-31 07:55:43 -04:00 |
|
James McClure
|
f908e6f8ee
|
erge branch 'master' into FOM_dev
|
2021-08-30 11:49:38 -04:00 |
|
James McClure
|
68d678f4fb
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
|
2021-08-30 08:23:16 -04:00 |
|
James McClure
|
c7ddae1017
|
greyscale with corey d3q7
|
2021-08-09 08:34:10 -04:00 |
|
Rex Zhe Li
|
de909820f8
|
merge master into FOM_dev
|
2021-06-27 19:53:52 -04:00 |
|
James McClure
|
66ac708cfb
|
troubleshoot bug with flooding protocol
|
2021-06-23 13:21:38 -04:00 |
|
JamesEMcclure
|
1d50e760fc
|
add film estimates to relperm.csv
|
2021-06-21 10:26:13 -04:00 |
|
James McClure
|
e774a824a8
|
transition to film terms in relperm.csv
|
2021-06-21 09:07:51 -04:00 |
|
JamesEMcclure
|
e8da961cae
|
update greyscale model and kill warnings
|
2021-06-16 15:02:47 -04:00 |
|
JamesEMcclure
|
b4f4607db0
|
Merge branch 'master' into greyscale_dev
|
2021-06-16 13:45:13 -04:00 |
|
JamesEMcclure
|
898b209c94
|
add water seed protocol to flow adaptor
|
2021-06-16 10:28:46 -04:00 |
|
JamesEMcclure
|
b856544341
|
add shell aggregation to FlowAdaptor
|
2021-06-15 16:22:13 -04:00 |
|
JamesEMcclure
|
d2d12af0f4
|
remove debug code from FlowAdaptor
|
2021-06-15 14:35:33 -04:00 |
|
JamesEMcclure
|
d70bcf5c85
|
set flux for core flooding protocol
|
2021-06-15 14:34:26 -04:00 |
|
JamesEMcclure
|
7072ede5a4
|
add image sequence to FlowAdaptor
|
2021-06-14 16:33:24 -04:00 |
|
JamesEMcclure
|
792310074d
|
remove debugging code from flow adapter
|
2021-06-14 13:08:28 -04:00 |
|
James McClure
|
2dd652d495
|
updates to fractional flow protocol
|
2021-06-11 15:56:29 -04:00 |
|
James McClure
|
b6b0239cd7
|
adding centrifuge / core flooding protocol
|
2021-06-11 13:41:26 -04:00 |
|
JamesEMcclure
|
5d4a9b67dd
|
debugging fracflow
|
2021-06-10 15:30:14 -04:00 |
|
JamesEMcclure
|
9d2c46ee31
|
debugging flux
|
2021-06-10 10:25:08 -04:00 |
|
JamesEMcclure
|
544f6af217
|
set max for mass change
|
2021-06-09 16:29:15 -04:00 |
|
JamesEMcclure
|
6985aa7647
|
kill more warnings
|
2021-06-09 15:53:04 -04:00 |
|
JamesEMcclure
|
7af46f30e6
|
fix compiler warnings
|
2021-06-09 14:52:58 -04:00 |
|
JamesEMcclure
|
f0f9d6405e
|
fix compiler warnings
|
2021-06-09 14:40:07 -04:00 |
|
JamesEMcclure
|
a749ddd52d
|
clean up some compile warnings
|
2021-06-09 11:12:49 -04:00 |
|
James McClure
|
d4655d2dab
|
add option to switch inlet layer phase
|
2021-06-09 08:23:31 -04:00 |
|
Rex Zhe Li
|
774d7e6349
|
add preset Sn and Sw for greynodes; to be built and verified.
|
2021-06-09 02:32:44 -04:00 |
|
James McClure
|
9b0b5d2262
|
color model tweaks
|
2021-05-28 10:20:13 -04:00 |
|
James McClure
|
44c45d277f
|
flatten mass for fractional flow protocol
|
2021-05-27 16:29:44 -04:00 |
|
Rex Zhe Li
|
803f907edd
|
downgrade CMake version to 3.10.0; fix minor bugs and build
|
2021-05-25 03:05:46 -04:00 |
|
Rex Zhe Li
|
536fc6e8c0
|
update ion flux BC; to be built and tested
|
2021-05-25 01:59:24 -04:00 |
|
Rex Zhe Li
|
6db8c554bb
|
merge FOM into FOM_dev
|
2021-05-24 22:34:28 -04:00 |
|
James McClure
|
ee34677826
|
xMerge branch 'master' into FOM_dev
|
2021-05-20 11:38:05 -04:00 |
|
Rex Zhe Li
|
c7c36b5e86
|
fix minor bug in unit conversion in PoissonSolver
|
2021-05-20 09:21:55 -04:00 |
|
Rex Zhe Li
|
3de437eddf
|
Merge branch 'FOM_dev' of github.com:JamesEMcClure/LBPM-WIA into FOM_dev
|
2021-05-20 09:16:41 -04:00 |
|
Rex Zhe Li
|
de3ccffb71
|
fix minor bug in unit conversion in StokesSolver
|
2021-05-20 08:25:50 -04:00 |
|
Rex Zhe Li
|
ca6a6f054e
|
fix minor bug in unit conversion in PoissonSolver
|
2021-05-20 08:23:35 -04:00 |
|
James McClure
|
782b55b389
|
rough version of fractional flow simulator
|
2021-05-19 14:14:32 -04:00 |
|
Rex Zhe Li
|
a32179c87d
|
fix minor memory declare bug
|
2021-05-17 20:26:16 -04:00 |
|
James McClure
|
07af06a7cd
|
Merge branch 'FOM'
|
2021-05-17 14:10:56 -04:00 |
|
James McClure
|
a0ed357223
|
fix freelee hip
|
2021-05-17 14:05:42 -04:00 |
|
Mark Berrill
|
3cdfb7caf6
|
Minor changes to PoissonSolver
|
2021-05-17 12:26:29 -04:00 |
|
Mark Berrill
|
a2b22e5e47
|
Fixing bug in PoissonSolver
|
2021-05-17 12:00:40 -04:00 |
|
Rex Zhe Li
|
cd2bcfba85
|
build pass; TODO: verify the slippingBC model
|
2021-05-15 02:27:02 -04:00 |
|
Rex Zhe Li
|
fee3d9eadc
|
save unfinished work; to be built and tested
|
2021-05-11 22:25:05 -04:00 |
|
Rex Zhe Li
|
c7b6ac7290
|
make minor change so MPI barrier is in the right place now
|
2021-05-07 03:18:31 -04:00 |
|
Rex Zhe Li
|
ad5d428ce3
|
clean redundant code in Poisson solver
|
2021-05-07 01:54:45 -04:00 |
|