James McClure
75240ef7cd
Merge branch 'master' of github.com:OPM/LBPM
2022-03-29 15:02:01 -04:00
James McClure
f5fdba8458
fix broken zlib download path
2022-03-29 15:01:43 -04:00
JamesEMcClure
68dd158689
Merge pull request #64 from thomaram/adjust_perm
...
Add perm converter
2022-03-29 04:49:27 -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
JamesEMcClure
70b12830cb
Merge pull request #63 from thomaram/adjust_perm
...
Add adjusted perms
2022-03-21 14:16:13 -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
trams@equinor.com
fe2496ebdd
Add film corrected eff perms
...
modified: models/ColorModel.cpp
2022-03-18 14:54:47 +01: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
Zhe Rex Li
ea90e9f875
Merge branch 'master' into slipping_vel_debug
2022-01-28 16:29:30 +11:00
Li Rex
71fdedaa2f
clean up code for the updated slipping vel BC
2022-01-28 16:26:34 +11:00
Li Rex
02932e26c5
update slipping vel bc also in HIP version
2022-01-27 16:49:05 +11:00
Li Rex
d811727958
udpate cuda with corrected slipping vel BC
2022-01-27 14:44:41 +11:00
James McClure
f49b281d29
add initial radius option to morphdrain
2022-01-26 12:41:58 -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
07b8f9ba36
update arden script
2022-01-13 11:18:34 -05:00
James McClure
35bea97b2e
update morph test based on critical radius adjustment
2022-01-12 16:07:59 -05:00
James McClure
30e0a4e24b
fix bug in morphopen
2022-01-12 14:31:12 -05:00
James McClure
ce8498a9ce
add pubs
2021-12-25 18:06:04 -05:00
James McClure
f93a4d3bba
update to greyscale
2021-12-24 11:52:54 -05:00
James E McClure
5b33e96984
update build script for summit
2021-12-21 15:49:11 -05:00
James E McClure
7523114937
merge color profiling
2021-12-21 11:38:16 -05:00
James McClure
bb4ce1aa09
fix string with gcc 10.2
2021-12-16 20:35:06 -05:00
James McClure
3297fd04f6
example cuda - hip conversion
2021-12-16 14:18:30 -05:00
James McClure
5c3a149ab6
add droplet input file
2021-12-16 12:07:16 -05:00
James McClure
5c794e0bd0
fix sign on geodesic curvature
2021-12-15 07:35:10 -05:00
James McClure
d259434e5f
fix compiler warning
2021-12-14 16:47:27 -05:00
James McClure
66be77aeae
update deficit curvature test
2021-12-14 16:46:00 -05:00
James McClure
012c1814c6
contact angle + deficit curvature tools
2021-12-14 07:07:27 -05:00
James McClure
011b2f8a87
added analysis tools for TwoPhase object
2021-12-13 16:04:20 -05:00
James McClure
93f99057bb
added droplet examples
2021-12-13 11:02:17 -05:00
James McClure
fb99e78815
add docx
2021-12-12 13:16:01 -05:00
James McClure
499b765d64
Merge branch 'master' into opm
2021-12-12 11:42:44 -05:00
James McClure
bb51c75692
update sample script
2021-12-12 11:42:32 -05:00
James McClure
44a7653c60
checkout right color model
2021-12-10 12:19:08 -05:00
James McClure
90c3513e09
fix merge
2021-12-09 15:38:54 -05:00
James McClure
f0042bafea
update ubuntu sample script
2021-12-09 14:02:32 -05:00
James McClure
ba67d29e5c
fix memory leak
2021-12-09 14:01:27 -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
Rex Zhe Li
8fce93fc47
update solid BCs of Poisson solver in GPU;to be built and tested
2021-12-06 13:50:17 +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
