diff --git a/LDDsimulation/LDDsimulation.py b/LDDsimulation/LDDsimulation.py index 455b2e72fbfb4756b598359be234f66c0efa5860..5fc63f215e689e09abdca69b462f30713504d78a 100644 --- a/LDDsimulation/LDDsimulation.py +++ b/LDDsimulation/LDDsimulation.py @@ -265,6 +265,7 @@ class LDDsimulation(object): raise RuntimeError("include_gravity = True but no densities were given.") self._parameters_set = True + def initialise(self) -> None: """ initialise LDD simulation diff --git a/RR-2-patch-test-case/RR-2-patch-test.py b/RR-2-patch-test-case/RR-2-patch-test.py index 343a5b0c4edfea1df528d1d9de1208da5797e364..de1cf3e37264903c74bc357fe672b0af6beed706 100755 --- a/RR-2-patch-test-case/RR-2-patch-test.py +++ b/RR-2-patch-test-case/RR-2-patch-test.py @@ -16,7 +16,7 @@ solver_tol = 1E-6 ############ GRID #######################ü mesh_resolution = 40 timestep_size = 0.01 -number_of_timesteps = 15 +number_of_timesteps = 150 # 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 @@ -25,9 +25,9 @@ starttime = 0 Lw = 0.25 #/timestep_size Lnw=Lw -l_param_w = 4 +lambda_w = 4 -include_gravity = False +include_gravity = True debugflag = False analyse_condition = False @@ -138,8 +138,8 @@ L = {# lambda_param = {# # subdom_num : lambda parameter for the L-scheme - 1 : {'wetting': l_param_w},# - 2 : {'wetting': l_param_w} + 1 : {'wetting': lambda_w},# + 2 : {'wetting': lambda_w} } ## relative permeabilty functions on subdomain 1 @@ -226,7 +226,7 @@ write_to_file = { } # initialise LDD simulation class -simulation = ldd.LDDsimulation(tol = 1E-14, debug = False, LDDsolver_tol=1E-9) +simulation = ldd.LDDsimulation(tol = 1E-14, debug = debugflag, LDDsolver_tol=solver_tol) simulation.set_parameters(use_case=use_case, output_dir = output_string,# subdomain_def_points = subdomain_def_points,# @@ -255,7 +255,7 @@ simulation.set_parameters(use_case=use_case, ) simulation.initialise() -print(simulation.__dict__) +#print(simulation.__dict__) simulation.run(analyse_condition=analyse_condition) # simulation.LDDsolver(time = 0, debug = True, analyse_timestep = True) # df.info(parameters, True) diff --git a/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting.py b/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting.py index a808b2831b31460b2eb2b80b83af2046a9cf6b3c..80bde1a1ae5c45779b0dc4dc01a896d779307016 100755 --- a/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting.py +++ b/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting/TP-R-multi-patch-same-wetting-phase-as-RR-zero-nonwetting.py @@ -17,7 +17,7 @@ use_case = "TP-R-multi-patch-zero-nonwetting-phase" solver_tol = 1E-6 ############ GRID #######################ü -mesh_resolution = 50 +mesh_resolution = 40 timestep_size = 0.001 number_of_timesteps = 1500 # decide how many timesteps you want analysed. Analysed means, that we write out @@ -25,7 +25,7 @@ number_of_timesteps = 1500 number_of_timesteps_to_analyse = 10 starttime = 0 -Lw = 0.25 #/timestep_size +Lw = 0.5 #/timestep_size Lnw=Lw l_param_w = 40 diff --git a/TP-one-patch/TP-one-patch-purely-postive-pc.py b/TP-one-patch/TP-one-patch-purely-postive-pc.py index 5638ef08f9064e249530647010ee086c653a363b..783c93b1d71c53749078fa44158b41baaad924dc 100755 --- a/TP-one-patch/TP-one-patch-purely-postive-pc.py +++ b/TP-one-patch/TP-one-patch-purely-postive-pc.py @@ -17,10 +17,10 @@ sym.init_printing() solver_tol = 1E-6 ############ GRID ####################### - -mesh_resolution = 40 -timestep_size = 0.001 -number_of_timesteps = 10 +use_case="TP-one-patch-purely-positive-pc" +mesh_resolution = 30 +timestep_size = 0.0005 +number_of_timesteps = 2500 # 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 = 1