From fd195f1e4a572627b59b80da2ef72bb2540eeb99 Mon Sep 17 00:00:00 2001
From: David <forenkram@gmx.de>
Date: Thu, 15 Oct 2020 21:23:29 +0200
Subject: [PATCH] update to vanG-Mualem
---
.../TP-TP-layered_soil-different-intrinsic.py | 45 ++++++++++++++-----
.../TP-TP-layered_soil-second-example.py | 27 +++++++----
.../TP-TP-layered_soil.py | 26 +++++++----
.../TP-TP-layered_soil_pure_dd.py | 29 ++++++++----
4 files changed, 91 insertions(+), 36 deletions(-)
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 d6403c7..d6b0ea9 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 d59c119..8a33405 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 41dc589..2250f0d 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 02f2ca3..ab9e7de 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)
--
GitLab