James McClure
|
e6fa7d4065
|
add SCAL file
|
2021-12-01 08:08:16 -05:00 |
|
Thomas Ramstad
|
23189f5577
|
Clang format (#55)
Run clang-format on modules of code
|
2021-11-08 22:58:37 +01:00 |
|
James McClure
|
2ff903f4d5
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
|
2021-11-07 07:58:05 -05:00 |
|
James McClure
|
97721a9a10
|
never rescale unsteady cases
|
2021-11-07 07:57:54 -05:00 |
|
James McClure
|
ccd05a6117
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
|
2021-11-07 07:56:31 -05:00 |
|
James McClure
|
1fe39b8223
|
never rescale unsteady cases
|
2021-11-07 07:56:18 -05:00 |
|
James McClure
|
ce57491bce
|
never rescale unsteady cases
|
2021-11-07 07:55:15 -05:00 |
|
James McClure
|
11a62b4a0b
|
merge writer MRT
|
2021-11-06 09:49:21 -04:00 |
|
James McClure
|
d7822a11f6
|
merge writer MRT
|
2021-11-06 09:47:07 -04:00 |
|
James McClure
|
d926202d7f
|
update I/O format options to include hdf5
|
2021-11-06 08:06:08 -04:00 |
|
James McClure
|
a47e5c891b
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
|
2021-10-21 20:39:17 -04:00 |
|
James McClure
|
4cf2610c80
|
make visualization a public function
|
2021-10-21 20:38:18 -04:00 |
|
James McClure
|
3f746e8ed2
|
merge doc update
|
2021-10-21 20:26:21 -04:00 |
|
James McClure
|
3232f939ee
|
update to docx
|
2021-10-21 20:24:10 -04:00 |
|
Rex Zhe Li
|
4e47b0ad90
|
Merge branch 'master' into electrokinetic
|
2021-10-13 16:46:38 +11:00 |
|
Rex Zhe Li
|
b6dae6cfc2
|
fix dumb bugs;build passed
|
2021-10-13 00:33:08 -04:00 |
|
Rex Zhe Li
|
afc7d6c90e
|
add routines to save advective and electromigrational flux;CPU only;to be verified
|
2021-10-13 15:15:12 +11:00 |
|
James McClure
|
2032e7af95
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
|
2021-10-11 19:48:59 -04:00 |
|
James McClure
|
f55b946b8a
|
update corey model in greyscale
|
2021-10-08 12:10:03 -04:00 |
|
Thomas Ramstad
|
44426848c4
|
Add effective pressure
Added effective pressure 1 / k_eff to the output.
To be used in history matching of core flooding.
|
2021-10-04 14:32:09 +02:00 |
|
James McClure
|
6f5d78204a
|
updating documentation
|
2021-10-03 19:56:26 -04:00 |
|
James McClure
|
d6baecf5e2
|
fix bug in endpoint perm
|
2021-09-29 13:06:10 -04:00 |
|
Rex Zhe Li
|
3f5175c9ba
|
build passes after fixing various dumb syntax bugs;model to be verified
|
2021-09-29 02:10:35 -04:00 |
|
Rex Zhe Li
|
01499e672d
|
continue the work of storing ion diffusive flux;incomplete.
|
2021-09-29 15:41:38 +10:00 |
|
JamesEMcclure
|
d6e90e23cd
|
remove unused film terms
|
2021-09-20 09:28:18 -04:00 |
|
JamesEMcclure
|
3cf0bc67d8
|
merge dox
|
2021-09-20 09:22:38 -04:00 |
|
James McClure
|
7575d5c116
|
depcrecate internal color flow adaptor
|
2021-09-19 09:52:06 -04:00 |
|
JamesEMcclure
|
5b6628a5c1
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
|
2021-09-14 09:18:37 -04:00 |
|
Rex Zhe Li
|
c3300baf1e
|
set up reading user-specified multi-species ion concentration; to be verified
|
2021-09-14 10:53:03 +10:00 |
|
James McClure
|
50f77fb2d3
|
Merge branch 'master' into electrokinetic_UpdatedPBTol
|
2021-09-13 10:42:27 -04:00 |
|
Rex Zhe Li
|
2357cd9dfa
|
update options for tolerance_method
|
2021-09-13 09:20:52 -04:00 |
|
Rex Zhe Li
|
101105c7ae
|
print out info on what tolerance_method is used
|
2021-09-13 06:11:22 -04:00 |
|
Rex Zhe Li
|
50395a14e9
|
PoissonSolver with sum or max MSE should work now after fixing dumb bugs
|
2021-09-13 05:38:42 -04:00 |
|
Rex Zhe Li
|
65b0d12172
|
add MES_max as alternative method to check convergence;to be verified
|
2021-09-13 19:24:23 +10:00 |
|
Rex Zhe Li
|
a75ca8a132
|
Merge branch 'electrokinetic_UpdatedPBTol' of github.com:JamesEMcClure/LBPM-WIA into electrokinetic_UpdatedPBTol
|
2021-09-13 18:46:55 +10:00 |
|
Rex Zhe Li
|
d19e4f1047
|
save the work;incomplete
|
2021-09-13 18:46:44 +10:00 |
|
Rex Zhe Li
|
172f66a169
|
PoissonSolver using MSE as stopping criterion should work now
|
2021-09-13 04:45:37 -04:00 |
|
Rex Zhe Li
|
44fa670fb1
|
change convergence method to MSE
|
2021-09-13 17:53:15 +10:00 |
|
Rex Zhe Li
|
0aefd3e456
|
fix more bugs but still need to verify
|
2021-09-09 09:32:57 -04:00 |
|
Rex Zhe Li
|
878760ed0a
|
fix a few bugs and pass build; to be verified
|
2021-09-09 08:04:11 -04:00 |
|
JamesEMcclure
|
68e9548f5b
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
|
2021-09-09 06:22:36 -04:00 |
|
Rex Zhe Li
|
c74b803157
|
initialize a new convergence scheme for Poisson solver
|
2021-09-09 15:48:25 +10:00 |
|
James McClure
|
ea987e90d3
|
fix force rescale/ loop criterion
|
2021-09-08 21:42:04 -04:00 |
|
James McClure
|
a6e1abc20c
|
fix timestep / exit loop criterion
|
2021-09-08 18:44:25 -04:00 |
|
James McClure
|
5f87f8b766
|
add max/min Ca
|
2021-09-08 13:43:25 -04:00 |
|
James McClure
|
51d4fe9223
|
move FlowAdaptor
|
2021-09-04 11:25:39 -04:00 |
|
James McClure
|
0b183a98ed
|
fix capillary number bug for flux bc
|
2021-09-04 09:49:12 -04:00 |
|
JamesEMcclure
|
0be38be139
|
remove warnings for color
|
2021-09-01 10:07:27 -04:00 |
|
JamesEMcClure
|
a5a88f151c
|
Merge pull request #43 from thomaram/updates
Updates
|
2021-09-01 09:08:46 -04:00 |
|
JamesEMcclure
|
3d4a0a1f2f
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
|
2021-09-01 07:39:10 -04:00 |
|
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 |
|
Thomas Ramstad
|
f3397c9d09
|
Update relperm.csv file
Added low and high limits for effective permeability based on the effective
porosity seen by the decoupled phase. Acts as lower limit
|
2021-08-30 10:59:52 +02:00 |
|
James McClure
|
c7ddae1017
|
greyscale with corey d3q7
|
2021-08-09 08:34:10 -04:00 |
|
JamesEMcclure
|
e87141a2e8
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
|
2021-06-29 15:31:37 -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
|
0a4f7d843d
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
|
2021-06-14 16:52:36 -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 |
|
JamesEMcclure
|
09f6e40aae
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
|
2021-06-13 23:36:52 -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 |
|
JamesEMcclure
|
baedeaa2a3
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
|
2021-06-01 06:43:07 -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 |
|
JamesEMcclure
|
3742568ac9
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
|
2021-05-19 14:24:54 -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 |
|
JamesEMcclure
|
2f12032973
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
|
2021-05-17 19:10:37 -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 |
|
Rex Zhe Li
|
8e1a4a4195
|
merge master into FOM_dev
|
2021-05-05 21:46:27 -04:00 |
|
James E McClure
|
ec108ef1d1
|
Merge branch 'master' into tmp
|
2021-05-05 20:39:23 -04:00 |
|
Rex Zhe Li
|
171c122832
|
reformulate the phase field gradient and mixed gradient
|
2021-04-22 03:18:36 -04:00 |
|
Rex Zhe Li
|
f83d0ae2c5
|
GPU only;add 8th order gradient; seems to work
|
2021-04-20 03:04:44 -04:00 |
|
Rex Zhe Li
|
b6de66e36f
|
fix typos in updating debugging facility
|
2021-04-05 22:38:48 -04:00 |
|
Rex Zhe Li
|
c1d43747ce
|
update debugging facility
|
2021-04-05 21:33:35 -04:00 |
|
JamesEMcclure
|
fde6af1dc0
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
|
2021-04-04 21:02:42 -04:00 |
|
James McClure
|
65f2ed1ce7
|
Merge branch 'greyscale_dev' into FOM_dev
|
2021-03-31 10:24:32 -04:00 |
|
James McClure
|
689403a7ab
|
Merge branch 'master' into FOM_dev
|
2021-03-31 10:23:41 -04:00 |
|
Rex Zhe Li
|
ffe55133e5
|
fix some typo and build pass; need further validation
|
2021-03-30 08:50:06 -04:00 |
|
Rex Zhe Li
|
ca2595e99c
|
clean up the greyscaleColor code; GPU only; to be built and tested
|
2021-03-30 06:51:23 -04:00 |
|
JamesEMcclure
|
1e8d921f36
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
|
2021-03-26 18:33:44 -04:00 |
|
James McClure
|
8d989a5f5f
|
correct saturation change in shell aggregation
|
2021-03-26 18:23:44 -04:00 |
|
James McClure
|
3da87607f4
|
refactor morphdrain
|
2021-03-26 13:46:11 -04:00 |
|
James McClure
|
c430f159ad
|
Merge branch 'master' into FOM_dev
|
2021-03-26 09:45:17 -04:00 |
|
Rex Zhe Li
|
e73a466b5f
|
fix a few dumb typo
|
2021-03-25 08:18:22 -04:00 |
|
Rex Zhe Li
|
e4490231a1
|
fix a nuclear-level dumb typo
|
2021-03-25 02:09:31 -04:00 |
|
Rex Zhe Li
|
d1e4a84b25
|
try the old approach for phase field collision; to be built and verified
|
2021-03-25 01:52:45 -04:00 |
|
James McClure
|
1fccfc7881
|
Merge branch 'master' into greyscale_dev
|
2021-03-24 21:47:56 -04:00 |
|
JamesEMcclure
|
0b03f9bd5c
|
fix merge conflict
|
2021-03-24 21:32:08 -04:00 |
|
James McClure
|
1ddf5e709e
|
refactor analysis to take color model as argument
|
2021-03-24 21:19:53 -04:00 |
|
Rex Zhe Li
|
0f94439a6b
|
1.revised relations of surface tension and W;2.reintroduce theta for better modele tuning;3.put chemical potential in debug output
|
2021-03-24 21:02:34 -04:00 |
|
James McClure
|
d913b9bdc8
|
added visualization capability for Lee model
|
2021-03-21 00:15:23 -04:00 |
|
James McClure
|
9f9b0dbffe
|
adding functions to get data for analysis routines
|
2021-03-20 22:24:28 -04:00 |
|
James McClure
|
daba5c7132
|
clean up arguments for Free Lee
|
2021-03-20 13:13:00 -04:00 |
|
James McClure
|
e8124f606c
|
working bubble for FreeLee
|
2021-03-19 20:54:29 -04:00 |
|
James McClure
|
c1cd959da6
|
D3Q7 Lee model (looks anisotropic)
|
2021-03-18 14:51:26 -04:00 |
|
James McClure
|
b828f6e5e6
|
updating mixed gradient test
|
2021-03-15 12:58:24 -04:00 |
|
James McClure
|
aa04ad4898
|
fixed wide halo bug with lee model
|
2021-03-14 13:02:55 -04:00 |
|
Rex Zhe Li
|
3ed949efb1
|
slightly change the implementation of capillary penalty, to be built and tested
|
2021-03-08 22:28:19 -05:00 |
|
Rex Zhe Li
|
5645f6125f
|
add debug output for greyscale potential
|
2021-03-08 20:39:37 -05:00 |
|
Rex Zhe Li
|
1ff5951ce0
|
build pass; model to be validated
|
2021-03-03 20:53:36 -05:00 |
|
Rex Zhe Li
|
6aeb038fce
|
update the cap penalty formulation; to be built and verified
|
2021-03-03 20:25:26 -05:00 |
|
Rex Zhe Li
|
dfac3e1349
|
continue to add capillary penalty to pressure; to be compiled and tested
|
2021-02-28 18:27:16 -05:00 |
|
Rex Zhe Li
|
1a393ab266
|
fix typo and build pass
|
2021-02-25 21:25:29 -05:00 |
|
Rex Zhe Li
|
99f1d9b727
|
add a test routine for mixed gradient
|
2021-02-25 20:30:48 -05:00 |
|
Rex Zhe Li
|
aba83e5829
|
Merge branch 'FOM_dev' of github.com:JamesEMcClure/LBPM-WIA into FOM_dev
|
2021-02-15 18:33:15 -05:00 |
|
Rex Zhe Li
|
11d99560ff
|
corrected the phase field loading and removed a wrong factor in mixed-grad
|
2021-02-15 18:33:07 -05:00 |
|
James McClure
|
16fe8ccbc3
|
Merge branch 'FOM' of github.com:JamesEMcClure/LBPM-WIA into FOM
|
2021-02-12 14:27:55 -05:00 |
|
James McClure
|
317f5f3bbe
|
add SCAL wetting convention
|
2021-02-12 14:27:49 -05:00 |
|
Mark Berrill
|
5c27e3830a
|
Fixing compile errors without MPI
|
2021-02-12 13:43:26 -05:00 |
|
James McClure
|
da55748d30
|
update to flow adapter
|
2021-02-12 09:10:54 -05:00 |
|
James McClure
|
650309ffa6
|
added FlowAdapter class
|
2021-02-11 14:31:29 -05:00 |
|