OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,509 Commits 10 Branches 2 Tags 13 MiB
master
Commit Graph

895 Commits

Author SHA1 Message Date
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
Rex Zhe Li
e34170d232 built passed 2021-02-08 00:00:26 -05:00
Rex Zhe Li
98491ccd80 save the work2; to be complied and tested 2021-02-07 23:50:17 -05:00
Rex Zhe Li
9ddf949a9e save the work; to be compiled and tested 2021-02-07 23:37:26 -05:00
Rex Zhe Li
1f08c9a0b6 save the work; add debugging output 2021-02-07 20:08:38 -05:00
Rex Zhe Li
2ed34592d0 Merge branch 'FOM' into FOM_dev 2021-02-01 00:19:55 -05:00
Rex Zhe Li
3a6edc365d build pass; ongoing model validation 2021-01-31 21:26:03 -05:00
Rex Zhe Li
e22de8ae7e save the work;to be built and tested 2021-01-31 19:06:07 -05:00
Mark Berrill
90ba7ed65a Fixing bug with analysis 2021-01-22 10:05:16 -05:00
James McClure
c350e2b45e demo for performance in MRT model 2021-01-20 18:25:29 -05:00
James McClure
d442f890f6 write solid info to file in color 2021-01-19 10:50:12 -05:00
James McClure
ff946a91d8 wetting fluctuation from laplacian 2021-01-19 10:30:39 -05:00
Rex Zhe Li
4085deb5e3 save the work 2021-01-18 23:37:08 -05:00
Rex Zhe Li
fef81a0e47 resolve merge conflicts 2021-01-18 22:51:16 -05:00
Rex Zhe Li
4690adb104 save the work 2021-01-18 21:30:27 -05:00
James McClure
9bc8100a1d debugging wide halo 2021-01-15 16:33:57 -05:00
Rex Zhe Li
e0416a676c merge with electrokinetic and resolve merge conflicts 2021-01-14 05:20:47 -05:00
JamesEMcclure
a066fa6606 merge Lee model 2021-01-13 22:06:08 -05:00
JamesEMcclure
0fe3125833 merging multi-halo 2021-01-13 21:44:23 -05:00
James McClure
64b49f720e merge complete / cpu tests 2021-01-06 11:58:43 -05:00
Rex Zhe Li
c9fadc30c9 Merge branch 'electrokinetic' of github.com:JamesEMcClure/LBPM-WIA into electrokinetic 2021-01-06 01:04:08 -05:00
Rex Zhe Li
432fab95b3 test done;add sine and cosine voltage input for Poisson solver 2021-01-06 01:03:18 -05:00
James McClure
7f4f74779c fix the build 2021-01-05 18:43:44 -05:00
James McClure
474c829e41 refactor work 2021-01-05 15:50:07 -05:00
James McClure
5bcc10c5fb refactor new models to FOM 2021-01-05 13:51:32 -05:00
James McClure
77c2949b07 werkin 2021-01-05 00:15:36 -05:00
James McClure
7e51ba962b barrier in DFH 2021-01-05 00:08:39 -05:00
James McClure
74e8c5e75f update barrier in ScaLBL / color model 2021-01-05 00:04:59 -05:00
James McClure
86de0442d1 workin 2021-01-04 23:48:21 -05:00
Rex Zhe Li
2b9d776113 save the work; to be compiled, tested and validated; add sine and cosine voltage input for Poisson solver 2021-01-04 20:13:48 -05:00
James McClure
20800ed7eb partial merge 2021-01-04 19:33:27 -05:00
James McClure
2fc85dead8 merging electrokinetic & greyscale 2021-01-04 14:00:44 -05:00
James McClure
9826ef5624 adding silo vis capabilities to electrochem 2020-12-29 14:04:43 -05:00
James McClure
879f8637bf fix getVelocity 2020-12-26 20:26:55 -05:00
Rex Zhe Li
d02eff3017 done: add restart and write visfiles for greyscale Color 2020-12-14 01:08:59 -05:00
Rex Zhe Li
f3ba90337a to be compiled: add basic restart and write visualization functionality 2020-12-13 19:34:56 -05:00
Rex Zhe Li
7ef18bfea3 make the WriteLog in PoissonSolver a bool type to facilitate input 2020-12-04 00:37:02 -05:00
Rex Zhe Li
e93b941d9e save the work; fluxBC for Ion solver still does not fully agree COMSOL 2020-11-19 13:17:31 -05:00
Rex Zhe Li
f9c32855e5 save the work; validation to be continued 2020-11-07 16:41:07 -05:00
Rex Zhe Li
69f319ab5c work in progress; add CPU ion flux BC 2020-11-05 21:51:29 -05:00
Rex Zhe Li
7cc2be826e PoissonSolver: remove extra setSlice for halo layer in Initialize() 2020-10-18 12:20:15 -04:00
Rex Zhe Li
21a0ec8c0b add a routine to write convergence log for Poisson solver 2020-10-16 12:50:28 -04:00
Rex Zhe Li
b5f9ad5a6c PoissonSolver: remove extra setSlice for halo layer in Initialize() 2020-10-15 11:54:26 -04:00
JamesEMcclure
c479402256 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2020-10-13 14:19:35 -04:00
JamesEMcclure
7071804bfd Merge branch 'Greyscale-Analysis' into Greyscale_stable 2020-10-12 15:08:15 -04:00
JamesEMcclure
56dc55a14d added equinor copyright statement 2020-10-12 06:08:29 -04:00
Rex Zhe Li
78d17e0538 made a few small changes 2020-10-11 21:08:39 -04:00
JamesEMcclure
35447181df merging multi-halo with electrokinetic 2020-10-09 15:19:59 -04:00
James McClure
7244258135 merging greyscale and electrokinetic in ScaLBL 2020-10-09 15:05:14 -04:00
Rex Zhe Li
8b3a2a3ff0 post-polish; make greyscaleColor analysis consistent with normal color;build test passed 2020-10-09 13:07:06 -04:00
JamesEMcclure
390556ceb0 greyscale model with simple analysis tool 2020-10-08 14:45:28 -04:00
James McClure
896a3617b8 adding dedicated analysis for grey model (broken) 2020-10-08 13:14:01 -04:00
Rex Zhe Li
d40de38c48 save the work;results needs to be validated 2020-10-05 11:03:35 -04:00
Rex Zhe Li
88063edb97 save the work;upgrade output data writing by writing single file instead of decomposed data 2020-10-01 16:27:46 -04:00
JamesEMcclure
624ec5a145 memory optimized layout with halo width 2020-09-30 15:10:18 -04:00
James McClure
3126318900 building wide halo class 2020-09-29 16:35:09 -04:00
Rex Zhe Li
a02288631a fix dumb bug of asssigning inverse of tau 2020-09-29 15:48:39 -04:00
JamesEMcclure
e6e2c4e27f FreeLee model compiles 2020-09-29 13:51:23 -04:00
James McClure
5c72374278 fixing compile bugs 2020-09-29 13:40:41 -04:00
James McClure
917be9f6c4 fixing compile bugs 2020-09-29 13:37:02 -04:00
James McClure
cf1cf4eb53 fixing compile bugs 2020-09-29 13:29:14 -04:00
James McClure
a3aadd947e fixing compile bugs 2020-09-29 13:25:53 -04:00
Rex Zhe Li
471e78703a add some print-out for debugging 2020-09-29 13:22:25 -04:00
James McClure
e4bdc864c6 fixing compile bugs 2020-09-29 11:05:09 -04:00
Rex Zhe Li
4657adbc94 add routine for ion model to read from file 2020-09-28 17:08:49 -04:00
Rex Zhe Li
e529caf6fe finish BC tweak 2020-09-25 17:02:16 -04:00
James McClure
92d56af3b4 template for freelee model 2020-09-25 16:18:54 -04:00
Rex Zhe Li
33fdfeb29d add a routine for single-fluid greyscale to read from file - voxel porosity and perm 2020-09-24 21:57:04 -04:00
Rex Zhe Li
471f71d690 save the work; untested; add a routine of read from file for greyscale simulator 2020-09-23 22:15:05 -04:00
Rex Zhe Li
226147a498 save the work of read from user-input file 2020-09-23 17:47:02 -04:00
James McClure
fd27b3138a tweak BC conventions 2020-09-23 14:53:46 -04:00
James McClure
0d6231f1cb read BC from model database 2020-09-22 14:33:51 -04:00
Rex Zhe Li
039978cc81 GPU version is available now 2020-09-20 11:00:36 -04:00
JamesEMcclure
64f1bfd37d Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2020-09-16 11:28:13 -04:00
Rex Zhe Li
11e9af54b6 CPU only;finish preliminary work on testing Poisson and Ion models and their coupling 2020-09-11 22:56:00 -04:00
Rex Zhe Li
20c8cc9c3b update PoissonSolver and fix numerous bugs 2020-09-02 11:37:23 -04:00
Rex Zhe Li
86a1bb81a1 resolve merge conflict 2020-08-28 21:58:29 -04:00
Rex Zhe Li
0a7b1c331b further clean up the code 2020-08-28 21:53:41 -04:00
JamesEMcclure
a7afd9b429 fix poisson solver for unit test 2020-08-28 13:37:36 -04:00
James McClure
75e8647051 re-factor electric solvers for unit testing 2020-08-28 13:31:43 -04:00
Rex Zhe Li
aa26fcafda fix miscellaneous bugs and update the data structure of electric potential 2020-08-28 11:15:55 -04:00
Rex Zhe Li
59ffd7bfd6 fix several miscellaneous bugs 2020-08-20 22:47:10 -04:00
Rex Zhe Li
d24198e76a done cleaning up the code 2020-08-19 22:22:35 -04:00
Rex Zhe Li
030bec9eba fix trivial bug in tau initialization 2020-08-19 18:56:06 -04:00
Rex Zhe Li
8996b582da still debugging; add a few checkpoint print out 2020-08-19 13:21:31 -04:00
Rex Zhe Li
d8a1837ba0 save the work; to be continued to clean up the code 2020-08-19 11:31:32 -04:00
Rex Zhe Li
2180f7b2bf resolve merge conflict 2020-08-18 18:02:28 -04:00
Rex Zhe Li
5756d6f138 fix a few trivial bugs; add some checkpoint print; still debugging 2020-08-18 12:40:41 -04:00
Rex Zhe Li
771f679f5c add output; CPU version compiled; to be tested 2020-08-17 09:59:22 -04:00
Rex Zhe Li
85fc59190c save the work;CPU version compiled; to be tested 2020-08-16 11:20:11 -04:00
Rex Zhe Li
3adde14ecf resolve merge conflicts 2020-08-14 14:26:32 -04:00
Rex Zhe Li
3a162849a0 save the work;untested 2020-08-14 14:23:22 -04:00
James McClure
30014a49c0 add zeta potential to Poisson 2020-08-11 16:52:56 -04:00
James McClure
b4d50ee821 example for how to structure ion comm loop 2020-08-10 12:54:55 -04:00
Rex Zhe Li
28988ef6ba save the work;untested 2020-08-10 12:03:28 -04:00
Rex Zhe Li
dff4e3d536 save the work;to be continued 2020-08-07 17:44:02 -04:00
James McClure
d9cde3c76c use generalized D3Q7 MPI structures for multi-ion 2020-08-06 16:12:18 -04:00
JamesEMcclure
fcdb84b2ad electro skeleton compiles 2020-08-06 16:06:52 -04:00
James McClure
082a0a30f5 Adding skeleton for electrokinetic LBM 2020-08-06 15:42:36 -04:00
James McClure
5e6a9f552c Adding skeleton for electrokinetic LBM 2020-08-06 15:41:40 -04:00
Rex Zhe Li
99ee51d8e1 add a full form of Guo-type body force scheme, but now using it now 2020-08-05 17:33:54 -04:00