Skip to content
Snippets Groups Projects
Commit a7360868 authored by David's avatar David
Browse files

update to vanGenuchten-Mualem

parent fd195f1e
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 91 additions and 64 deletions
Usecases/Two-phase-Richards/multi-patch/layered_soil/TP-R-layered_soil-all-params-one.py
+ 18
− 8
View file @ a7360868
...@@ -242,15 +242,25 @@ intrinsic_permeability = { ...@@ -242,15 +242,25 @@ intrinsic_permeability = {
} }
# relative permeabilties # relative permeabilties
# rel_perm_definition = {
# 1: {"wetting": {"monomial": {"power": 2}},
# "nonwetting": {"monomial": {"power": 2}} },
# 2: {"wetting": {"monomial": {"power": 2}},
# "nonwetting": {"monomial": {"power": 2}} },
# 3: {"wetting": {"monomial": {"power": 3}},
# "nonwetting": {"monomial": {"power": 3}} },
# 4: {"wetting": {"monomial": {"power": 3}},
# "nonwetting": {"monomial": {"power": 3}} },
# }
rel_perm_definition = { rel_perm_definition = {
1: {"wetting": "Spow2", 1: {"wetting": {"vanGenuchtenMualem": {"n": 3}},
"nonwetting": "oneMinusSpow2"}, "nonwetting": {"vanGenuchtenMualem": {"n": 3}} },
2: {"wetting": "Spow2", 2: {"wetting": {"vanGenuchtenMualem": {"n": 3}},
"nonwetting": "oneMinusSpow2"}, "nonwetting": {"vanGenuchtenMualem": {"n": 3}} },
3: {"wetting": "Spow3", 3: {"wetting": {"vanGenuchtenMualem": {"n": 6}},
"nonwetting": "oneMinusSpow3"}, "nonwetting": {"vanGenuchtenMualem": {"n": 6}} },
4: {"wetting": "Spow3", 4: {"wetting": {"vanGenuchtenMualem": {"n": 6}},
"nonwetting": "oneMinusSpow3"}, "nonwetting": {"vanGenuchtenMualem": {"n": 6}} },
} }
rel_perm_dict = fts.generate_relative_permeability_dicts(rel_perm_definition) rel_perm_dict = fts.generate_relative_permeability_dicts(rel_perm_definition)
... ...
......
Usecases/Two-phase-Richards/multi-patch/layered_soil/TP-R-layered_soil-g-but-same-perm-coarse-dt-longterm.py
+ 18
− 8
View file @ a7360868
...@@ -257,15 +257,25 @@ intrinsic_permeability = { ...@@ -257,15 +257,25 @@ intrinsic_permeability = {
} }
# relative permeabilties # relative permeabilties
# rel_perm_definition = {
# 1: {"wetting": {"monomial": {"power": 2}},
# "nonwetting": {"monomial": {"power": 2}} },
# 2: {"wetting": {"monomial": {"power": 2}},
# "nonwetting": {"monomial": {"power": 2}} },
# 3: {"wetting": {"monomial": {"power": 3}},
# "nonwetting": {"monomial": {"power": 3}} },
# 4: {"wetting": {"monomial": {"power": 3}},
# "nonwetting": {"monomial": {"power": 3}} },
# }
rel_perm_definition = { rel_perm_definition = {
1: {"wetting": "Spow2", 1: {"wetting": {"vanGenuchtenMualem": {"n": 3}},
"nonwetting": "oneMinusSpow2"}, "nonwetting": {"vanGenuchtenMualem": {"n": 3}} },
2: {"wetting": "Spow2", 2: {"wetting": {"vanGenuchtenMualem": {"n": 3}},
"nonwetting": "oneMinusSpow2"}, "nonwetting": {"vanGenuchtenMualem": {"n": 3}} },
3: {"wetting": "Spow3", 3: {"wetting": {"vanGenuchtenMualem": {"n": 6}},
"nonwetting": "oneMinusSpow3"}, "nonwetting": {"vanGenuchtenMualem": {"n": 6}} },
4: {"wetting": "Spow3", 4: {"wetting": {"vanGenuchtenMualem": {"n": 6}},
"nonwetting": "oneMinusSpow3"}, "nonwetting": {"vanGenuchtenMualem": {"n": 6}} },
} }
rel_perm_dict = fts.generate_relative_permeability_dicts(rel_perm_definition) rel_perm_dict = fts.generate_relative_permeability_dicts(rel_perm_definition)
... ...
......
Usecases/Two-phase-Richards/multi-patch/layered_soil/TP-R-layered_soil-g-but-same-perm.py
+ 21
− 11
View file @ a7360868
...@@ -66,7 +66,7 @@ resolutions = { ...@@ -66,7 +66,7 @@ resolutions = {
# 4: 1e-6, # 4: 1e-6,
# 8: 1e-5, # 8: 1e-5,
# 16: 5e-6, # 16: 5e-6,
32: 5e-6, 32: 4e-6,
# 64: 2e-6, # 64: 2e-6,
# 128: 1e-6, # 128: 1e-6,
# 256: 1e-6, # 256: 1e-6,
...@@ -78,9 +78,9 @@ resolutions = { ...@@ -78,9 +78,9 @@ resolutions = {
# that this initial timestep should be counted as. # that this initial timestep should be counted as.
# Format: # Format:
# timestep_num: initial_time # timestep_num: initial_time
starttimes = {650: 0.650} starttimes = {0: 0.0}
timestep_size = 0.001 timestep_size = 0.001
number_of_timesteps = 550 number_of_timesteps = 1200
# LDD scheme parameters ###################################################### # LDD scheme parameters ######################################################
...@@ -249,15 +249,25 @@ intrinsic_permeability = { ...@@ -249,15 +249,25 @@ intrinsic_permeability = {
} }
# relative permeabilties # relative permeabilties
# rel_perm_definition = {
# 1: {"wetting": {"monomial": {"power": 2}},
# "nonwetting": {"monomial": {"power": 2}} },
# 2: {"wetting": {"monomial": {"power": 2}},
# "nonwetting": {"monomial": {"power": 2}} },
# 3: {"wetting": {"monomial": {"power": 3}},
# "nonwetting": {"monomial": {"power": 3}} },
# 4: {"wetting": {"monomial": {"power": 3}},
# "nonwetting": {"monomial": {"power": 3}} },
# }
rel_perm_definition = { rel_perm_definition = {
1: {"wetting": "Spow2", 1: {"wetting": {"vanGenuchtenMualem": {"n": 3}},
"nonwetting": "oneMinusSpow2"}, "nonwetting": {"vanGenuchtenMualem": {"n": 3}} },
2: {"wetting": "Spow2", 2: {"wetting": {"vanGenuchtenMualem": {"n": 3}},
"nonwetting": "oneMinusSpow2"}, "nonwetting": {"vanGenuchtenMualem": {"n": 3}} },
3: {"wetting": "Spow3", 3: {"wetting": {"vanGenuchtenMualem": {"n": 6}},
"nonwetting": "oneMinusSpow3"}, "nonwetting": {"vanGenuchtenMualem": {"n": 6}} },
4: {"wetting": "Spow3", 4: {"wetting": {"vanGenuchtenMualem": {"n": 6}},
"nonwetting": "oneMinusSpow3"}, "nonwetting": {"vanGenuchtenMualem": {"n": 6}} },
} }
rel_perm_dict = fts.generate_relative_permeability_dicts(rel_perm_definition) rel_perm_dict = fts.generate_relative_permeability_dicts(rel_perm_definition)
... ...
......
Usecases/Two-phase-Richards/multi-patch/layered_soil/TP-R-layered_soil.py
+ 18
− 8
View file @ a7360868
...@@ -253,15 +253,25 @@ intrinsic_permeability = { ...@@ -253,15 +253,25 @@ intrinsic_permeability = {
} }
# relative permeabilties # relative permeabilties
# rel_perm_definition = {
# 1: {"wetting": {"monomial": {"power": 2}},
# "nonwetting": {"monomial": {"power": 2}} },
# 2: {"wetting": {"monomial": {"power": 2}},
# "nonwetting": {"monomial": {"power": 2}} },
# 3: {"wetting": {"monomial": {"power": 3}},
# "nonwetting": {"monomial": {"power": 3}} },
# 4: {"wetting": {"monomial": {"power": 3}},
# "nonwetting": {"monomial": {"power": 3}} },
# }
rel_perm_definition = { rel_perm_definition = {
1: {"wetting": "Spow2", 1: {"wetting": {"vanGenuchtenMualem": {"n": 3}},
"nonwetting": "oneMinusSpow2"}, "nonwetting": {"vanGenuchtenMualem": {"n": 3}} },
2: {"wetting": "Spow2", 2: {"wetting": {"vanGenuchtenMualem": {"n": 3}},
"nonwetting": "oneMinusSpow2"}, "nonwetting": {"vanGenuchtenMualem": {"n": 3}} },
3: {"wetting": "Spow3", 3: {"wetting": {"vanGenuchtenMualem": {"n": 6}},
"nonwetting": "oneMinusSpow3"}, "nonwetting": {"vanGenuchtenMualem": {"n": 6}} },
4: {"wetting": "Spow3", 4: {"wetting": {"vanGenuchtenMualem": {"n": 6}},
"nonwetting": "oneMinusSpow3"}, "nonwetting": {"vanGenuchtenMualem": {"n": 6}} },
} }
rel_perm_dict = fts.generate_relative_permeability_dicts(rel_perm_definition) rel_perm_dict = fts.generate_relative_permeability_dicts(rel_perm_definition)
... ...
......
Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil-different-intrinsic.py
+ 16
− 29
View file @ a7360868
...@@ -236,39 +236,26 @@ intrinsic_permeability = { ...@@ -236,39 +236,26 @@ intrinsic_permeability = {
# relative permeabilties # relative permeabilties
# rel_perm_definition = { # rel_perm_definition = {
# 1: {"wetting": "Spow2", # 1: {"wetting": {"monomial": {"power": 2}},
# "nonwetting": "oneMinusSpow2"}, # "nonwetting": {"monomial": {"power": 2}} },
# 2: {"wetting": "Spow2", # 2: {"wetting": {"monomial": {"power": 2}},
# "nonwetting": "oneMinusSpow2"}, # "nonwetting": {"monomial": {"power": 2}} },
# 3: {"wetting": "Spow3", # 3: {"wetting": {"monomial": {"power": 3}},
# "nonwetting": "oneMinusSpow3"}, # "nonwetting": {"monomial": {"power": 3}} },
# 4: {"wetting": "Spow3", # 4: {"wetting": {"monomial": {"power": 3}},
# "nonwetting": "oneMinusSpow3"}, # "nonwetting": {"monomial": {"power": 3}} },
# } # }
rel_perm_definition = { rel_perm_definition = {
1: {"wetting": {"monomial": {"power": 2}}, 1: {"wetting": {"vanGenuchtenMualem": {"n": 3}},
"nonwetting": {"monomial": {"power": 2}} }, "nonwetting": {"vanGenuchtenMualem": {"n": 3}} },
2: {"wetting": {"monomial": {"power": 2}}, 2: {"wetting": {"vanGenuchtenMualem": {"n": 3}},
"nonwetting": {"monomial": {"power": 2}} }, "nonwetting": {"vanGenuchtenMualem": {"n": 3}} },
3: {"wetting": {"monomial": {"power": 3}}, 3: {"wetting": {"vanGenuchtenMualem": {"n": 6}},
"nonwetting": {"monomial": {"power": 3}} }, "nonwetting": {"vanGenuchtenMualem": {"n": 6}} },
4: {"wetting": {"monomial": {"power": 3}}, 4: {"wetting": {"vanGenuchtenMualem": {"n": 6}},
"nonwetting": {"monomial": {"power": 3}} }, "nonwetting": {"vanGenuchtenMualem": {"n": 6}} },
} }
#
# rel_perm_definition = {
# 1: {"wetting": {"vanGenuchtenMualem": {"n": 3}},
# "nonwetting": {"vanGenuchtenMualem": {"n": 3}} },
# 2: {"wetting": {"vanGenuchtenMualem": {"n": 3}},
# "nonwetting": {"vanGenuchtenMualem": {"n": 3}} },
# 3: {"wetting": {"vanGenuchtenMualem": {"n": 6}},
# "nonwetting": {"vanGenuchtenMualem": {"n": 6}} },
# 4: {"wetting": {"vanGenuchtenMualem": {"n": 6}},
# "nonwetting": {"vanGenuchtenMualem": {"n": 6}} },
# }
rel_perm_dict = fts.generate_relative_permeability_dicts(rel_perm_definition) rel_perm_dict = fts.generate_relative_permeability_dicts(rel_perm_definition)
relative_permeability = rel_perm_dict["ka"] relative_permeability = rel_perm_dict["ka"]
ka_prime = rel_perm_dict["ka_prime"] ka_prime = rel_perm_dict["ka_prime"]
... ...
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment