Commit Graph

4509 Commits

Author SHA1 Message Date
James E McClure
cd34f11c38 cuda build succeeds 2022-03-28 18:59:30 -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
James E McClure
de2fe8b3a9 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2022-03-27 16:01:20 -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
7172364660 update cell example 2022-03-22 20:03:34 -04:00
James McClure
2c3272e423 updates and fix for user input reader 2022-03-22 17:31:12 -04:00
James McClure
8ae69e4c1e start on hip function 2022-03-21 19:53:05 -04:00
James McClure
18602c7516 start on cuda function 2022-03-21 19:51:09 -04:00
James McClure
16275ce1b9 werkin 2022-03-21 19:44:21 -04:00
James McClure
0a1057926d start on cuda function 2022-03-21 19:44:04 -04:00
JamesEMcClure
70b12830cb
Merge pull request #63 from thomaram/adjust_perm
Add adjusted perms
2022-03-21 14:16:13 -04:00
James McClure
286e779459 refining cell example 2022-03-20 18:01:19 -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
9e3a07d419 add python script to generate bubble 2022-03-20 09:30:46 -04:00
James McClure
a50d9e9aa6 add python script to generate bubble 2022-03-20 09:29:42 -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
c94d4e5194 membrane structure in IonModel 2022-03-18 11:23:01 -04:00
James McClure
bfe1de6be2 membrane structure in IonModel 2022-03-18 11:20:09 -04:00
James McClure
bfa6f5e5b8 move membrane to common folder 2022-03-18 11:09:34 -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
ece735e0e7 fix dumb print bug 2022-03-18 14:29:29 +11:00
zherexli
0105155d2f update comments in ion model 2022-03-17 11:35:48 +11:00
James McClure
12026f54d4 update to membrane capability 2022-03-14 16:16:47 -04:00
James McClure
abf5823de6 membrane data structures compiling 2022-03-11 05:39:34 -05:00
James E McClure
d1bbc2171f Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2022-03-08 22:14:55 -05:00
James E McClure
ecb882bc75 update crusher build 2022-03-08 22:14:42 -05:00
James McClure
91cf379e86 poking at MF issue 2022-03-08 22:13:48 -05:00
James E McClure
39feb20ec9 add membrane unpack function 2022-03-07 16:47:19 -05:00
James E McClure
f270604e6b add membrane transport function for d3q7 2022-03-07 15:36:16 -05:00
James E McClure
3065ce1f28 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2022-03-06 00:22:50 -05:00
James E McClure
77eba8c48a Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2022-03-05 07:47:22 -05:00
James McClure
00d1f36867 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2022-03-04 19:05:14 -05:00
James McClure
b39dd1a474 make sure halo is filled when measuring object 2022-03-04 18:59:11 -05:00
James McClure
dd9da41d4b added cell simulator 2022-02-24 21:43:18 -05:00
James McClure
896e6ee27b add cell simulator 2022-02-21 16:49:42 -05:00
James McClure
5bbda39fdb working on membrane communication structures 2022-02-21 16:39:24 -05:00
James E McClure
033477ee95 Merge branch 'Crusher' of github.com:JamesEMcClure/LBPM-WIA into Crusher 2022-02-12 01:49:10 -05:00
James E McClure
101f3a8f44 crusher hackathon final version 2022-02-12 01:39:30 -05:00
Mark Berrill
61e0714595 Updating calculation of bandwidth 2022-02-10 16:47:37 -05:00
James E McClure
074ea746f2 Merge branch 'Crusher' of github.com:JamesEMcClure/LBPM-WIA into Crusher 2022-02-10 16:41:34 -05:00
Mark Berrill
1f671edbc1 Testing persistent communication 2022-02-10 16:29:22 -05:00
James E McClure
1378b1f13b Merge branch 'Crusher' of github.com:JamesEMcClure/LBPM-WIA into Crusher 2022-02-10 15:41:43 -05:00