From 6ad4f460e9a32de94c9ac31f7989e6b5e09424f1 Mon Sep 17 00:00:00 2001
From: David Seus <david.seus@ians.uni-stuttgart.de>
Date: Fri, 4 Oct 2019 10:39:27 +0200
Subject: [PATCH] starte testrechnung

---
 .../TP-R-2-patch-test.py                      | 20 +++++++++----------
 ...soil_with_inner_patch-realistic-pure-dd.py | 20 +++++++++----------
 ...h-with-gravity-same-wetting-phase-as-RR.py |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Two-phase-Richards/two-patch/TP-R-two-patch-test-case/TP-R-2-patch-test.py b/Two-phase-Richards/two-patch/TP-R-two-patch-test-case/TP-R-2-patch-test.py
index 98511fd..3853c34 100755
--- a/Two-phase-Richards/two-patch/TP-R-two-patch-test-case/TP-R-2-patch-test.py
+++ b/Two-phase-Richards/two-patch/TP-R-two-patch-test-case/TP-R-2-patch-test.py
@@ -38,19 +38,19 @@ resolutions = {
 
 ############ GRID #######################
 # mesh_resolution = 20
-timestep_size = 0.001
-number_of_timesteps = 1200
-plot_timestep_every = 5
+timestep_size = 0.0001
+number_of_timesteps = 20
+plot_timestep_every = 1
 # decide how many timesteps you want analysed. Analysed means, that we write out
 # subsequent errors of the L-iteration within the timestep.
-number_of_timesteps_to_analyse = 6
+number_of_timesteps_to_analyse = 0
 starttimes = [0.0]
 
-Lw = 10 #/timestep_size
+Lw = 5 #/timestep_size
 Lnw=Lw
 
-lambda_w = 4
-lambda_nw = 4
+lambda_w = 40
+lambda_nw = 40
 
 include_gravity = True
 debugflag = True
@@ -368,9 +368,9 @@ x, y = sym.symbols('x[0], x[1]')  # needed by UFL
 t = sym.symbols('t', positive=True)
 
 p_e_sym = {
-    1: {'wetting': (-5.0 - (1.0 + t*t)*(1.0 + x*x + y*y))}, #*(1-x)**2*(1+x)**2*(1-y)**2},
-    2: {'wetting': (-5.0 - (1.0 + t*t)*(1.0 + x*x)), #*(1-x)**2*(1+x)**2*(1+y)**2,
-        'nonwetting': (-1-t*(1.1+y + x**2))*y**3}, #*(1-x)**2*(1+x)**2*(1+y)**2},
+    1: {'wetting': (-7.0 - (1.0 + t*t)*(1.0 + x*x + y*y))}, #*(1-x)**2*(1+x)**2*(1-y)**2},
+    2: {'wetting': (-7.0 - (1.0 + t*t)*(1.0 + x*x)), #*(1-x)**2*(1+x)**2*(1+y)**2,
+        'nonwetting': (-1-t*(1.1+y + x**2))*y**2}, #*(1-x)**2*(1+x)**2*(1+y)**2},
 } #-y*y*(sym.sin(-2*t+2*x)*sym.sin(1/2*y-1.2*t)) - t*t*x*(0.5-y)*y*(1-x)
 
 
diff --git a/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch-realistic-pure-dd.py b/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch-realistic-pure-dd.py
index e1bc584..abb801d 100755
--- a/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch-realistic-pure-dd.py
+++ b/Two-phase-Two-phase/multi-patch/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch-realistic-pure-dd.py
@@ -27,7 +27,7 @@ datestr = date.strftime("%Y-%m-%d")
 # init sympy session
 sym.init_printing()
 # solver_tol = 6E-7
-use_case = "TP-TP-layered-soil-realistic-pure-DD"
+use_case = "TP-TP-layered-soil-with-inner-patch-realistic-pure-DD"
 max_iter_num = 1000
 FEM_Lagrange_degree = 1
 mesh_study = False
@@ -37,29 +37,29 @@ resolutions = {
                 # 4: 1e-6,  # h=0.5590
                 # 8: 1e-6,  # h=0.2814
                 # 16: 5e-7, # h=0.1412
-                # 32: 4e-7,   # h=0.0706
-                64: 1e-6,
+                32: 7e-7,   # h=0.0706
+                # 64: 1e-6,
                 # 128: 5e-7
                 }
 
 ############ GRID #######################
 # mesh_resolution = 20
-timestep_size = 0.001
-number_of_timesteps = 1100
+timestep_size = 0.00001
+number_of_timesteps = 20
 plot_timestep_every = 5
 # decide how many timesteps you want analysed. Analysed means, that we write out
 # subsequent errors of the L-iteration within the timestep.
 number_of_timesteps_to_analyse = 10
 starttime = 0.0
 
-Lw = 0.025 #/timestep_size
+Lw = 0.5 #/timestep_size
 Lnw=Lw
 
-lambda_w = 20
-lambda_nw = 20
+lambda_w = 400
+lambda_nw = 400
 
-include_gravity = False
-debugflag = False
+include_gravity = True
+debugflag = True
 analyse_condition = True
 
 if mesh_study:
diff --git a/Two-phase-Two-phase/multi-patch/TP-multi-patch-plus-gravity-with-same-wetting-phase-as-RR/TP-multi-patch-with-gravity-same-wetting-phase-as-RR.py b/Two-phase-Two-phase/multi-patch/TP-multi-patch-plus-gravity-with-same-wetting-phase-as-RR/TP-multi-patch-with-gravity-same-wetting-phase-as-RR.py
index 1ad562e..f041741 100755
--- a/Two-phase-Two-phase/multi-patch/TP-multi-patch-plus-gravity-with-same-wetting-phase-as-RR/TP-multi-patch-with-gravity-same-wetting-phase-as-RR.py
+++ b/Two-phase-Two-phase/multi-patch/TP-multi-patch-plus-gravity-with-same-wetting-phase-as-RR/TP-multi-patch-with-gravity-same-wetting-phase-as-RR.py
@@ -18,7 +18,7 @@ datestr = date.strftime("%Y-%m-%d")
 # init sympy session
 sym.init_printing()
 # solver_tol = 6E-7
-use_case = "TP-TP-layered-soil-realistic-model-change-at-interface12"
+use_case = "TP-TP-4-patch-nonwetting-zero"
 max_iter_num = 1000
 FEM_Lagrange_degree = 1
 mesh_study = False
-- 
GitLab