diff --git a/LDDsimulation/boundary_and_interface.py b/LDDsimulation/boundary_and_interface.py index 121515bd506b46046b517e9eecfcb61b63eec4ce..bd4d2cc1fdb5ee26fae329c904ef5ad6819af2d3 100644 --- a/LDDsimulation/boundary_and_interface.py +++ b/LDDsimulation/boundary_and_interface.py @@ -61,6 +61,7 @@ class BoundaryPart(df.SubDomain): else: self.marker_value = marker_value + ###### Public interface def inside(self, x: np.ndarray, on_boundary) -> bool: """inside returns true if x is on_boundary and on the part of the boundary diff --git a/Two-phase-Richards/two-patch/TP-R-two-patch-test-case/TP-R-2-patch-pure-dd.py b/Two-phase-Richards/two-patch/TP-R-two-patch-test-case/TP-R-2-patch-pure-dd.py index 2c861d2f327a3563950cefe4fc27a93e4dfbfdb8..ab9c6da02c7b13d825f5bb26658a743037f95d74 100755 --- a/Two-phase-Richards/two-patch/TP-R-two-patch-test-case/TP-R-2-patch-pure-dd.py +++ b/Two-phase-Richards/two-patch/TP-R-two-patch-test-case/TP-R-2-patch-pure-dd.py @@ -19,7 +19,7 @@ datestr = date.strftime("%Y-%m-%d") # init sympy session sym.init_printing() -use_case = "TP-R-2-patch-pure-dd-new-gravity-rhs" +use_case = "TP-R-2-patch-pure-dd" # solver_tol = 6E-7 max_iter_num = 1000 FEM_Lagrange_degree = 1 @@ -29,9 +29,9 @@ resolutions = { # 2: 7e-7, # 4: 7e-7, # 8: 7e-7, - # 16: 7e-7, - # 32: 1e-6, - 64: 7e-7, + 16: 5e-7, + # 32: 1e-7, + # 64: 7e-7, # 128: 7e-7, # 256: 7e-7 } @@ -39,21 +39,21 @@ resolutions = { ############ GRID ####################### # mesh_resolution = 20 timestep_size = 0.005 -number_of_timesteps = 250 +number_of_timesteps = 25 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 = 5 +number_of_timesteps_to_analyse = 0 starttimes = [0.0] Lw = 0.025 #/timestep_size Lnw= 0.025 -lambda_w = 2 -lambda_nw = 2 +lambda_w = 20 +lambda_nw = 20 include_gravity = True debugflag = False -analyse_condition = True +analyse_condition = False output_string = "./output/{}-{}_timesteps{}_P{}".format(datestr, use_case, number_of_timesteps, FEM_Lagrange_degree) @@ -376,7 +376,7 @@ p_e_sym = { 1: {'wetting': (-6 - (1+t*t)*(1 + x*x + y*y))}, #*cutoff, # 'nonwetting': (-1 -t*(1.1+ y*y))}, #*(sym.sin((1+y)/2*sym.pi)*sym.sin((1+x)/2*sym.pi))**2}, 2: {'wetting': (-6 - (1+t*t)*(1 + x*x + y*y)), #*(sym.sin((1+y)/2*sym.pi)*sym.sin((1+x)/2*sym.pi))**2, - 'nonwetting': -t*(1.1 + y*x)*(sym.sin((x*y-0.5*t)*y**3))**4}, #*(sym.sin((1+y)/2*sym.pi)*sym.sin((1+x)/2*sym.pi))**2}, + 'nonwetting': -t**2*(1.1 + y*x)*y**4},#*(sym.sin((x*y-0.5*t)*y**3))**4}, #*(sym.sin((1+y)/2*sym.pi)*sym.sin((1+x)/2*sym.pi))**2}, } pc_e_sym = dict()