-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #13141 from WilkAndy/nw_vg_relperm_13137
Nonwetting vanGenuchten relperm in PorousFlow
- Loading branch information
Showing
12 changed files
with
233 additions
and
77 deletions.
There are no files selected for viewing
Binary file modified
BIN
-137 KB
(22%)
modules/porous_flow/doc/content/media/porous_flow/relperm_vg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 20 additions & 21 deletions
41
modules/porous_flow/test/tests/relperm/gold/vangenuchten1_out_vpp_0001.csv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -1,22 +1,21 @@ | |||
x,y,z,id,s0aux,s1aux,kr0aux,kr1aux | x,y,z,id,s0aux,s1aux,kr0aux,kr1aux | ||
0,0,0,0,0.995,0.005,0.81767127272099,4.3064800892356e-11 | 0,0,0,0,0.995,0.005,0.81767127272099,0.00079468337511365 | ||
0.052631578947368,0,0,0.052631578947368,0.945,0.055,0.44044507951165,5.4900521340933e-07 | 0.052631578947368,0,0,0.052631578947368,0.945,0.055,0.44044507951165,0.025110851800172 | ||
0.10526315789474,0,0,0.10526315789474,0.895,0.105,0.2903772133122,9.9607515954477e-06 | 0.10526315789474,0,0,0.10526315789474,0.895,0.105,0.2903772133122,0.06448949485448 | ||
0.15789473684211,0,0,0.15789473684211,0.845,0.155,0.19901105764177,5.7663441077274e-05 | 0.15789473684211,0,0,0.15789473684211,0.845,0.155,0.19901105764177,0.11259819392439 | ||
0.21052631578947,0,0,0.21052631578947,0.785,0.215,0.12830647743282,0.0002539594790149 | 0.21052631578947,0,0,0.21052631578947,0.785,0.215,0.12830647743282,0.17795538116674 | ||
0.26315789473684,0,0,0.26315789473684,0.735,0.265,0.088872460313874,0.00065862579390779 | 0.26315789473684,0,0,0.26315789473684,0.735,0.265,0.088872460313874,0.23668776512578 | ||
0.31578947368421,0,0,0.31578947368421,0.685,0.315,0.061001763100158,0.0014555937764247 | 0.31578947368421,0,0,0.31578947368421,0.685,0.315,0.061001763100158,0.29789909636912 | ||
0.36842105263158,0,0,0.36842105263158,0.635,0.365,0.041248157468635,0.0028772971835911 | 0.36842105263158,0,0,0.36842105263158,0.635,0.365,0.041248157468635,0.36054389329128 | ||
0.42105263157895,0,0,0.42105263157895,0.575,0.425,0.02508173623612,0.0058620826279179 | 0.42105263157895,0,0,0.42105263157895,0.575,0.425,0.02508173623612,0.43637851184429 | ||
0.47368421052632,0,0,0.47368421052632,0.525,0.475,0.016068838953146,0.0099302872835256 | 0.47368421052632,0,0,0.47368421052632,0.525,0.475,0.016068838953146,0.49923931543403 | ||
0.52631578947368,0,0,0.52631578947368,0.475,0.525,0.0099302872835256,0.016068838953146 | 0.52631578947368,0,0,0.52631578947368,0.475,0.525,0.0099302872835256,0.56108529784636 | ||
0.57894736842105,0,0,0.57894736842105,0.425,0.575,0.0058620826279179,0.025081736236119 | 0.57894736842105,0,0,0.57894736842105,0.425,0.575,0.0058620826279179,0.62131825072922 | ||
0.63157894736842,0,0,0.63157894736842,0.365,0.635,0.0028772971835911,0.041248157468635 | 0.63157894736842,0,0,0.63157894736842,0.365,0.635,0.0028772971835911,0.69070140912018 | ||
0.68421052631579,0,0,0.68421052631579,0.315,0.685,0.0014555937764247,0.061001763100158 | 0.68421052631579,0,0,0.68421052631579,0.315,0.685,0.0014555937764247,0.74551858725947 | ||
0.73684210526316,0,0,0.73684210526316,0.265,0.735,0.00065862579390779,0.088872460313874 | 0.73684210526316,0,0,0.73684210526316,0.265,0.735,0.00065862579390779,0.79710990847103 | ||
0.78947368421053,0,0,0.78947368421053,0.215,0.785,0.0002539594790149,0.12830647743282 | 0.78947368421053,0,0,0.78947368421053,0.215,0.785,0.0002539594790149,0.84504001337092 | ||
0.84210526315789,0,0,0.84210526315789,0.155,0.845,5.7663441077274e-05,0.19901105764177 | 0.84210526315789,0,0,0.84210526315789,0.155,0.845,5.7663441077274e-05,0.89714653900473 | ||
0.89473684210526,0,0,0.89473684210526,0.105,0.895,9.9607515954477e-06,0.2903772133122 | 0.89473684210526,0,0,0.89473684210526,0.105,0.895,9.9607515954477e-06,0.93560608146977 | ||
0.94736842105263,0,0,0.94736842105263,0.055,0.945,5.4900521340933e-07,0.44044507951165 | 0.94736842105263,0,0,0.94736842105263,0.055,0.945,5.4900521340933e-07,0.96916170874622 | ||
1,0,0,1,0.005,0.995,4.3064800892356e-11,0.81767127272099 | 1,0,0,1,0.005,0.995,4.3064800892356e-11,0.99746260954264 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.