Commit Graph
62 Commits
Author SHA1 Message Date
James McClure 51ada19b06 merging conflicts 2021-12-09 13:51:35 -05:00
Rex Zhe Li 8fce93fc47 update solid BCs of Poisson solver in GPU;to be built and tested 2021-12-06 13:50:17 +11:00
James McClure 3f746e8ed2 merge doc update 2021-10-21 20:26:21 -04:00
James McClure f99e2dbef9 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2021-10-14 08:29:10 -04:00
James McClure 4d97018329 revert to original rho0 2021-10-14 08:28:57 -04:00
James McClure 3b60988295 factor of porosity to mass density 2021-10-13 12:47:26 -04:00
Rex Zhe Li 4e47b0ad90 Merge branch 'master' into electrokinetic 2021-10-13 16:46:38 +11:00
Rex Zhe Li 354979a395 update flux-saving routines on GPU;to be verified 2021-10-13 15:46:08 +11:00
James McClure ea7cb97bb7 update greyscale diffusion contribution 2021-10-11 21:55:57 -04: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
Rex Zhe Li 551bcb172f update saving diffusive flux in GPU version 2021-09-30 01:16:53 -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
JamesEMcclure cf701e4200 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2021-08-20 00:06:30 -04: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
JamesEMcclure e8da961cae update greyscale model and kill warnings 2021-06-16 15:02:47 -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
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 052433ddeb fix minor bug in unit conversion 2021-05-20 08:21:25 -04:00
JamesEMcclure 2f12032973 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2021-05-17 19:10:37 -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 e97dfa78df further resolve the merge conflicts 2021-05-05 22:23:27 -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
JamesEMcclure fde6af1dc0 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2021-04-04 21:02:42 -04:00
Rex Zhe Li a99c558552 fix miscellaneous typos and bugs; huckleberry build passed 2021-03-31 21:37:52 -04:00
Rex Zhe Li c22596ac14 further clean up CPU code;Update GPU code;GPU version to be built and verified 2021-03-31 20:42:16 -04:00
James E McClure 498993ed73 compile gpu lee model 2021-03-31 19:13:33 -04:00
James McClure 8805fa6536 update gpu phase field 2021-03-31 13:54:57 -04:00
James E McClure cde3741e53 fix some cuda compile bugs for lee model 2021-03-31 13:39:27 -04:00
James McClure a1b82b2aa4 updated cuda version for Lee model 2021-03-31 11:19:13 -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
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 32d750a04c GPU build for lee model 2021-03-22 10:45:30 -04:00
James McClure 68b881bdb0 draft for cuda version of free lee model 2021-03-20 18:36:09 -04:00
James McClure dadc970947 clean up arguments for Free Lee 2021-03-20 13:12:49 -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 fdf635bb57 revise the capillary penalty formulation 2021-03-11 21:11:57 -05:00
Rex Zhe Li 57158b539e had accidentally comment out the recoloring check; put it back on 2021-03-11 20:00:03 -05:00
Rex Zhe Li 2cec6b260e change color-gradient on greynodes to be the same as Fcp 2021-03-10 19:53:58 -05: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