James McClure
85e99df3f3
add membrane concentration init
2022-04-14 22:57:23 -04:00
James McClure
aa8783141d
small change
2022-04-13 20:39:59 -04:00
Zhe Li
e7c227bd9f
fix bugs in initializing electric potential; the Psi on solid was accidentally overwritten before.
2022-04-13 16:56:26 +10:00
Zhe Li
c281c0cfda
fix dumb bugs
2022-04-13 14:53:23 +10:00
Zhe Rex Li
0f68c118de
Poisson solver; enable specifying initial values
2022-04-12 16:12:12 +10:00
Zhe Li
cc693c93f5
fix a few syntax bugs and build passed
2022-04-12 12:49:28 +10:00
Zhe Rex Li
e1ebbce812
initialize nernst-planck simulator; to be built subject to debugging
2022-04-12 11:40:39 +10:00
James McClure
d0e41bf834
d319 poisson works good
2022-04-10 17:25:29 -04:00
James McClure
eb1c5da99c
still broken wang
2022-04-10 16:08:35 -04:00
James McClure
cd970d64a3
Merge branch 'membrane-rex-d3q19' into membrane-wang
2022-04-10 12:34:31 -04:00
James McClure
b182d04833
tau from wang paper
2022-04-10 11:32:53 -04:00
James McClure
b3dfc014d8
rex d3q19 (broken)
2022-04-10 11:05:53 -04:00
James McClure
9c63613373
original wang poisson solver (broken)
2022-04-10 09:51:02 -04:00
James McClure
2bb2be845a
membrane starts working ok...
2022-04-08 16:44:37 -04:00
James McClure
3715ed98b0
Merge branch 'membrane' of github.com:JamesEMcClure/LBPM-WIA into membrane
2022-04-01 06:58:49 -04:00
James McClure
39a04e38ab
getting ready to merge gpu
2022-04-01 06:58:43 -04:00
James E McClure
f99af45c9b
Merge branch 'membrane' into tmp
2022-03-27 16:03:26 -04:00
James E McClure
6911e97c29
merge master with crusher
2022-03-27 16:02:56 -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
James McClure
8a0937e111
add sigmoid to ion equilibrium dist
2022-03-24 07:38:06 -04:00
James McClure
4927e54707
add single cell example
2022-03-20 15:13:53 -04:00
James McClure
3522d35de1
read input files
2022-03-20 13:32:24 -04:00
James McClure
51c88f0055
cell simulator runs
2022-03-20 11:22:46 -04:00
James McClure
702eaae1c1
try at membrane simulator
2022-03-18 18:08:44 -04: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 McClure
bfe1de6be2
membrane structure in IonModel
2022-03-18 11:20:09 -04:00
James McClure
e8d0b0b48a
adding membrane functions
2022-03-18 11:06:16 -04:00
James McClure
1abb9adea6
clean up relabel
2022-03-18 11:05:50 -04:00
trams@equinor.com
fe2496ebdd
Add film corrected eff perms
...
modified: models/ColorModel.cpp
2022-03-18 14:54:47 +01:00
zherexli
0105155d2f
update comments in ion model
2022-03-17 11:35:48 +11:00
James E McClure
6b0b8daddd
hang fix / workaround
2022-02-10 13:43:31 -05:00
James E McClure
1f6d37208e
fix whitespace merge issue
2022-02-03 09:15:28 -05:00
James E McClure
3adbd04d38
update color
2022-02-03 09:14:33 -05:00
James E McClure
a181dfc85d
tune launch for mrt on crusher
2022-02-02 11:15:00 -05:00
Zhe Rex Li
ba14aecf35
try to fix time conversion factor for Poisson solver; to be built and tested
2022-01-31 12:23:36 +11:00
James McClure
eccebcd95a
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
2022-01-28 06:43:00 -05:00
James McClure
1e4a68aab9
add film term to scal.csv
2022-01-28 06:42:52 -05:00
Rex Zhe Li
169a102f6c
fix a few typos and bug and build passed
2022-01-18 01:15:35 -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 McClure
44a7653c60
checkout right color model
2021-12-10 12:19:08 -05:00
James McClure
51ada19b06
merging conflicts
2021-12-09 13:51:35 -05:00
James McClure
ee93851281
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
2021-12-09 10:17:13 -05:00
James McClure
a65ceef7d5
try 2
2021-12-09 10:16:47 -05:00
James McClure
44965c17f3
fix merge
2021-12-09 10:11:05 -05:00
Rex Zhe Li
d61cb8571f
fix dumb typo
2021-12-06 00:46:44 -05:00
Rex Zhe Li
ba88a78afb
update periodic potential BC for inlet and outlet;to be built and tested
2021-12-06 16:28:08 +11:00
JamesEMcClure
8800066c06
Add "SCAL.csv" file for color model ( #61 )
...
* add scal file
* SCAL csv file
* Update ColorModel.cpp
Updated the SCAL output file, and removed some entries.
Co-authored-by: Thomas Ramstad <trams@equinor.com>
2021-12-03 14:53:36 +01:00
Rex Zhe Li
95d01c4e28
fix bug
2021-12-02 07:47:49 -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
James McClure
e6fa7d4065
add SCAL file
2021-12-01 08:08:16 -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
2ff903f4d5
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
2021-11-07 07:58:05 -05:00
James McClure
97721a9a10
never rescale unsteady cases
2021-11-07 07:57:54 -05:00
James McClure
ccd05a6117
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
2021-11-07 07:56:31 -05:00
James McClure
1fe39b8223
never rescale unsteady cases
2021-11-07 07:56:18 -05:00
James McClure
ce57491bce
never rescale unsteady cases
2021-11-07 07:55:15 -05: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
James McClure
a47e5c891b
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
2021-10-21 20:39:17 -04:00
James McClure
4cf2610c80
make visualization a public function
2021-10-21 20:38:18 -04:00
James McClure
3f746e8ed2
merge doc update
2021-10-21 20:26:21 -04:00
James McClure
3232f939ee
update to docx
2021-10-21 20:24:10 -04:00
Rex Zhe Li
4e47b0ad90
Merge branch 'master' into electrokinetic
2021-10-13 16:46:38 +11:00
Rex Zhe Li
b6dae6cfc2
fix dumb bugs;build passed
2021-10-13 00:33:08 -04: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
Thomas Ramstad
44426848c4
Add effective pressure
...
Added effective pressure 1 / k_eff to the output.
To be used in history matching of core flooding.
2021-10-04 14:32:09 +02:00
James McClure
6f5d78204a
updating documentation
2021-10-03 19:56:26 -04:00
James McClure
d6baecf5e2
fix bug in endpoint perm
2021-09-29 13:06:10 -04:00
Rex Zhe Li
3f5175c9ba
build passes after fixing various dumb syntax bugs;model to be verified
2021-09-29 02:10:35 -04:00
Rex Zhe Li
01499e672d
continue the work of storing ion diffusive flux;incomplete.
2021-09-29 15:41:38 +10:00
JamesEMcclure
d6e90e23cd
remove unused film terms
2021-09-20 09:28:18 -04:00
JamesEMcclure
3cf0bc67d8
merge dox
2021-09-20 09:22:38 -04:00
James McClure
7575d5c116
depcrecate internal color flow adaptor
2021-09-19 09:52:06 -04:00
JamesEMcclure
5b6628a5c1
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
2021-09-14 09:18:37 -04:00
Rex Zhe Li
c3300baf1e
set up reading user-specified multi-species ion concentration; to be verified
2021-09-14 10:53:03 +10:00
James McClure
50f77fb2d3
Merge branch 'master' into electrokinetic_UpdatedPBTol
2021-09-13 10:42:27 -04:00
Rex Zhe Li
2357cd9dfa
update options for tolerance_method
2021-09-13 09:20:52 -04:00
Rex Zhe Li
101105c7ae
print out info on what tolerance_method is used
2021-09-13 06:11:22 -04:00
Rex Zhe Li
50395a14e9
PoissonSolver with sum or max MSE should work now after fixing dumb bugs
2021-09-13 05:38:42 -04:00
Rex Zhe Li
65b0d12172
add MES_max as alternative method to check convergence;to be verified
2021-09-13 19:24:23 +10:00
Rex Zhe Li
a75ca8a132
Merge branch 'electrokinetic_UpdatedPBTol' of github.com:JamesEMcClure/LBPM-WIA into electrokinetic_UpdatedPBTol
2021-09-13 18:46:55 +10:00
Rex Zhe Li
d19e4f1047
save the work;incomplete
2021-09-13 18:46:44 +10:00
Rex Zhe Li
172f66a169
PoissonSolver using MSE as stopping criterion should work now
2021-09-13 04:45:37 -04:00
Rex Zhe Li
44fa670fb1
change convergence method to MSE
2021-09-13 17:53:15 +10:00
Rex Zhe Li
0aefd3e456
fix more bugs but still need to verify
2021-09-09 09:32:57 -04:00
Rex Zhe Li
878760ed0a
fix a few bugs and pass build; to be verified
2021-09-09 08:04:11 -04:00
JamesEMcclure
68e9548f5b
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
2021-09-09 06:22:36 -04:00
Rex Zhe Li
c74b803157
initialize a new convergence scheme for Poisson solver
2021-09-09 15:48:25 +10:00
James McClure
ea987e90d3
fix force rescale/ loop criterion
2021-09-08 21:42:04 -04:00
James McClure
a6e1abc20c
fix timestep / exit loop criterion
2021-09-08 18:44:25 -04:00
James McClure
5f87f8b766
add max/min Ca
2021-09-08 13:43:25 -04:00
James McClure
51d4fe9223
move FlowAdaptor
2021-09-04 11:25:39 -04:00
James McClure
0b183a98ed
fix capillary number bug for flux bc
2021-09-04 09:49:12 -04:00
JamesEMcclure
0be38be139
remove warnings for color
2021-09-01 10:07:27 -04:00
JamesEMcClure
a5a88f151c
Merge pull request #43 from thomaram/updates
...
Updates
2021-09-01 09:08:46 -04:00
JamesEMcclure
3d4a0a1f2f
Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
2021-09-01 07:39:10 -04:00
