James McClure
2989e890fa
fixing merge
2023-04-03 09:05:33 -04:00
James McClure
68e475fdf8
make sure permeability always includes square of porosity
2023-04-03 08:49:19 -04:00
James McClure
d69bff263c
fix minor merge conflict
2022-08-15 05:17:47 -04:00
Thomas Ramstad
24f069c43f
Add perm converter
...
Convert from micron2 to mDarcy
Changes to be committed:
modified: models/ColorModel.cpp
modified: models/ColorModel.h
modified: models/MRTModel.cpp
2022-03-24 23:39:46 +01:00
Thomas Ramstad
766dfc299a
Correct typo
...
Mask->Porosity()
modified: models/ColorModel.cpp
modified: models/MRTModel.cpp
2022-03-18 18:51:21 +01:00
Thomas Ramstad
2a5df51bb2
Add adjusted perms
...
Updated the SCAL.csv with eff-perm values weighted with porosity to make them closer
to measure data.
Added column in Permeability.csv with the adjusted values.
modified: models/ColorModel.cpp
modified: models/MRTModel.cpp
2022-03-18 17:04:18 +01:00
James E McClure
a181dfc85d
tune launch for mrt on crusher
2022-02-02 11:15:00 -05:00
Thomas Ramstad
23189f5577
Clang format ( #55 )
...
Run clang-format on modules of code
2021-11-08 22:58:37 +01:00
James McClure
11a62b4a0b
merge writer MRT
2021-11-06 09:49:21 -04:00
James McClure
d7822a11f6
merge writer MRT
2021-11-06 09:47:07 -04:00
James McClure
d926202d7f
update I/O format options to include hdf5
2021-11-06 08:06:08 -04:00
JamesEMcclure
0b03f9bd5c
fix merge conflict
2021-03-24 21:32:08 -04:00
Mark Berrill
5c27e3830a
Fixing compile errors without MPI
2021-02-12 13:43:26 -05:00
James McClure
c350e2b45e
demo for performance in MRT model
2021-01-20 18:25:29 -05:00
JamesEMcclure
0fe3125833
merging multi-halo
2021-01-13 21:44:23 -05:00
James McClure
7f4f74779c
fix the build
2021-01-05 18:43:44 -05:00
James McClure
5bcc10c5fb
refactor new models to FOM
2021-01-05 13:51:32 -05:00
James McClure
20800ed7eb
partial merge
2021-01-04 19:33:27 -05:00
JamesEMcclure
56dc55a14d
added equinor copyright statement
2020-10-12 06:08:29 -04:00
James McClure
7244258135
merging greyscale and electrokinetic in ScaLBL
2020-10-09 15:05:14 -04:00
JamesEMcclure
624ec5a145
memory optimized layout with halo width
2020-09-30 15:10:18 -04:00
James McClure
0d6231f1cb
read BC from model database
2020-09-22 14:33:51 -04:00
JamesEMcclure
49f5ec07a6
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
2020-05-07 14:03:11 -04:00
James McClure
e62208caaa
add reflection BC to MRT / Color
2020-04-03 09:52:23 -04:00
James E McClure
7023f91e4a
provide control of vis in permeabilty sim
2020-03-24 09:23:39 -04:00
JamesEMcclure
05cafcb525
fix failed merge
2020-03-17 21:44:45 -04:00
JamesEMcclure
9f5b44dfe4
Revert "Moving more MPI calls to the wrapper"
...
This reverts commit 0f91767b6c
2020-03-17 21:23:18 -04:00
Mark Berrill
94156e066e
Trying to fix bug with MPI communication
2020-03-12 10:26:17 -04:00
JamesEMcclure
7569c9bf73
support for grid file in MRT model
2020-02-12 14:19:16 -05:00
JamesEMcclure
79669b30d0
merging with morphLBM (may be some problems still)
2020-02-03 14:30:03 -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
78c2e710b9
Fixing compile warnings
2020-01-22 12:01:29 -05:00
JamesEMcclure
c80b74a754
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
2020-01-17 09:40:34 -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
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
Rex Zhe Li
9c48b3de70
enable single phase abs-perm simulator to read medium from Filename
2019-12-09 15:17:27 -05:00
JamesEMcclure
768b71f988
Merge branch 'morphLBM' of github.com:JamesEMcClure/LBPM-WIA
2019-11-07 08:59:28 -05:00
Rex Zhe Li
38a3ae82b6
fix typo in reading input parameter tolerance
2019-10-28 17:04:35 -04:00
JamesEMcclure
a6ade4eb0e
Merge branch 'morphLBM' of github.com:JamesEMcClure/LBPM-WIA into morphLBM
2019-06-18 14:33:49 -04:00
JamesEMcclure
8ad659ff17
fix bug in permeability tolerance
2019-06-05 14:57:06 -04:00
JamesEMcclure
b08493723a
Merge branch 'morphLBM' of github.com:JamesEMcClure/LBPM-WIA into morphLBM
2019-05-09 20:16:11 -04:00
James McClure
50aad91df6
fix permeability convergence criterion
2019-05-10 02:15:44 +02:00
JamesEMcclure
ee013a6b28
Merge branch 'morphLBM' of github.com:JamesEMcClure/LBPM-WIA into morphLBM
2019-05-09 18:44:26 -04:00
James McClure
5a8c337955
fix possible deadlock in MRT model
2019-05-09 16:45:58 +02:00
JamesEMcclure
089b53f800
Merge branch 'morphLBM' of github.com:JamesEMcClure/LBPM-WIA into morphLBM
2019-05-09 08:43:45 -04:00
James McClure
52995e2b8a
added tolerance to MRT
2019-05-09 01:01:15 +02:00
JamesEMcclure
d26b25278a
Merge branch 'morphLBM' of github.com:JamesEMcClure/LBPM-WIA into morphLBM
2019-05-01 13:16:17 -04:00
