From 35414d3fd8801f878f52b50fb4a754cfc01b43ca Mon Sep 17 00:00:00 2001
From: David <forenkram@gmx.de>
Date: Mon, 8 Jun 2020 18:29:03 +0200
Subject: [PATCH] fix TPR with inner patch and set up calc for ianscluster08
---
...ed_soil_with_inner_patch-all-params-one.py | 89 ++++++++++---------
...layered_soil_with_inner_patch-realistic.py | 27 +++---
2 files changed, 61 insertions(+), 55 deletions(-)
mode change 100644 => 100755 Two-phase-Richards/multi-patch/layered_soil_with_inner_patch/TP-R-layered_soil_with_inner_patch-all-params-one.py
diff --git a/Two-phase-Richards/multi-patch/layered_soil_with_inner_patch/TP-R-layered_soil_with_inner_patch-all-params-one.py b/Two-phase-Richards/multi-patch/layered_soil_with_inner_patch/TP-R-layered_soil_with_inner_patch-all-params-one.py
old mode 100644
new mode 100755
index d96b0f2..90487ef
--- a/Two-phase-Richards/multi-patch/layered_soil_with_inner_patch/TP-R-layered_soil_with_inner_patch-all-params-one.py
+++ b/Two-phase-Richards/multi-patch/layered_soil_with_inner_patch/TP-R-layered_soil_with_inner_patch-all-params-one.py
@@ -22,10 +22,13 @@ else:
directory")
+date = datetime.datetime.now()
+datestr = date.strftime("%Y-%m-%d")
+
# init sympy session
sym.init_printing()
# solver_tol = 6E-7
-use_case = "TP-R-layered-soil-with-inner-patch-realistic"
+use_case = "TP-R-layered-soil-with-inner-patch-all-params-one"
# name of this very file. Needed for log output.
thisfile = "TP-R-layered_soil_with_inner_patch-all-params-one.py"
@@ -37,66 +40,66 @@ resolutions = {
# 2: 2e-6, # h=1.1180
# 4: 2e-6, # h=0.5590
# 8: 2e-6, # h=0.2814
- 16: 2e-6, # h=0.1412
+ # 16: 2e-6, # h=0.1412
# 32: 2e-6,
- # 64: 2e-6,
+ 64: 2e-6,
# 128: 2e-6
}
# GRID #######################
# mesh_resolution = 20
timestep_size = 0.001
-number_of_timesteps = 5
-plot_timestep_every = 1
+number_of_timesteps = 1000
+plot_timestep_every = 4
# 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 = 5
starttimes = [0.0]
-Lw1 = 0.025 # /timestep_size
+Lw1 = 0.25 # /timestep_size
Lnw1 = Lw1
-Lw2 = 0.025 # /timestep_size
+Lw2 = 0.25 # /timestep_size
Lnw2 = Lw2
-Lw3 = 0.025 # /timestep_size
+Lw3 = 0.25 # /timestep_size
Lnw3 = Lw3
-Lw4 = 0.025 # /timestep_size
+Lw4 = 0.25 # /timestep_size
Lnw4 = Lw4
-Lw5 = 0.025 # /timestep_size
+Lw5 = 0.25 # /timestep_size
Lnw5 = Lw5
-Lw6 = 0.025 # /timestep_size
+Lw6 = 0.25 # /timestep_size
Lnw6 = Lw6
-lambda12_w = 40
-lambda12_nw = 40
+lambda12_w = 4
+lambda12_nw = 4
-lambda23_w = 40
-lambda23_nw = 40
+lambda23_w = 4
+lambda23_nw = 4
-lambda24_w = 40
-lambda24_nw= 40
+lambda24_w = 4
+lambda24_nw= 4
-lambda25_w= 40
-lambda25_nw= 40
+lambda25_w= 4
+lambda25_nw= 4
-lambda34_w = 40
-lambda34_nw = 40
+lambda34_w = 4
+lambda34_nw = 4
-lambda36_w = 40
-lambda36_nw = 40
+lambda36_w = 4
+lambda36_nw = 4
-lambda45_w = 40
-lambda45_nw = 40
+lambda45_w = 4
+lambda45_nw = 4
-lambda46_w = 40
-lambda46_nw = 40
+lambda46_w = 4
+lambda46_nw = 4
-lambda56_w = 40
-lambda56_nw = 40
+lambda56_w = 4
+lambda56_nw = 4
include_gravity = False
debugflag = True
@@ -119,7 +122,7 @@ if mesh_study:
write_to_file = {
'space_errornorms': True,
'meshes_and_markers': True,
- 'L_iterations_per_timestep': False,
+ 'L_iterations_per_timestep': True,
'solutions': True,
'absolute_differences': True,
'condition_numbers': analyse_condition,
@@ -129,7 +132,7 @@ else:
write_to_file = {
'space_errornorms': True,
'meshes_and_markers': True,
- 'L_iterations_per_timestep': False,
+ 'L_iterations_per_timestep': True,
'solutions': True,
'absolute_differences': True,
'condition_numbers': analyse_condition,
@@ -406,18 +409,18 @@ porosity = {
# subdom_num : subdomain L for L-scheme
L = {
- 1: {'wetting' :Lw,
- 'nonwetting': Lnw},
- 2: {'wetting' :Lw,
- 'nonwetting': Lnw},
- 3: {'wetting' :Lw,
- 'nonwetting': Lnw},
- 4: {'wetting' :Lw,
- 'nonwetting': Lnw},
- 5: {'wetting' :Lw,
- 'nonwetting': Lnw},
- 6: {'wetting' :Lw,
- 'nonwetting': Lnw}
+ 1: {'wetting' :Lw1,
+ 'nonwetting': Lnw1},
+ 2: {'wetting' :Lw2,
+ 'nonwetting': Lnw2},
+ 3: {'wetting' :Lw3,
+ 'nonwetting': Lnw3},
+ 4: {'wetting' :Lw4,
+ 'nonwetting': Lnw4},
+ 5: {'wetting' :Lw5,
+ 'nonwetting': Lnw5},
+ 6: {'wetting' :Lw6,
+ 'nonwetting': Lnw6}
}
diff --git a/Two-phase-Richards/multi-patch/layered_soil_with_inner_patch/TP-R-layered_soil_with_inner_patch-realistic.py b/Two-phase-Richards/multi-patch/layered_soil_with_inner_patch/TP-R-layered_soil_with_inner_patch-realistic.py
index 370f9c7..0fb9ba7 100755
--- a/Two-phase-Richards/multi-patch/layered_soil_with_inner_patch/TP-R-layered_soil_with_inner_patch-realistic.py
+++ b/Two-phase-Richards/multi-patch/layered_soil_with_inner_patch/TP-R-layered_soil_with_inner_patch-realistic.py
@@ -25,6 +25,9 @@ else:
print("Directory ", './output', " already exists. Will use as output \
directory")
+date = datetime.datetime.now()
+datestr = date.strftime("%Y-%m-%d")
+
# init sympy session
sym.init_printing()
@@ -409,18 +412,18 @@ porosity = {
# subdom_num : subdomain L for L-scheme
L = {
- 1: {'wetting' :Lw,
- 'nonwetting': Lnw},
- 2: {'wetting' :Lw,
- 'nonwetting': Lnw},
- 3: {'wetting' :Lw,
- 'nonwetting': Lnw},
- 4: {'wetting' :Lw,
- 'nonwetting': Lnw},
- 5: {'wetting' :Lw,
- 'nonwetting': Lnw},
- 6: {'wetting' :Lw,
- 'nonwetting': Lnw}
+ 1: {'wetting' :Lw1,
+ 'nonwetting': Lnw1},
+ 2: {'wetting' :Lw2,
+ 'nonwetting': Lnw2},
+ 3: {'wetting' :Lw3,
+ 'nonwetting': Lnw3},
+ 4: {'wetting' :Lw4,
+ 'nonwetting': Lnw4},
+ 5: {'wetting' :Lw5,
+ 'nonwetting': Lnw5},
+ 6: {'wetting' :Lw6,
+ 'nonwetting': Lnw6}
}
--
GitLab