diff --git a/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch.py b/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch.py index 1e5e0a63d5807ec3f3411f865a9ff48d8a40689e..b46fbabc83442f56c7d6a983fd1a3d2fabccbe15 100755 --- a/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch.py +++ b/TP-TP-layered-soil-case-with-inner-patch/TP-TP-layered_soil_with_inner_patch.py @@ -25,7 +25,7 @@ use_case = "TP-TP-layered-soil-with-inner-patch" solver_tol = 1E-6 ############ GRID #######################ü -mesh_resolution = 50 +mesh_resolution = 30 timestep_size = 0.001 number_of_timesteps = 1500 # decide how many timesteps you want analysed. Analysed means, that we write out @@ -43,7 +43,7 @@ include_gravity = True debugflag = False analyse_condition = False -output_string = "./output/nondirichlet_number_of_timesteps{}_".format(number_of_timesteps) +output_string = "./output/test-after-bugfix-nondirichlet_number_of_timesteps{}_".format(number_of_timesteps) # global domain subdomain0_vertices = [df.Point(-1.0,-1.0), # diff --git a/TP-TP-layered-soil-case/TP-TP-layered_soil.py b/TP-TP-layered-soil-case/TP-TP-layered_soil.py index a56a37a439dc7890dab0ed24fe9c62c59f986bed..4eb4c59f0e0bab7b9b39e31b4e9c118dc8843b2c 100755 --- a/TP-TP-layered-soil-case/TP-TP-layered_soil.py +++ b/TP-TP-layered-soil-case/TP-TP-layered_soil.py @@ -22,7 +22,7 @@ import helpers as hlp sym.init_printing() use_case="TP-TP-layered-soil" -solver_tol = 5E-7 +solver_tol = 1E-6 ############ GRID #######################ü mesh_resolution = 30 @@ -43,7 +43,7 @@ include_gravity = True debugflag = True analyse_condition = False -output_string = "./output/number_of_timesteps{}_".format(number_of_timesteps) +output_string = "./output/test-after-bugfix-number_of_timesteps{}_".format(number_of_timesteps) # global domain subdomain0_vertices = [df.Point(-1.0,-1.0), # @@ -406,10 +406,10 @@ x, y = sym.symbols('x[0], x[1]') # needed by UFL t = sym.symbols('t', positive=True) p_e_sym_2patch = { - 1: {'wetting': -3 - (1+t*t)*(1 + x*x + y*y), - 'nonwetting': -1-t*(1-y - x**2)**2 - sym.sqrt(2+t**2)*(1-y)**2}, - 2: {'wetting': -3.0 - (1.0 + t*t)*(1.0 + x*x), - 'nonwetting': -1-t*(1- x**2)**2 - sym.sqrt(2+t**2)*(1-y)**2}, + 1: {'wetting': -7 - (1+t*t)*(1 + x*x + y*y), + 'nonwetting': -1-t*(1.1 + y + x**2)**2}, + 2: {'wetting': -7.0 - (1.0 + t*t)*(1.0 + x*x), + 'nonwetting': -1-t*(1.1 + x**2)**2 - sym.sqrt(2+t**2)*y**2}, } p_e_sym = {