diff --git a/applications/GeoMechanicsApplication/python_scripts/geomechanics_U_Pw_solver.py b/applications/GeoMechanicsApplication/python_scripts/geomechanics_U_Pw_solver.py index eae98085a98c..9f70c34ebf9e 100644 --- a/applications/GeoMechanicsApplication/python_scripts/geomechanics_U_Pw_solver.py +++ b/applications/GeoMechanicsApplication/python_scripts/geomechanics_U_Pw_solver.py @@ -187,22 +187,12 @@ def _ConstructScheme(self, scheme_type, solution_type): elif (solution_type.lower() == "dynamic"): KratosMultiphysics.Logger.PrintInfo("GeoMechanics_U_Pw_Solver, scheme", "Dynamic.") scheme = KratosGeo.NewmarkDynamicUPwScheme(beta,gamma,theta) - elif (solution_type.lower() == "k0-procedure" or solution_type.lower() == "k0_procedure"): - if (rayleigh_m < 1.0e-20 and rayleigh_k < 1.0e-20): - KratosMultiphysics.Logger.PrintInfo("GeoMechanics_U_Pw_Solver, scheme", "Quasi-UnDamped.") - scheme = KratosGeo.NewmarkQuasistaticUPwScheme(beta,gamma,theta) - else: - KratosMultiphysics.Logger.PrintInfo("GeoMechanics_U_Pw_Solver, scheme", "Quasi-Damped.") - scheme = KratosGeo.NewmarkQuasistaticDampedUPwScheme(beta,gamma,theta) else: raise RuntimeError(f"Undefined solution type '{solution_type}'") elif (scheme_type.lower() == "backward_euler"or scheme_type.lower() == "backward-euler"): if (solution_type.lower() == "quasi-static" or solution_type.lower() == "quasi_static"): KratosMultiphysics.Logger.PrintInfo("GeoMechanics_U_Pw_Solver, scheme", "Backward Euler.") scheme = KratosGeo.BackwardEulerQuasistaticUPwScheme() - elif (solution_type.lower() == "k0-procedure" or solution_type.lower() == "k0_procedure"): - KratosMultiphysics.Logger.PrintInfo("GeoMechanics_U_Pw_Solver, scheme", "Backward Euler.") - scheme = KratosGeo.BackwardEulerQuasistaticUPwScheme() else: raise RuntimeError(f"Undefined/incompatible solution type with Backward Euler: '{solution_type}'") else: diff --git a/applications/GeoMechanicsApplication/tests/C-Phi_reduction_process/ProjectParameters_stage1.json b/applications/GeoMechanicsApplication/tests/C-Phi_reduction_process/ProjectParameters_stage1.json index 6294f129285d..02ba55800b33 100644 --- a/applications/GeoMechanicsApplication/tests/C-Phi_reduction_process/ProjectParameters_stage1.json +++ b/applications/GeoMechanicsApplication/tests/C-Phi_reduction_process/ProjectParameters_stage1.json @@ -69,7 +69,7 @@ "rotation_dofs": true, "scheme_type": "Newmark", "second_alpha_value": 1.0, - "solution_type": "K0-Procedure", + "solution_type": "quasi_static", "solver_type": "U_Pw", "strategy_type": "linear", "time_stepping": { diff --git a/applications/GeoMechanicsApplication/tests/test_Abc_1_1_0_True_Deformations/ProjectParameters_stage1.json b/applications/GeoMechanicsApplication/tests/test_Abc_1_1_0_True_Deformations/ProjectParameters_stage1.json index 8bdfd5257f74..8ec3da776afb 100644 --- a/applications/GeoMechanicsApplication/tests/test_Abc_1_1_0_True_Deformations/ProjectParameters_stage1.json +++ b/applications/GeoMechanicsApplication/tests/test_Abc_1_1_0_True_Deformations/ProjectParameters_stage1.json @@ -30,7 +30,7 @@ "reform_dofs_at_each_step": false, "nodal_smoothing": false, "block_builder": true, - "solution_type": "K0-Procedure", + "solution_type": "quasi_static", "scheme_type": "Newmark", "reset_displacements": true, "strategy_type": "line_search", diff --git a/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc/ProjectParameters.json b/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc/ProjectParameters.json index a6300acbea01..1bb06a0f9949 100644 --- a/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc/ProjectParameters.json +++ b/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc/ProjectParameters.json @@ -30,7 +30,7 @@ "reform_dofs_at_each_step": false, "nodal_smoothing": false, "block_builder": true, - "solution_type": "K0-Procedure", + "solution_type": "quasi_static", "scheme_type": "Newmark", "reset_displacements": true, "strategy_type": "linear", diff --git a/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc_layers/ProjectParameters.json b/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc_layers/ProjectParameters.json index 3c9246c522a6..0bb2b547ea49 100644 --- a/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc_layers/ProjectParameters.json +++ b/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc_layers/ProjectParameters.json @@ -30,7 +30,7 @@ "reform_dofs_at_each_step": false, "nodal_smoothing": false, "block_builder": true, - "solution_type": "K0-Procedure", + "solution_type": "quasi_static", "scheme_type": "Newmark", "reset_displacements": true, "strategy_type": "linear", diff --git a/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc_ocr/ProjectParameters.json b/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc_ocr/ProjectParameters.json index 9a280966ce0c..5d29966c8874 100644 --- a/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc_ocr/ProjectParameters.json +++ b/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc_ocr/ProjectParameters.json @@ -30,7 +30,7 @@ "reform_dofs_at_each_step": false, "nodal_smoothing": false, "block_builder": true, - "solution_type": "K0-Procedure", + "solution_type": "quasi_static", "scheme_type": "Newmark", "reset_displacements": true, "strategy_type": "linear", diff --git a/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc_skew_layers/ProjectParameters.json b/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc_skew_layers/ProjectParameters.json index 61e9f14d015e..88a52b42b6cb 100644 --- a/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc_skew_layers/ProjectParameters.json +++ b/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc_skew_layers/ProjectParameters.json @@ -30,7 +30,7 @@ "reform_dofs_at_each_step": false, "nodal_smoothing": false, "block_builder": true, - "solution_type": "K0-Procedure", + "solution_type": "quasi_static", "scheme_type": "Backward_Euler", "reset_displacements": true, "newmark_beta": 0.25, diff --git a/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc_skew_layers_dam/ProjectParameters.json b/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc_skew_layers_dam/ProjectParameters.json index a1683402426e..e69a1b61adb3 100644 --- a/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc_skew_layers_dam/ProjectParameters.json +++ b/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_nc_skew_layers_dam/ProjectParameters.json @@ -30,7 +30,7 @@ "reform_dofs_at_each_step": false, "nodal_smoothing": false, "block_builder": true, - "solution_type": "K0-Procedure", + "solution_type": "quasi_static", "scheme_type": "Backward_Euler", "reset_displacements": true, "newmark_beta": 0.25, diff --git a/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_umat/ProjectParameters.json b/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_umat/ProjectParameters.json index a6300acbea01..1bb06a0f9949 100644 --- a/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_umat/ProjectParameters.json +++ b/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_k0_umat/ProjectParameters.json @@ -30,7 +30,7 @@ "reform_dofs_at_each_step": false, "nodal_smoothing": false, "block_builder": true, - "solution_type": "K0-Procedure", + "solution_type": "quasi_static", "scheme_type": "Newmark", "reset_displacements": true, "strategy_type": "linear", diff --git a/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_with_horizontal_layers/ProjectParameters.json b/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_with_horizontal_layers/ProjectParameters.json index e6f736f33632..b76f7fece4b4 100644 --- a/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_with_horizontal_layers/ProjectParameters.json +++ b/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_with_horizontal_layers/ProjectParameters.json @@ -233,7 +233,7 @@ "rotation_dofs": true, "scheme_type": "Newmark", "second_alpha_value": 1.0, - "solution_type": "K0-Procedure", + "solution_type": "quasi_static", "solver_type": "U_Pw", "strategy_type": "linear", "time_stepping": { diff --git a/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_with_tilted_layers/ProjectParameters.json b/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_with_tilted_layers/ProjectParameters.json index 6dc4d96a1487..a47990a397d9 100644 --- a/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_with_tilted_layers/ProjectParameters.json +++ b/applications/GeoMechanicsApplication/tests/test_k0_procedure_process/test_k0_procedure_with_tilted_layers/ProjectParameters.json @@ -233,7 +233,7 @@ "rotation_dofs": true, "scheme_type": "Newmark", "second_alpha_value": 1.0, - "solution_type": "K0-Procedure", + "solution_type": "quasi_static", "solver_type": "U_Pw", "strategy_type": "linear", "time_stepping": { diff --git a/applications/GeoMechanicsApplication/tests/test_soil_weight_saturated_below_and_above_phreatic_quad_4n.gid/ProjectParameters.json b/applications/GeoMechanicsApplication/tests/test_soil_weight_saturated_below_and_above_phreatic_quad_4n.gid/ProjectParameters.json index 0b788fec081a..e9af02a5580c 100644 --- a/applications/GeoMechanicsApplication/tests/test_soil_weight_saturated_below_and_above_phreatic_quad_4n.gid/ProjectParameters.json +++ b/applications/GeoMechanicsApplication/tests/test_soil_weight_saturated_below_and_above_phreatic_quad_4n.gid/ProjectParameters.json @@ -30,7 +30,7 @@ "reform_dofs_at_each_step": true, "nodal_smoothing": false, "block_builder": true, - "solution_type": "K0-Procedure", + "solution_type": "quasi_static", "scheme_type": "Backward_Euler", "reset_displacements": true, "newmark_beta": 0.25, diff --git a/applications/GeoMechanicsApplication/tests/test_soil_weight_saturated_below_and_above_phreatic_quad_8n.gid/ProjectParameters.json b/applications/GeoMechanicsApplication/tests/test_soil_weight_saturated_below_and_above_phreatic_quad_8n.gid/ProjectParameters.json index 0b788fec081a..e9af02a5580c 100644 --- a/applications/GeoMechanicsApplication/tests/test_soil_weight_saturated_below_and_above_phreatic_quad_8n.gid/ProjectParameters.json +++ b/applications/GeoMechanicsApplication/tests/test_soil_weight_saturated_below_and_above_phreatic_quad_8n.gid/ProjectParameters.json @@ -30,7 +30,7 @@ "reform_dofs_at_each_step": true, "nodal_smoothing": false, "block_builder": true, - "solution_type": "K0-Procedure", + "solution_type": "quasi_static", "scheme_type": "Backward_Euler", "reset_displacements": true, "newmark_beta": 0.25, diff --git a/applications/GeoMechanicsApplication/tests/test_soil_weight_saturated_below_phreatic_quad_4n.gid/ProjectParameters.json b/applications/GeoMechanicsApplication/tests/test_soil_weight_saturated_below_phreatic_quad_4n.gid/ProjectParameters.json index 0b788fec081a..e9af02a5580c 100644 --- a/applications/GeoMechanicsApplication/tests/test_soil_weight_saturated_below_phreatic_quad_4n.gid/ProjectParameters.json +++ b/applications/GeoMechanicsApplication/tests/test_soil_weight_saturated_below_phreatic_quad_4n.gid/ProjectParameters.json @@ -30,7 +30,7 @@ "reform_dofs_at_each_step": true, "nodal_smoothing": false, "block_builder": true, - "solution_type": "K0-Procedure", + "solution_type": "quasi_static", "scheme_type": "Backward_Euler", "reset_displacements": true, "newmark_beta": 0.25, diff --git a/applications/GeoMechanicsApplication/tests/test_soil_weight_saturated_below_phreatic_quad_8n.gid/ProjectParameters.json b/applications/GeoMechanicsApplication/tests/test_soil_weight_saturated_below_phreatic_quad_8n.gid/ProjectParameters.json index 0b788fec081a..e9af02a5580c 100644 --- a/applications/GeoMechanicsApplication/tests/test_soil_weight_saturated_below_phreatic_quad_8n.gid/ProjectParameters.json +++ b/applications/GeoMechanicsApplication/tests/test_soil_weight_saturated_below_phreatic_quad_8n.gid/ProjectParameters.json @@ -30,7 +30,7 @@ "reform_dofs_at_each_step": true, "nodal_smoothing": false, "block_builder": true, - "solution_type": "K0-Procedure", + "solution_type": "quasi_static", "scheme_type": "Backward_Euler", "reset_displacements": true, "newmark_beta": 0.25, diff --git a/applications/GeoMechanicsApplication/tests/test_soil_weight_van_genuchten_above_phreatic_quad_4n.gid/ProjectParameters.json b/applications/GeoMechanicsApplication/tests/test_soil_weight_van_genuchten_above_phreatic_quad_4n.gid/ProjectParameters.json index 41fcc81d5a27..a1b278f58ba2 100644 --- a/applications/GeoMechanicsApplication/tests/test_soil_weight_van_genuchten_above_phreatic_quad_4n.gid/ProjectParameters.json +++ b/applications/GeoMechanicsApplication/tests/test_soil_weight_van_genuchten_above_phreatic_quad_4n.gid/ProjectParameters.json @@ -30,7 +30,7 @@ "reform_dofs_at_each_step": true, "nodal_smoothing": false, "block_builder": true, - "solution_type": "K0-Procedure", + "solution_type": "quasi_static", "scheme_type": "Backward_Euler", "reset_displacements": true, "newmark_beta": 0.25, diff --git a/applications/GeoMechanicsApplication/tests/test_soil_weight_van_genuchten_above_phreatic_quad_8n.gid/ProjectParameters.json b/applications/GeoMechanicsApplication/tests/test_soil_weight_van_genuchten_above_phreatic_quad_8n.gid/ProjectParameters.json index 41fcc81d5a27..a1b278f58ba2 100644 --- a/applications/GeoMechanicsApplication/tests/test_soil_weight_van_genuchten_above_phreatic_quad_8n.gid/ProjectParameters.json +++ b/applications/GeoMechanicsApplication/tests/test_soil_weight_van_genuchten_above_phreatic_quad_8n.gid/ProjectParameters.json @@ -30,7 +30,7 @@ "reform_dofs_at_each_step": true, "nodal_smoothing": false, "block_builder": true, - "solution_type": "K0-Procedure", + "solution_type": "quasi_static", "scheme_type": "Backward_Euler", "reset_displacements": true, "newmark_beta": 0.25,