Rex Zhe Li
|
ff04f20fa8
|
fix merge conflict
|
2020-02-21 11:18:58 -05:00 |
|
JamesEMcclure
|
a42a0c8440
|
fix print bug
|
2020-02-21 11:16:26 -05:00 |
|
JamesEMcclure
|
eab71d28b2
|
Merge branch 'morphLBM' of github.com:JamesEMcClure/LBPM-WIA into morphLBM
|
2020-02-21 11:12:12 -05:00 |
|
JamesEMcclure
|
586bc09f84
|
fix print bug
|
2020-02-21 11:11:59 -05:00 |
|
Rex Zhe Li
|
73976c6060
|
Merge branch 'morphLBM' of github.com:JamesEMcClure/LBPM-WIA into morphLBM
|
2020-02-20 16:07:56 -05:00 |
|
Rex Zhe Li
|
46c4076956
|
fix some typo
|
2020-02-17 12:06:58 -05:00 |
|
Rex Zhe Li
|
2ffd42753a
|
Merge branch 'master' into morphLBM
|
2020-02-17 11:44:36 -05:00 |
|
James McClure
|
dee251e545
|
Merge branch 'master' into morphLBM
|
2020-02-17 11:43:51 -05:00 |
|
JamesEMcclure
|
7569c9bf73
|
support for grid file in MRT model
|
2020-02-12 14:19:16 -05:00 |
|
James McClure
|
0246577a9c
|
Merge branch 'FOM'
|
2020-02-10 13:25:29 -05:00 |
|
Mark Berrill
|
57156d16fc
|
Fixing build issue
|
2020-02-05 07:35:13 -05:00 |
|
JamesEMcclure
|
e9d6e00e6d
|
Merge branch 'Greyscale' of github.com:JamesEMcClure/LBPM-WIA into Greyscale
|
2020-02-04 14:11:01 -05:00 |
|
JamesEMcclure
|
221ef2eb1e
|
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA into Greyscale
|
2020-02-04 14:09:17 -05:00 |
|
JamesEMcclure
|
6d4e68d8b8
|
set morphological target from kr
|
2020-02-04 14:02:49 -05:00 |
|
Rex Zhe Li
|
a372d60450
|
resolve some minor issues after the MPI backend updates
|
2020-02-04 13:58:06 -05:00 |
|
Rex Zhe Li
|
72ab9f803e
|
merge with morphLBM to incorporate the newest backend updates
|
2020-02-04 13:28:57 -05:00 |
|
JamesEMcclure
|
f00e48a6ff
|
Merge branch 'morphLBM_WaterSeedv2' of github.com:JamesEMcClure/LBPM-WIA into morphLBM
|
2020-02-04 12:38:28 -05:00 |
|
Rex Zhe Li
|
d34a12891c
|
add a weighting factor to the water seeding method
|
2020-02-03 17:22:13 -05:00 |
|
JamesEMcclure
|
c426aa7d1d
|
remove deprecated pressure BC routines
|
2020-02-03 15:13:45 -05:00 |
|
JamesEMcclure
|
79669b30d0
|
merging with morphLBM (may be some problems still)
|
2020-02-03 14:30:03 -05:00 |
|
JamesEMcclure
|
b73208b471
|
fix water seed
|
2020-02-03 14:05:23 -05:00 |
|
JamesEMcclure
|
c525cf2d67
|
Merge branch 'FOM' of github.com:JamesEMcClure/LBPM-WIA into FOM
|
2020-02-03 13:00:07 -05:00 |
|
JamesEMcclure
|
6ed57841b8
|
update TwoPhase analysis for vector / tensor objects
|
2020-02-03 12:59:52 -05:00 |
|
Mark Berrill
|
8751fa245b
|
Fixing minor issues with some operating systems
|
2020-02-03 12:41:09 -05:00 |
|
Rex Zhe Li
|
46b8c1de7f
|
GPU version update: remove higher-order terms in body force
|
2020-02-01 17:22:13 -05:00 |
|
Rex Zhe Li
|
793d294aa3
|
CPU version update: remove the higher-order terms in body force
|
2020-02-01 17:03:42 -05:00 |
|
Rex Zhe Li
|
50e4b5a9ba
|
add the greyscale effective viscosity back, but by default it is set equal to the normal viscosity
|
2020-02-01 14:04:39 -05:00 |
|
Rex Zhe Li
|
ea8fceda8c
|
revert to the old velocity averaging method as it is more accurate
|
2020-01-31 15:42:27 -05:00 |
|
Rex Zhe Li
|
69ee9f79cb
|
Some updates:(1)add different fq initialization for BGK and IMRT;(2)user can choose collision model
|
2020-01-31 15:15:26 -05:00 |
|
Rex Zhe Li
|
34c5b223b0
|
fix printf bug
|
2020-01-30 17:57:56 -05:00 |
|
Rex Zhe Li
|
25df1e0f35
|
add a few print-out to make the program output more verbose
|
2020-01-30 13:23:27 -05:00 |
|
Rex Zhe Li
|
6e7cb83254
|
add pressure to output data
|
2020-01-29 23:49:36 -05:00 |
|
Rex Zhe Li
|
2a66e63672
|
add pressure BC for abs-perm simulator; need validation test for this
|
2020-01-29 17:14:48 -05:00 |
|
Mark Berrill
|
0f91767b6c
|
Moving more MPI calls to the wrapper
|
2020-01-28 12:33:36 -05:00 |
|
Mark Berrill
|
d1f714a82e
|
Adding MPI wrapper class
|
2020-01-28 08:51:32 -05:00 |
|
Mark Berrill
|
acb2d30454
|
Fixing compile warnings
|
2020-01-22 12:19:04 -05:00 |
|
Mark Berrill
|
78c2e710b9
|
Fixing compile warnings
|
2020-01-22 12:01:29 -05:00 |
|
Mark Berrill
|
f17bccb389
|
Merge branch 'FOM' of github.com:JamesEMcClure/LBPM-WIA into FOM
|
2020-01-22 11:00:49 -05:00 |
|
Mark Berrill
|
3c854fd002
|
Updating StackTrace and improving performance converting uCT data
|
2020-01-22 11:00:25 -05:00 |
|
Mark Berrill
|
0006695d5f
|
Adding MPIFLAGS option
|
2020-01-22 11:00:25 -05:00 |
|
Mark Berrill
|
2cee75ae97
|
Copying halo when reading grid file
|
2020-01-22 11:00:25 -05:00 |
|
Rex Zhe Li
|
0372b9d1e8
|
save the work, update how flow_rate is computed in greyscale simulator
|
2020-01-21 23:24:10 -05:00 |
|
Rex Zhe Li
|
e3afe1eba8
|
add a restart utitlity to the greyscale simulator
|
2020-01-21 14:31:33 -05:00 |
|
Rex Zhe Li
|
fb33408a95
|
1.disable debug write-out; 2. add a weighted porosity
|
2020-01-20 19:29:03 -05:00 |
|
Rex Zhe Li
|
783d7ff7b2
|
remove the reserved labels (i.e. Label=1,2) which store some pre-defined voxel perm values that may accidentally overwrite use-defined labels
|
2020-01-20 13:17:03 -05:00 |
|
Rex Zhe Li
|
060bee7b44
|
GPU version of incompressible greysacle MRT model is ready
|
2020-01-18 22:52:04 -05:00 |
|
Rex Zhe Li
|
152cfd1cab
|
Merge branch 'GreyscaleMRT' into Greyscale
|
2020-01-18 18:43:41 -05:00 |
|
Rex Zhe Li
|
7e4e91a06b
|
The CPU version of incompressible MRT greyscale model is available now
|
2020-01-18 18:43:20 -05:00 |
|
Rex Zhe Li
|
9fa091a49d
|
save the work, CPU versions seem to work, but need non-unity porosity test
|
2020-01-17 18:46:28 -05:00 |
|
JamesEMcclure
|
67076c0916
|
fixed Permeability.csv header
|
2020-01-17 09:40:09 -05:00 |
|