diff --git a/Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil-different-intrinsic.py b/Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil-different-intrinsic.py index d6403c71779fdfb9999885362455aa88dfaf05d6..d6b0ea91676cd4767bb24c85cd3c15c7b80896e7 100755 --- a/Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil-different-intrinsic.py +++ b/Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil-different-intrinsic.py @@ -49,7 +49,7 @@ datestr = date.strftime("%Y-%m-%d") # Name of the usecase that will be printed during simulation. -use_case = "TP-TP-layered_soil-realistic-different-intrinsic" +use_case = "TP-TP-layered_soil-test-monomial" # The name of this very file. Needed for creating log output. thisfile = "TP-TP-layered_soil-different-intrinsic.py" @@ -65,8 +65,8 @@ resolutions = { # 2: 1e-6, # 4: 1e-6, # 8: 1e-5, - # 16: 5e-6, - 32: 1e-6, + 16: 3e-6, + # 32: 1e-6, # 64: 2e-6, # 128: 1e-6, # 256: 1e-6, @@ -235,17 +235,40 @@ intrinsic_permeability = { } # relative permeabilties +# rel_perm_definition = { +# 1: {"wetting": "Spow2", +# "nonwetting": "oneMinusSpow2"}, +# 2: {"wetting": "Spow2", +# "nonwetting": "oneMinusSpow2"}, +# 3: {"wetting": "Spow3", +# "nonwetting": "oneMinusSpow3"}, +# 4: {"wetting": "Spow3", +# "nonwetting": "oneMinusSpow3"}, +# } + rel_perm_definition = { - 1: {"wetting": "Spow2", - "nonwetting": "oneMinusSpow2"}, - 2: {"wetting": "Spow2", - "nonwetting": "oneMinusSpow2"}, - 3: {"wetting": "Spow3", - "nonwetting": "oneMinusSpow3"}, - 4: {"wetting": "Spow3", - "nonwetting": "oneMinusSpow3"}, + 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 = { +# 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) relative_permeability = rel_perm_dict["ka"] ka_prime = rel_perm_dict["ka_prime"] diff --git a/Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil-second-example.py b/Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil-second-example.py index d59c119530604279a2e3558185c39f92f82d164e..8a334057e4ce9cb61f693576c146ebffd0cfa303 100755 --- a/Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil-second-example.py +++ b/Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil-second-example.py @@ -231,17 +231,28 @@ intrinsic_permeability = { } # 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 = { - 1: {"wetting": "Spow2", - "nonwetting": "oneMinusSpow2"}, - 2: {"wetting": "Spow2", - "nonwetting": "oneMinusSpow2"}, - 3: {"wetting": "Spow3", - "nonwetting": "oneMinusSpow3"}, - 4: {"wetting": "Spow3", - "nonwetting": "oneMinusSpow3"}, + 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) relative_permeability = rel_perm_dict["ka"] ka_prime = rel_perm_dict["ka_prime"] diff --git a/Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil.py b/Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil.py index 41dc58927f301253460ab26dd1463e3eab67d82d..2250f0d676845c4e95c02debdcaef88cd97f03dd 100755 --- a/Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil.py +++ b/Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil.py @@ -235,15 +235,25 @@ intrinsic_permeability = { } # 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 = { - 1: {"wetting": "Spow2", - "nonwetting": "oneMinusSpow2"}, - 2: {"wetting": "Spow2", - "nonwetting": "oneMinusSpow2"}, - 3: {"wetting": "Spow3", - "nonwetting": "oneMinusSpow3"}, - 4: {"wetting": "Spow3", - "nonwetting": "oneMinusSpow3"}, + 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) diff --git a/Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil_pure_dd.py b/Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil_pure_dd.py index 02f2ca3ad0297152b82a2336c92339d30ba127de..ab9e7dede9b7660ecf641f4aae1fc2aa36851b62 100755 --- a/Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil_pure_dd.py +++ b/Usecases/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case/TP-TP-layered_soil_pure_dd.py @@ -48,7 +48,7 @@ date = datetime.datetime.now() datestr = date.strftime("%Y-%m-%d") # Name of the usecase that will be printed during simulation. -use_case = "TP-TP-layered-pure-dd" +use_case = "TP-TP-layered-pure-dd-vanG-Mualem" # The name of this very file. Needed for creating log output. thisfile = "TP-TP-layered_soil_pure_dd.py" @@ -234,15 +234,26 @@ intrinsic_permeability = { } # 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": 2}}, +# "nonwetting": {"monomial": {"power": 2}} }, +# 4: {"wetting": {"monomial": {"power": 2}}, +# "nonwetting": {"monomial": {"power": 2}} }, +# } + rel_perm_definition = { - 1: {"wetting": "Spow2", - "nonwetting": "oneMinusSpow2"}, - 2: {"wetting": "Spow2", - "nonwetting": "oneMinusSpow2"}, - 3: {"wetting": "Spow2", - "nonwetting": "oneMinusSpow2"}, - 4: {"wetting": "Spow2", - "nonwetting": "oneMinusSpow2"}, + 1: {"wetting": {"vanGenuchtenMualem": {"n": 3}}, + "nonwetting": {"vanGenuchtenMualem": {"n": 3}} }, + 2: {"wetting": {"vanGenuchtenMualem": {"n": 3}}, + "nonwetting": {"vanGenuchtenMualem": {"n": 3}} }, + 3: {"wetting": {"vanGenuchtenMualem": {"n": 3}}, + "nonwetting": {"vanGenuchtenMualem": {"n": 3}} }, + 4: {"wetting": {"vanGenuchtenMualem": {"n": 3}}, + "nonwetting": {"vanGenuchtenMualem": {"n": 3}} }, } rel_perm_dict = fts.generate_relative_permeability_dicts(rel_perm_definition)