Rex Zhe Li
|
1694f4530c
|
comment out the variable rescale_force_count that was deprecated
|
2020-02-21 21:22:54 -05:00 |
|
JamesEMcclure
|
81a25b9997
|
try for better Ca target
|
2020-02-21 11:43:58 -05:00 |
|
JamesEMcclure
|
b99d32ef0c
|
fix print
|
2020-02-21 11:28:18 -05:00 |
|
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
|
6d4e68d8b8
|
set morphological target from kr
|
2020-02-04 14:02:49 -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 |
|
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 |
|
JamesEMcclure
|
67076c0916
|
fixed Permeability.csv header
|
2020-01-17 09:40:09 -05:00 |
|
JamesEMcclure
|
33c5c6c934
|
permeability header fixed
|
2020-01-16 09:34:34 -05:00 |
|
Rex Zhe Li
|
12c0d42d36
|
change specifier of printf to correct the output for very large image
|
2020-01-14 12:01:33 -05:00 |
|
JamesEMcclure
|
fa80034749
|
fixed redundant layer code
|
2020-01-13 14:03:04 -05:00 |
|
JamesEMcclure
|
06db016fc8
|
fix bug with volumetric flux in timelog
|
2020-01-13 13:57:35 -05:00 |
|
JamesEMcclure
|
7c1167b981
|
Merge branch 'FOM'
|
2020-01-13 12:59:12 -05:00 |
|
JamesEMcclure
|
7afd52ef03
|
check header for Peremeability.csv
|
2020-01-13 12:48:08 -05:00 |
|
JamesEMcclure
|
b69b505b2f
|
check header for Peremeability.csv
|
2020-01-13 11:36:29 -05:00 |
|
JamesEMcclure
|
62674e4e0c
|
remove flux factor
|
2020-01-13 11:21:11 -05:00 |
|
Mark Berrill
|
f0a7732f21
|
Updating StackTrace and improving performance converting uCT data
|
2020-01-02 13:23:51 -05:00 |
|
Mark Berrill
|
e66a92142f
|
Adding MPIFLAGS option
|
2019-12-12 13:58:51 -05:00 |
|
Rex Zhe Li
|
9c48b3de70
|
enable single phase abs-perm simulator to read medium from Filename
|
2019-12-09 15:17:27 -05:00 |
|
James McClure
|
9ea68b848c
|
Merge branch 'morphLBM' of github.com:JamesEMcClure/LBPM-WIA into morphLBM
|
2019-12-03 13:58:09 -05:00 |
|
James McClure
|
cf5a284f6d
|
adding subphase functionality
|
2019-12-03 13:01:37 -05:00 |
|
Mark Berrill
|
3cd5053ec9
|
Copying halo when reading grid file
|
2019-11-21 13:29:26 -05:00 |
|
Mark Berrill
|
e4e5da8598
|
Merge branch 'FOM' of github.com:JamesEMcClure/LBPM-WIA into FOM
|
2019-11-21 08:30:30 -05:00 |
|
JamesEMcclure
|
4878557e20
|
update labels in loop
|
2019-11-20 09:53:44 -05:00 |
|
JamesEMcclure
|
26cac9060a
|
fix bug with relabel
|
2019-11-19 12:35:24 -05:00 |
|
JamesEMcclure
|
442d42bb91
|
Merge branch 'morphLBM' of github.com:JamesEMcClure/LBPM-WIA into morphLBM
|
2019-11-18 14:08:41 -05:00 |
|