Commit Graph

884 Commits

Author SHA1 Message Date
James McClure
bfe1de6be2 membrane structure in IonModel 2022-03-18 11:20:09 -04:00
James McClure
bfa6f5e5b8 move membrane to common folder 2022-03-18 11:09:34 -04:00
James McClure
12026f54d4 update to membrane capability 2022-03-14 16:16:47 -04:00
James McClure
abf5823de6 membrane data structures compiling 2022-03-11 05:39:34 -05:00
James E McClure
39feb20ec9 add membrane unpack function 2022-03-07 16:47:19 -05:00
James E McClure
f270604e6b add membrane transport function for d3q7 2022-03-07 15:36:16 -05:00
James McClure
5bbda39fdb working on membrane communication structures 2022-02-21 16:39:24 -05:00
James E McClure
074ea746f2 Merge branch 'Crusher' of github.com:JamesEMcClure/LBPM-WIA into Crusher 2022-02-10 16:41:34 -05:00
Mark Berrill
1f671edbc1 Testing persistent communication 2022-02-10 16:29:22 -05:00
James E McClure
c672648b7d fix sendcount / recvcount 2022-02-10 15:03:57 -05:00
James E McClure
6b0b8daddd hang fix / workaround 2022-02-10 13:43:31 -05:00
Mark Berrill
6b36b82ccf Fixing some quick annoying compile warnings 2022-02-09 12:03:08 -05:00
James E McClure
1f6d37208e fix whitespace merge issue 2022-02-03 09:15:28 -05:00
Rex Zhe Li
ee527a42cc update Poisson and Stoke solvers to include slipping velocity BC; to be built 2022-01-18 16:46:09 +11:00
James E McClure
af7ec72622 Merge branch 'Spock' of github.com:JamesEMcClure/LBPM-WIA into Spock 2022-01-10 15:46:16 -05:00
James McClure
efd29363b6 membrane communications 2021-12-27 19:47:49 -05:00
James McClure
26766ef69a update membrane structure 2021-12-25 17:58:53 -05:00
James E McClure
419de4e397 local spock changes 2021-12-21 11:36:52 -05:00
James McClure
aa0b3a1cb0 merge LBPM with spock 2021-12-12 11:36:47 -05:00
James McClure
51ada19b06 merging conflicts 2021-12-09 13:51:35 -05:00
Rex Zhe Li
7d525e999b enable different types of solid BC for Poisson solver; to be built and tested 2021-12-02 23:32:57 +11:00
Thomas Ramstad
23189f5577
Clang format (#55)
Run clang-format on modules of code
2021-11-08 22:58:37 +01:00
Mark Berrill
056eeaa461 Merging master 2021-11-03 10:55:56 -04:00
James McClure
3f746e8ed2 merge doc update 2021-10-21 20:26:21 -04:00
Rex Zhe Li
4e47b0ad90 Merge branch 'master' into electrokinetic 2021-10-13 16:46:38 +11: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
James McClure
6f5d78204a updating documentation 2021-10-03 19:56:26 -04:00
Rex Zhe Li
01499e672d continue the work of storing ion diffusive flux;incomplete. 2021-09-29 15:41:38 +10:00
James McClure
3234d09fdc fix dox warnings 2021-09-20 15:23:45 -04:00
JamesEMcclure
3cf0bc67d8 merge dox 2021-09-20 09:22:38 -04:00
James E McClure
a3a2bf24dd expanding dox for ScaLBL 2021-09-20 06:29:05 -04:00
James McClure
75f31678a0 adding dox 2021-09-19 20:24:40 -04:00
JamesEMcclure
5b6628a5c1 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2021-09-14 09:18:37 -04:00
Mark Berrill
88dda8d914 Cleaning up doxygen warnings 2021-09-13 11:51:21 -04:00
Rex Zhe Li
fa2c325f5a comment out PoissonSolverResidual so it can be complined with GPU 2021-09-13 08:00:32 -04:00
Rex Zhe Li
c74b803157 initialize a new convergence scheme for Poisson solver 2021-09-09 15:48:25 +10:00
JamesEMcclure
3d64e1a8a1 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2021-09-03 09:55:03 -04:00
James McClure
47050feb49 remove random array functionality 2021-09-02 08:19:54 -04:00
JamesEMcclure
2ceaa23afb Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2021-09-01 14:29:45 -04:00
James McClure
b3457348bd fix inlet / outlet porosity 2021-09-01 14:29:31 -04:00
JamesEMcclure
3d4a0a1f2f Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2021-09-01 07:39:10 -04:00
James McClure
f908e6f8ee erge branch 'master' into FOM_dev 2021-08-30 11:49:38 -04:00
James McClure
c7ddae1017 greyscale with corey d3q7 2021-08-09 08:34:10 -04:00
James E McClure
3f20276cb6 add barrier between pack / MPI send 2021-07-26 11:48:05 -04:00
Mark Berrill
f6690d2277 Cleaning up some compiler warnings 2021-07-19 13:36:04 -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
Rex Zhe Li
988eb36ac3 Merge branch 'FOM' into FOM_dev 2021-06-27 19:46:49 -04:00
Mark Berrill
d9746d575b Fixing potential bugs with communication 2021-06-24 14:42:03 -04:00
Rex Zhe Li
57a723b11e fix a minor data type bug 2021-06-18 00:13:17 -04:00
JamesEMcclure
b4f4607db0 Merge branch 'master' into greyscale_dev 2021-06-16 13:45:13 -04:00
JamesEMcclure
09f6e40aae Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2021-06-13 23:36:52 -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
f9f2c6310f make sure slip BC data structures are allocated and initialized irrespective of BC 2021-06-08 13:58:59 -04:00
JamesEMcclure
41bb5a1360 make sure slip BC data structures are allocated and initialized irrespective of BC 2021-06-08 13:54:58 -04:00
Mark Berrill
e1c347d3c1 Merge branch 'FOM' of github.com:JamesEMcClure/LBPM-WIA into FOM 2021-06-02 15:36:51 -04:00
Mark Berrill
96ef15c5c6 Creating HDF5 writer using Xmdf for visualization 2021-06-02 15:36:44 -04:00
JamesEMcclure
baedeaa2a3 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2021-06-01 06:43:07 -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
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
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
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
f83d0ae2c5 GPU only;add 8th order gradient; seems to work 2021-04-20 03:04:44 -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
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
Mark Berrill
651587392b Merge branch 'FOM' of github.com:JamesEMcClure/LBPM-WIA into FOM 2021-03-26 13:21:03 -04:00
Mark Berrill
3beb380bf3 Minor update to MPI class 2021-03-26 13:20:49 -04:00
James McClure
5a9cf54273 Merge branch 'master' into FOM_dev 2021-03-26 09:45:58 -04:00
JamesEMcclure
4718b8f225 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2021-03-26 09:37:38 -04:00
JamesEMcclure
23de5b1ec2 fix domain volume bug 2021-03-26 09:36:13 -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
JamesEMcclure
77b2e4ad8b fixed dumb merge thing 2021-03-24 22:20:20 -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
dadc970947 clean up arguments for Free Lee 2021-03-20 13:12:49 -04:00
James McClure
eb62dbd38e standalone d3q7 mass collision for color model 2021-03-18 21:06:15 -04:00
James McClure
c1cd959da6 D3Q7 Lee model (looks anisotropic) 2021-03-18 14:51:26 -04:00
Rex Zhe Li
02d2e514ed make CPU also ready for capillary penalty; to be built and verified 2021-03-18 07:58:05 -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
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
James McClure
a0b42380a4 fixed wide halo bug 2021-02-21 23:56:10 -05:00
Mark Berrill
5c27e3830a Fixing compile errors without MPI 2021-02-12 13:43:26 -05:00
James McClure
41814df509 Merge branch 'FOM_dev' of github.com:JamesEMcClure/LBPM-WIA into FOM_dev 2021-02-09 15:25:40 -05:00