From 508e8114c3119b95aad34f7c05b0311c035d87ce Mon Sep 17 00:00:00 2001 From: lmoreno Date: Tue, 7 Dec 2021 15:45:32 +0100 Subject: [PATCH 01/67] Updated Lagrangian mixed UP element added --- .../apps/MPM/write/writeProjectParameters.tcl | 11 ++++++- kratos.gid/apps/MPM/xml/Elements.xml | 31 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index af80848a1..b3e7b1de7 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -31,8 +31,17 @@ proc ::MPM::write::getParametersDict { } { dict set project_parameters_dict solver_settings axis_symmetric_flag true } + # Pressure dofs - dict set project_parameters_dict solver_settings pressure_dofs false + set check_list [list "UpdatedLagrangianUP2D"] + foreach elem $check_list { + if {$elem in [Structural::write::GetUsedElements Name]} { + dict set project_parameters_dict solver_settings pressure_dofs true + break + } else { + dict set project_parameters_dict solver_settings pressure_dofs false + } + } # Rotation dofs dict unset project_parameters_dict solver_settings rotation_dofs diff --git a/kratos.gid/apps/MPM/xml/Elements.xml b/kratos.gid/apps/MPM/xml/Elements.xml index e7a52fd59..f0bfdf7e4 100644 --- a/kratos.gid/apps/MPM/xml/Elements.xml +++ b/kratos.gid/apps/MPM/xml/Elements.xml @@ -28,6 +28,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 694eed850f837597d52d890c4d05d82e2b3d48de Mon Sep 17 00:00:00 2001 From: lmoreno Date: Tue, 7 Dec 2021 18:07:36 +0100 Subject: [PATCH 02/67] setting constitutive laws depending on the element type --- .../apps/MPM/write/writeProjectParameters.tcl | 3 +- kratos.gid/apps/MPM/xml/ConstitutiveLaws.xml | 90 +++++++++++++------ kratos.gid/apps/MPM/xml/Elements.xml | 54 +++++++++-- 3 files changed, 116 insertions(+), 31 deletions(-) diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index b3e7b1de7..a82386d9f 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -98,11 +98,12 @@ proc ::MPM::write::getParametersDict { } { dict set grid_output_configuration_dict Parameters output_name [dict get $project_parameters_dict solver_settings grid_model_import_settings input_filename] dict unset body_output_configuration_dict Parameters postprocess_parameters result_file_configuration nodal_results dict unset grid_output_configuration_dict Parameters postprocess_parameters result_file_configuration gauss_point_results - dict set body_output_configuration_dict Parameters postprocess_parameters result_file_configuration gauss_point_results [list MP_VELOCITY MP_DISPLACEMENT] + #dict set body_output_configuration_dict Parameters postprocess_parameters result_file_configuration gauss_point_results [list MP_VELOCITY MP_DISPLACEMENT MP_PRESSURE] dict set project_parameters_dict output_processes body_output_process [list $body_output_configuration_dict] dict set project_parameters_dict output_processes grid_output_process [list $grid_output_configuration_dict] dict unset project_parameters_dict output_processes gid_output dict unset project_parameters_dict output_processes vtk_output + # REMOVE RAYLEIGH dict set project_parameters_dict solver_settings auxiliary_variables_list [list NORMAL IS_STRUCTURE] diff --git a/kratos.gid/apps/MPM/xml/ConstitutiveLaws.xml b/kratos.gid/apps/MPM/xml/ConstitutiveLaws.xml index 6fdd27014..127d2dbed 100644 --- a/kratos.gid/apps/MPM/xml/ConstitutiveLaws.xml +++ b/kratos.gid/apps/MPM/xml/ConstitutiveLaws.xml @@ -7,8 +7,7 @@ - + @@ -17,8 +16,7 @@ - + @@ -28,7 +26,7 @@ + help="Linear Elastic Behaviour in 2D Axis-symmetric" Dimension="2Da" ProductionReady="ProductionReady" App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication" > @@ -37,8 +35,7 @@ - + @@ -48,8 +45,7 @@ - + @@ -57,9 +53,12 @@ + - + + + @@ -68,8 +67,7 @@ - + @@ -77,10 +75,29 @@ + + + + + + + + + + + + + + + + + + + + - + @@ -91,9 +108,9 @@ - + + help="Mohr Coulomb Plasticity Behaviour in 2D Axis-symmetric" Dimension="2Da" ProductionReady="ProductionReady" App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication" > @@ -105,8 +122,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -120,7 +160,7 @@ + help="Mohr Coulomb Plasticity with Strain Softening Behaviour in 2D Plane Strain" Dimension="2D" ProductionReady="ProductionReady" App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication"> @@ -137,7 +177,7 @@ + help="Mohr Coulomb Plasticity with Strain Softening Behaviour in 2D Axis-symmetric" Dimension="2Da" ProductionReady="ProductionReady" App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication" > @@ -154,7 +194,7 @@ + help="Mohr Coulomb Plasticity with Strain Softening Behaviour in 3D" Dimension="3D" ProductionReady="ProductionReady" App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication"> @@ -172,7 +212,7 @@ + help="Modified Cam Clay Plasticity Behaviour in 2D Plane Strain" Dimension="2D" ProductionReady="ProductionReady" App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication"> @@ -187,7 +227,7 @@ + help="Modified Cam Clay Plasticity Behaviour in 2D Axis-symmetric" Dimension="2Da" ProductionReady="ProductionReady" App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication" > @@ -202,7 +242,7 @@ + help="Modified Cam Clay Plasticity Behaviour in 3D" Dimension="3D" ProductionReady="ProductionReady" App="MPM" FormulationType="Irreducible" ImplementedInApplication="ParticleMechanicsApplication"> diff --git a/kratos.gid/apps/MPM/xml/Elements.xml b/kratos.gid/apps/MPM/xml/Elements.xml index f0bfdf7e4..55d5442d0 100644 --- a/kratos.gid/apps/MPM/xml/Elements.xml +++ b/kratos.gid/apps/MPM/xml/Elements.xml @@ -7,8 +7,13 @@ - - + + + + + + + @@ -38,7 +43,10 @@ - + + + + @@ -67,7 +75,10 @@ - + + + + @@ -95,7 +106,40 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From bba1da4ac9349009e232013d73a4edb8ad79ae4c Mon Sep 17 00:00:00 2001 From: lmoreno Date: Thu, 9 Dec 2021 15:26:04 +0100 Subject: [PATCH 03/67] Model Information updated for ParticleMechanics --- .../apps/MPM/write/writeProjectParameters.tcl | 2 +- kratos.gid/apps/MPM/xml/Procs.spd | 4 +- kratos.gid/apps/MPM/xml/StageInfo.spd | 9 +- kratos.gid/apps/MPM/xml/Strategies.xml | 96 +++++++++++++++++++ kratos.gid/apps/MPM/xml/XmlController.tcl | 25 +++++ kratos.gid/apps/Structural/xml/Strategies.xml | 2 +- 6 files changed, 129 insertions(+), 9 deletions(-) create mode 100644 kratos.gid/apps/MPM/xml/Strategies.xml diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index a82386d9f..0d910da72 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -7,7 +7,7 @@ proc ::MPM::write::getParametersDict { } { dict set project_parameters_dict solver_settings solver_type $solutiontype if {$solutiontype eq "Quasi-static"} { dict set project_parameters_dict solver_settings time_integration_method [write::getValue STSolStrat] - dict set project_parameters_dict solver_settings scheme_type [write::getValue STScheme] + dict set project_parameters_dict solver_settings scheme_type [write::getValue STcheme] } # Change the model part name diff --git a/kratos.gid/apps/MPM/xml/Procs.spd b/kratos.gid/apps/MPM/xml/Procs.spd index c7c803a34..2f6e51566 100644 --- a/kratos.gid/apps/MPM/xml/Procs.spd +++ b/kratos.gid/apps/MPM/xml/Procs.spd @@ -19,9 +19,9 @@ ]]> - + diff --git a/kratos.gid/apps/MPM/xml/StageInfo.spd b/kratos.gid/apps/MPM/xml/StageInfo.spd index 83b5dd100..56fc23cb6 100644 --- a/kratos.gid/apps/MPM/xml/StageInfo.spd +++ b/kratos.gid/apps/MPM/xml/StageInfo.spd @@ -1,8 +1,7 @@ - - - - - + + + + diff --git a/kratos.gid/apps/MPM/xml/Strategies.xml b/kratos.gid/apps/MPM/xml/Strategies.xml new file mode 100644 index 000000000..5880b0cd7 --- /dev/null +++ b/kratos.gid/apps/MPM/xml/Strategies.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kratos.gid/apps/MPM/xml/XmlController.tcl b/kratos.gid/apps/MPM/xml/XmlController.tcl index dc5502204..364f92967 100644 --- a/kratos.gid/apps/MPM/xml/XmlController.tcl +++ b/kratos.gid/apps/MPM/xml/XmlController.tcl @@ -4,10 +4,14 @@ namespace eval MPM::xml { } + + proc MPM::xml::Init { } { # Namespace variables inicialization Model::InitVariables dir $::MPM::dir + Model::ForgetSolutionStrategies + Model::getSolutionStrategies Strategies.xml # Import our elements Model::ForgetElements Model::getElements Elements.xml @@ -43,6 +47,27 @@ proc MPM::xml::Init { } { } +proc ::MPM::xml::ProcGetSolutionStrategiesMPM { domNode args } { + set names "" + set pnames "" + set solutionType [get_domnode_attribute [$domNode selectNodes [spdAux::getRoute STSoluType]] v] + set Sols [::Model::GetSolutionStrategies [list "SolutionType" $solutionType] ] + set ids [list ] + foreach ss $Sols { + lappend ids [$ss getName] + append names [$ss getName] "," + append pnames [$ss getName] "," [$ss getPublicName] "," + } + set names [string range $names 0 end-1] + set pnames [string range $pnames 0 end-1] + + $domNode setAttribute values $names + set dv [lindex $ids 0] + if {[$domNode getAttribute v] eq ""} {$domNode setAttribute v $dv} + if {[$domNode getAttribute v] ni $ids} {$domNode setAttribute v $dv} + #spdAux::RequestRefresh + return $pnames +} proc MPM::xml::MultiAppEvent {args} { if {$args eq "init"} { diff --git a/kratos.gid/apps/Structural/xml/Strategies.xml b/kratos.gid/apps/Structural/xml/Strategies.xml index c74e425af..83474d106 100644 --- a/kratos.gid/apps/Structural/xml/Strategies.xml +++ b/kratos.gid/apps/Structural/xml/Strategies.xml @@ -101,4 +101,4 @@ - \ No newline at end of file + From 295b2c99572e9a7a1f8504d9425fcf252d98dca4 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Thu, 9 Dec 2021 16:27:56 +0100 Subject: [PATCH 04/67] forward euler scheme option added for explicit scheme --- kratos.gid/apps/MPM/xml/Elements.xml | 8 ++++---- kratos.gid/apps/MPM/xml/Strategies.xml | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/Elements.xml b/kratos.gid/apps/MPM/xml/Elements.xml index 55d5442d0..d4e34357b 100644 --- a/kratos.gid/apps/MPM/xml/Elements.xml +++ b/kratos.gid/apps/MPM/xml/Elements.xml @@ -1,7 +1,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -160,7 +160,7 @@ - + diff --git a/kratos.gid/apps/MPM/xml/Strategies.xml b/kratos.gid/apps/MPM/xml/Strategies.xml index 5880b0cd7..760e71966 100644 --- a/kratos.gid/apps/MPM/xml/Strategies.xml +++ b/kratos.gid/apps/MPM/xml/Strategies.xml @@ -21,12 +21,6 @@ - - - - - - @@ -59,11 +53,17 @@ + + + + + + - + From b328383561b2917ea9ba198683aa8c5ecfe2893a Mon Sep 17 00:00:00 2001 From: lmoreno Date: Thu, 9 Dec 2021 17:58:35 +0100 Subject: [PATCH 05/67] On/Off GiD postprocess in MPM --- .../apps/MPM/write/writeProjectParameters.tcl | 95 +++++++++++++++---- 1 file changed, 77 insertions(+), 18 deletions(-) diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index 0d910da72..39874352e 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -86,25 +86,10 @@ proc ::MPM::write::getParametersDict { } { dict set gravity_dict Parameters $gravity_parameters_dict dict set project_parameters_dict processes gravity [list $gravity_dict] - # Output configuration - set body_output_configuration_dict [lindex [dict get $project_parameters_dict output_processes gid_output] 0] - set grid_output_configuration_dict [lindex [dict get $project_parameters_dict output_processes gid_output] 0] - dict set body_output_configuration_dict python_module particle_gid_output_process - dict set body_output_configuration_dict kratos_module KratosMultiphysics.ParticleMechanicsApplication - dict set body_output_configuration_dict process_name ParticleMPMGiDOutputProcess - dict set body_output_configuration_dict Parameters model_part_name MPM_Material - dict set grid_output_configuration_dict Parameters model_part_name Background_Grid - dict set body_output_configuration_dict Parameters output_name [dict get $project_parameters_dict solver_settings model_import_settings input_filename] - dict set grid_output_configuration_dict Parameters output_name [dict get $project_parameters_dict solver_settings grid_model_import_settings input_filename] - dict unset body_output_configuration_dict Parameters postprocess_parameters result_file_configuration nodal_results - dict unset grid_output_configuration_dict Parameters postprocess_parameters result_file_configuration gauss_point_results - #dict set body_output_configuration_dict Parameters postprocess_parameters result_file_configuration gauss_point_results [list MP_VELOCITY MP_DISPLACEMENT MP_PRESSURE] - dict set project_parameters_dict output_processes body_output_process [list $body_output_configuration_dict] - dict set project_parameters_dict output_processes grid_output_process [list $grid_output_configuration_dict] - dict unset project_parameters_dict output_processes gid_output - dict unset project_parameters_dict output_processes vtk_output + # Output processes + dict set project_parameters_dict output_processes [MPM::write::GetOutputProcessesList] + - # REMOVE RAYLEIGH dict set project_parameters_dict solver_settings auxiliary_variables_list [list NORMAL IS_STRUCTURE] dict unset project_parameters_dict solver_settings rayleigh_alpha @@ -112,7 +97,81 @@ proc ::MPM::write::getParametersDict { } { return $project_parameters_dict } + +proc ::MPM::write::GetOutputProcessesList { } { + set output_process [dict create] + + set project_parameters_dict [Structural::write::getParametersDict] + # Change the model part name + dict set project_parameters_dict solver_settings model_part_name MPM_Material + + # create grid_import_settings + set grid_import_settings_dict [dict get $project_parameters_dict solver_settings model_import_settings] + dict append grid_import_settings_dict input_filename _Grid + dict set project_parameters_dict solver_settings grid_model_import_settings $grid_import_settings_dict + + # add _Body to model_import_settings + set model_import_settings_dict [dict get $project_parameters_dict solver_settings model_import_settings] + dict append model_import_settings_dict input_filename _Body + dict set project_parameters_dict solver_settings model_import_settings $model_import_settings_dict + + set need_gid [write::getValue EnableGiDOutput] + if {[write::isBooleanTrue $need_gid]} { + + set body_output_configuration_dict [lindex [dict get $project_parameters_dict output_processes gid_output] 0] + set grid_output_configuration_dict [lindex [dict get $project_parameters_dict output_processes gid_output] 0] + dict set body_output_configuration_dict python_module particle_gid_output_process + dict set body_output_configuration_dict kratos_module KratosMultiphysics.ParticleMechanicsApplication + dict set body_output_configuration_dict process_name ParticleMPMGiDOutputProcess + dict set body_output_configuration_dict Parameters model_part_name MPM_Material + dict set grid_output_configuration_dict Parameters model_part_name Background_Grid + dict set body_output_configuration_dict Parameters output_name [dict get $project_parameters_dict solver_settings model_import_settings input_filename] + dict set grid_output_configuration_dict Parameters output_name [dict get $project_parameters_dict solver_settings grid_model_import_settings input_filename] + dict unset body_output_configuration_dict Parameters postprocess_parameters result_file_configuration nodal_results + dict unset grid_output_configuration_dict Parameters postprocess_parameters result_file_configuration gauss_point_results + + dict set project_parameters_dict output_processes body_output_process [list $body_output_configuration_dict] + dict set project_parameters_dict output_processes grid_output_process [list $grid_output_configuration_dict] + dict unset project_parameters_dict output_processes gid_output + + # Append the fluid and solid output processes to the output processes list + lappend gid_output_processes_list $body_output_configuration_dict + lappend gid_output_processes_list $grid_output_configuration_dict + dict set output_process gid_output_processes $gid_output_processes_list + + } + + set need_vtk [write::getValue EnableVtkOutput] + if {[write::isBooleanTrue $need_vtk]} { +# # Set a different output_name for the fluid and solid domains +# set fluid_output [lindex [dict get $ConjugateHeatTransfer::write::fluid_domain_solver_settings output_processes vtk_output] 0] +# set solid_output [lindex [dict get $ConjugateHeatTransfer::write::solid_domain_solver_settings output_processes vtk_output] 0] +# +# set solid_nodal_variables [dict get $solid_output Parameters nodal_solution_step_data_variables] +# set valid_list [list ] +# foreach solid_nodal_variable $solid_nodal_variables { +# if {$solid_nodal_variable in [list "TEMPERATURE"]} { +# lappend valid_list $solid_nodal_variable +# } +# } +# dict set solid_output Parameters nodal_solution_step_data_variables $valid_list +# +# # Append the fluid and solid output processes to the output processes list +# lappend vtk_output_processes_list $fluid_output +# lappend vtk_output_processes_list $solid_output +# dict set output_process vtk_output_processes $vtk_output_processes_list + } + + return $output_process +} + + + + proc ::MPM::write::writeParametersEvent { } { write::WriteJSON [getParametersDict] } + + + From 026a52e8d32c19ca3f0f0bcd497062f402bfa3bb Mon Sep 17 00:00:00 2001 From: lmoreno Date: Thu, 9 Dec 2021 18:39:58 +0100 Subject: [PATCH 06/67] vtk option on/off for MPM. Not prints for body with vtk yet --- .../apps/MPM/write/writeProjectParameters.tcl | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index 39874352e..0316deee2 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -143,31 +143,33 @@ proc ::MPM::write::GetOutputProcessesList { } { set need_vtk [write::getValue EnableVtkOutput] if {[write::isBooleanTrue $need_vtk]} { -# # Set a different output_name for the fluid and solid domains -# set fluid_output [lindex [dict get $ConjugateHeatTransfer::write::fluid_domain_solver_settings output_processes vtk_output] 0] -# set solid_output [lindex [dict get $ConjugateHeatTransfer::write::solid_domain_solver_settings output_processes vtk_output] 0] -# -# set solid_nodal_variables [dict get $solid_output Parameters nodal_solution_step_data_variables] -# set valid_list [list ] -# foreach solid_nodal_variable $solid_nodal_variables { -# if {$solid_nodal_variable in [list "TEMPERATURE"]} { -# lappend valid_list $solid_nodal_variable -# } -# } -# dict set solid_output Parameters nodal_solution_step_data_variables $valid_list -# -# # Append the fluid and solid output processes to the output processes list -# lappend vtk_output_processes_list $fluid_output -# lappend vtk_output_processes_list $solid_output -# dict set output_process vtk_output_processes $vtk_output_processes_list + + set body_output_configuration_dict [lindex [dict get $project_parameters_dict output_processes vtk_output] 0] + set grid_output_configuration_dict [lindex [dict get $project_parameters_dict output_processes vtk_output] 0] + dict set body_output_configuration_dict python_module particle_vtk_output_process + dict set body_output_configuration_dict kratos_module KratosMultiphysics.ParticleMechanicsApplication + dict set body_output_configuration_dict process_name ParticleMPMVTKOutputProcess + dict set body_output_configuration_dict Parameters model_part_name MPM_Material + dict set grid_output_configuration_dict Parameters model_part_name Background_Grid + dict unset body_output_configuration_dict Parameters nodal_solution_step_data_variables + dict unset grid_output_configuration_dict Parameters gauss_point_variables_extrapolated_to_nodes + + + dict set project_parameters_dict output_processes body_output_process [list $body_output_configuration_dict] + dict set project_parameters_dict output_processes grid_output_process [list $grid_output_configuration_dict] + dict unset project_parameters_dict output_processes vtk_output + + # Append the fluid and solid output processes to the output processes list + #lappend vtk_output_processes_list $body_output_configuration_dict + lappend vtk_output_processes_list $grid_output_configuration_dict + dict set output_process vtk_output_processes $vtk_output_processes_list + } return $output_process } - - proc ::MPM::write::writeParametersEvent { } { write::WriteJSON [getParametersDict] } From a1aee3af3989141c477386089299d62e6bdc7d59 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Sat, 18 Dec 2021 16:55:00 +0100 Subject: [PATCH 07/67] added Newtonian Fluid as constitutive law --- kratos.gid/apps/MPM/xml/ConstitutiveLaws.xml | 40 ++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/kratos.gid/apps/MPM/xml/ConstitutiveLaws.xml b/kratos.gid/apps/MPM/xml/ConstitutiveLaws.xml index 127d2dbed..849e0024c 100644 --- a/kratos.gid/apps/MPM/xml/ConstitutiveLaws.xml +++ b/kratos.gid/apps/MPM/xml/ConstitutiveLaws.xml @@ -255,5 +255,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From be1b132d6021248fcbbd6ec99640a336853c8cb6 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Sat, 18 Dec 2021 21:47:25 +0100 Subject: [PATCH 08/67] added stabilization option --- kratos.gid/apps/MPM/xml/Strategies.xml | 10 +++++++--- kratos.gid/apps/MPM/xml/XmlController.tcl | 6 ++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/Strategies.xml b/kratos.gid/apps/MPM/xml/Strategies.xml index 760e71966..648f58a1c 100644 --- a/kratos.gid/apps/MPM/xml/Strategies.xml +++ b/kratos.gid/apps/MPM/xml/Strategies.xml @@ -1,11 +1,12 @@ - + + @@ -32,12 +33,13 @@ - + + @@ -63,10 +65,11 @@ - + + @@ -93,4 +96,5 @@ + diff --git a/kratos.gid/apps/MPM/xml/XmlController.tcl b/kratos.gid/apps/MPM/xml/XmlController.tcl index 364f92967..abd1ce5a9 100644 --- a/kratos.gid/apps/MPM/xml/XmlController.tcl +++ b/kratos.gid/apps/MPM/xml/XmlController.tcl @@ -10,11 +10,13 @@ proc MPM::xml::Init { } { # Namespace variables inicialization Model::InitVariables dir $::MPM::dir - Model::ForgetSolutionStrategies - Model::getSolutionStrategies Strategies.xml + # Import our elements Model::ForgetElements Model::getElements Elements.xml + + Model::ForgetSolutionStrategies + Model::getSolutionStrategies Strategies.xml # Modify the schemes so more elements are filtered foreach strategy $::Model::SolutionStrategies { From f29dd3d05d2516bddde53662411bbcecedaf2ddc Mon Sep 17 00:00:00 2001 From: lmoreno Date: Mon, 20 Dec 2021 11:44:38 +0100 Subject: [PATCH 09/67] Stabilization= No option added --- kratos.gid/apps/MPM/xml/Strategies.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/Strategies.xml b/kratos.gid/apps/MPM/xml/Strategies.xml index 648f58a1c..786de7623 100644 --- a/kratos.gid/apps/MPM/xml/Strategies.xml +++ b/kratos.gid/apps/MPM/xml/Strategies.xml @@ -6,7 +6,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -69,7 +69,7 @@ - + From 3f678bab1fe1c52055eb76aebb8cc473aaaf4017 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Tue, 21 Dec 2021 17:27:59 +0100 Subject: [PATCH 10/67] Solid part replaced by Material_domain in MPM module --- kratos.gid/apps/MPM/xml/Elements.xml | 10 +++++----- kratos.gid/apps/MPM/xml/Parts.spd | 2 +- kratos.gid/apps/MPM/xml/Strategies.xml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/Elements.xml b/kratos.gid/apps/MPM/xml/Elements.xml index d4e34357b..35cc61a60 100644 --- a/kratos.gid/apps/MPM/xml/Elements.xml +++ b/kratos.gid/apps/MPM/xml/Elements.xml @@ -1,7 +1,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -129,7 +129,7 @@ - + diff --git a/kratos.gid/apps/MPM/xml/Parts.spd b/kratos.gid/apps/MPM/xml/Parts.spd index 02fd6e99f..c21065910 100644 --- a/kratos.gid/apps/MPM/xml/Parts.spd +++ b/kratos.gid/apps/MPM/xml/Parts.spd @@ -1,4 +1,4 @@ - + diff --git a/kratos.gid/apps/MPM/xml/Strategies.xml b/kratos.gid/apps/MPM/xml/Strategies.xml index 786de7623..da7d0247e 100644 --- a/kratos.gid/apps/MPM/xml/Strategies.xml +++ b/kratos.gid/apps/MPM/xml/Strategies.xml @@ -6,7 +6,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -69,7 +69,7 @@ - + From 0e7005b31ef37edb9f8e4fc7bfcf869037d0cd7b Mon Sep 17 00:00:00 2001 From: lmoreno Date: Mon, 17 Jan 2022 11:07:51 +0100 Subject: [PATCH 11/67] pressure_dofs=true or false now depend on the element type --- kratos.gid/apps/MPM/write/write.tcl | 27 ++++++++++++++++++- .../apps/MPM/write/writeProjectParameters.tcl | 2 +- kratos.gid/apps/MPM/xml/Elements.xml | 12 --------- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/kratos.gid/apps/MPM/write/write.tcl b/kratos.gid/apps/MPM/write/write.tcl index 83d9a12aa..9d8e4d72b 100644 --- a/kratos.gid/apps/MPM/write/write.tcl +++ b/kratos.gid/apps/MPM/write/write.tcl @@ -90,6 +90,31 @@ proc MPM::write::GetPartsGroups { part_type {what "name"} } { return $body_groups } + +proc ::MPM::write::GetUsedElements { {get "Objects"} } { + set lista [list ] + foreach gNode [MPM::write::GetPartsGroups2] { + set elem_name [write::getValueByNode [$gNode selectNodes ".//value\[@n='Element']"] ] + set e [Model::getElement $elem_name] + if {$get eq "Name"} { set e [$e getName] } + lappend lista $e + } + return $lista +} + + +proc ::MPM::write::GetPartsGroups2 { {get "Objects"} } { + set xp1 "[spdAux::getRoute [GetAttribute parts_un]]/condition/group" + set lista [list ] + foreach gNode [[customlib::GetBaseRoot] selectNodes $xp1] { + set g $gNode + if {$get eq "Name"} { set g [$g getName] } + lappend lista $g + } + return $lista +} + + proc MPM::write::writeBodyNodalCoordinates { } { write::writeNodalCoordinatesOnGroups [MPM::write::GetPartsGroups Body] } @@ -200,4 +225,4 @@ proc MPM::write::GetAttributes {} { proc MPM::write::SetAttribute {att val} { variable writeAttributes dict set writeAttributes $att $val -} \ No newline at end of file +} diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index 0316deee2..af7765a99 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -35,7 +35,7 @@ proc ::MPM::write::getParametersDict { } { # Pressure dofs set check_list [list "UpdatedLagrangianUP2D"] foreach elem $check_list { - if {$elem in [Structural::write::GetUsedElements Name]} { + if {$elem in [MPM::write::GetUsedElements Name]} { dict set project_parameters_dict solver_settings pressure_dofs true break } else { diff --git a/kratos.gid/apps/MPM/xml/Elements.xml b/kratos.gid/apps/MPM/xml/Elements.xml index 35cc61a60..4399268f7 100644 --- a/kratos.gid/apps/MPM/xml/Elements.xml +++ b/kratos.gid/apps/MPM/xml/Elements.xml @@ -8,12 +8,10 @@ - - @@ -33,8 +31,6 @@ - - @@ -66,8 +62,6 @@ - - @@ -98,7 +92,6 @@ - @@ -128,7 +121,6 @@ - @@ -158,7 +150,6 @@ - @@ -179,7 +170,6 @@ - @@ -199,7 +189,6 @@ - @@ -219,5 +208,4 @@ - From e063a510053449b5717efa8b142df847433cd41a Mon Sep 17 00:00:00 2001 From: lmoreno Date: Tue, 18 Jan 2022 19:52:47 +0100 Subject: [PATCH 12/67] adding pressure option on nodes --- kratos.gid/apps/MPM/xml/NodalConditions.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/kratos.gid/apps/MPM/xml/NodalConditions.xml b/kratos.gid/apps/MPM/xml/NodalConditions.xml index 63b5747fe..ccc7660c6 100644 --- a/kratos.gid/apps/MPM/xml/NodalConditions.xml +++ b/kratos.gid/apps/MPM/xml/NodalConditions.xml @@ -4,6 +4,7 @@ analysis_type="Static,Quasi-static,Dynamic" unit_magnitude="L" units="m" App="Structural" state="CheckNodalConditionStateStructural" Interval="Total"> + From 3c5b11f712f382c772be38710de4d83448f5a053 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Fri, 25 Feb 2022 09:36:10 +0100 Subject: [PATCH 13/67] set none stabilization option --- .../apps/MPM/write/writeProjectParameters.tcl | 3 +- kratos.gid/apps/MPM/xml/Strategies.xml | 39 +++++++++---------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index af7765a99..830ee20bb 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -156,7 +156,8 @@ proc ::MPM::write::GetOutputProcessesList { } { dict set project_parameters_dict output_processes body_output_process [list $body_output_configuration_dict] - dict set project_parameters_dict output_processes grid_output_process [list $grid_output_configuration_dict] + #dict set project_parameters_dict output_processes grid_output_process [list $grid_output_configuration_dict] + dict set project_parameters_dict output_processes grid_output_process gauss_point_results dict unset project_parameters_dict output_processes vtk_output # Append the fluid and solid output processes to the output processes list diff --git a/kratos.gid/apps/MPM/xml/Strategies.xml b/kratos.gid/apps/MPM/xml/Strategies.xml index da7d0247e..2745e34e1 100644 --- a/kratos.gid/apps/MPM/xml/Strategies.xml +++ b/kratos.gid/apps/MPM/xml/Strategies.xml @@ -6,13 +6,12 @@ - - - - - - + + + + + + @@ -39,13 +38,12 @@ - - - - - - + + + + + + @@ -69,13 +67,12 @@ - - - - - - + + + + + + From 2c2d1b9b334c29d6d5b355c30329b93a601d5979 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Thu, 3 Mar 2022 17:45:19 +0100 Subject: [PATCH 14/67] load on mpm points added --- kratos.gid/apps/MPM/xml/Conditions.xml | 15 +++++++++++++++ kratos.gid/apps/MPM/xml/Processes.xml | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/kratos.gid/apps/MPM/xml/Conditions.xml b/kratos.gid/apps/MPM/xml/Conditions.xml index 75a2559ca..744571f7b 100644 --- a/kratos.gid/apps/MPM/xml/Conditions.xml +++ b/kratos.gid/apps/MPM/xml/Conditions.xml @@ -15,6 +15,21 @@ + + + + + + + + + + + + + + + + + + From 5d594627d90fa9020be3fde74c670862212c3b7f Mon Sep 17 00:00:00 2001 From: lmoreno Date: Tue, 8 Mar 2022 15:54:09 +0100 Subject: [PATCH 15/67] fixing error derived from the merge --- kratos.gid/apps/MPM/xml/Elements.xml | 2 +- kratos.gid/apps/Structural/xml/Strategies.xml | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/Elements.xml b/kratos.gid/apps/MPM/xml/Elements.xml index 8492d145a..a2443de42 100644 --- a/kratos.gid/apps/MPM/xml/Elements.xml +++ b/kratos.gid/apps/MPM/xml/Elements.xml @@ -1,7 +1,7 @@ - + diff --git a/kratos.gid/apps/Structural/xml/Strategies.xml b/kratos.gid/apps/Structural/xml/Strategies.xml index 88432c67f..f64406d17 100644 --- a/kratos.gid/apps/Structural/xml/Strategies.xml +++ b/kratos.gid/apps/Structural/xml/Strategies.xml @@ -100,10 +100,6 @@ -<<<<<<< HEAD - - -======= ->>>>>>> master + From fe5b47a66112f202a6e0bdb2ba1952f7f9226a72 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Thu, 10 Mar 2022 17:02:28 +0100 Subject: [PATCH 16/67] vtk postprocess fixed --- .../apps/MPM/write/writeProjectParameters.tcl | 39 +++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index 77ff30e90..bceb5afab 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -101,6 +101,14 @@ proc ::MPM::write::getParametersDict { } { return $project_parameters_dict } + +proc write::GetResultsList { un {cnd ""} } { + if {$cnd eq ""} {set xp1 [spdAux::getRoute $un]} {set xp1 "[spdAux::getRoute $un]/container\[@n = '$cnd'\]"} + return [GetResultsByXPathList $xp1] +} + + + proc ::MPM::write::GetOutputProcessesList { } { set output_process [dict create] @@ -131,7 +139,10 @@ proc ::MPM::write::GetOutputProcessesList { } { dict set body_output_configuration_dict Parameters output_name [dict get $project_parameters_dict solver_settings model_import_settings input_filename] dict set grid_output_configuration_dict Parameters output_name [dict get $project_parameters_dict solver_settings grid_model_import_settings input_filename] dict unset body_output_configuration_dict Parameters postprocess_parameters result_file_configuration nodal_results + + dict unset grid_output_configuration_dict Parameters postprocess_parameters result_file_configuration gauss_point_results + dict set project_parameters_dict output_processes body_output_process [list $body_output_configuration_dict] dict set project_parameters_dict output_processes grid_output_process [list $grid_output_configuration_dict] @@ -146,26 +157,46 @@ proc ::MPM::write::GetOutputProcessesList { } { set need_vtk [write::getValue EnableVtkOutput] if {[write::isBooleanTrue $need_vtk]} { + #set vtk_options_xpath "[spdAux::getRoute $results_UN]/container\[@n='VtkOutput'\]/container\[@n='VtkOptions'\]" set body_output_configuration_dict [lindex [dict get $project_parameters_dict output_processes vtk_output] 0] set grid_output_configuration_dict [lindex [dict get $project_parameters_dict output_processes vtk_output] 0] + + dict set body_output_configuration_dict python_module particle_vtk_output_process dict set body_output_configuration_dict kratos_module KratosMultiphysics.ParticleMechanicsApplication dict set body_output_configuration_dict process_name ParticleMPMVTKOutputProcess dict set body_output_configuration_dict Parameters model_part_name MPM_Material - dict set grid_output_configuration_dict Parameters model_part_name Background_Grid + dict unset body_output_configuration_dict Parameters nodal_data_value_variables + dict unset body_output_configuration_dict Parameters element_data_value_variables + dict unset body_output_configuration_dict Parameters condition_data_value_variables dict unset body_output_configuration_dict Parameters nodal_solution_step_data_variables + #dict unset body_output_configuration_dict Parameters output_interval + #set outputCT [getValueByXPath $vtk_options_xpath OutputControlType] + #dict set resultDict output_control_type $outputCT + #if {$outputCT eq "time"} {set frequency [getValueByXPath $vtk_options_xpath OutputDeltaTime]} {set frequency [getValueByXPath $vtk_options_xpath OutputDeltaStep]} + #dict set body_output_configuration_dict Parameters output_frequency + dict unset body_output_configuration_dict Parameters output_path + dict set body_output_configuration_dict Parameters folder_name "vtk_output" + dict unset body_output_configuration_dict Parameters gauss_point_variables_extrapolated_to_nodes + dict set body_output_configuration_dict Parameters gauss_point_results [write::GetResultsList ElementResults] + + + dict set grid_output_configuration_dict Parameters model_part_name Background_Grid dict unset grid_output_configuration_dict Parameters gauss_point_variables_extrapolated_to_nodes + dict unset grid_output_configuration_dict Parameters nodal_data_value_variables + dict unset grid_output_configuration_dict Parameters element_data_value_variables + dict unset grid_output_configuration_dict Parameters condition_data_value_variables dict set project_parameters_dict output_processes body_output_process [list $body_output_configuration_dict] #dict set project_parameters_dict output_processes grid_output_process [list $grid_output_configuration_dict] - dict set project_parameters_dict output_processes grid_output_process gauss_point_results dict unset project_parameters_dict output_processes vtk_output + dict unset grid_output_configuration_dict Parameters gauss_point_results # Append the fluid and solid output processes to the output processes list - #lappend vtk_output_processes_list $body_output_configuration_dict lappend vtk_output_processes_list $grid_output_configuration_dict + lappend vtk_output_processes_list $body_output_configuration_dict dict set output_process vtk_output_processes $vtk_output_processes_list } @@ -178,3 +209,5 @@ proc ::MPM::write::writeParametersEvent { } { write::WriteJSON [getParametersDict] } + + From 0bc27ab5b6caff661e30382ab33e8ccb42f13d7c Mon Sep 17 00:00:00 2001 From: Laura Date: Sat, 1 Oct 2022 20:24:27 +0200 Subject: [PATCH 17/67] only write the word "stabilization" for mixed formulations --- kratos.gid/apps/MPM/write/writeProjectParameters.tcl | 9 +++++++-- kratos.gid/apps/MPM/xml/XmlController.tcl | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index 33fa2e97f..5c3624fb9 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -34,18 +34,21 @@ proc ::MPM::write::getParametersDict { } { dict set project_parameters_dict solver_settings axis_symmetric_flag true } - # Pressure dofs - set check_list [list "UpdatedLagrangianUP2D"] + set check_list [list "UpdatedLagrangianUP2D" "UpdatedLagrangianUP3D"] foreach elem $check_list { if {$elem in [MPM::write::GetUsedElements Name]} { dict set project_parameters_dict solver_settings pressure_dofs true break } else { dict set project_parameters_dict solver_settings pressure_dofs false + dict unset project_parameters_dict solver_settings stabilization } } + + + # Rotation dofs dict unset project_parameters_dict solver_settings rotation_dofs @@ -97,6 +100,8 @@ proc ::MPM::write::getParametersDict { } { dict set project_parameters_dict solver_settings auxiliary_variables_list [list NORMAL IS_STRUCTURE] dict unset project_parameters_dict solver_settings rayleigh_alpha dict unset project_parameters_dict solver_settings rayleigh_beta + + # REMOVE use_old_stiffness_in_first_iteration dict unset project_parameters_dict solver_settings use_old_stiffness_in_first_iteration return $project_parameters_dict diff --git a/kratos.gid/apps/MPM/xml/XmlController.tcl b/kratos.gid/apps/MPM/xml/XmlController.tcl index abd1ce5a9..ac664323d 100644 --- a/kratos.gid/apps/MPM/xml/XmlController.tcl +++ b/kratos.gid/apps/MPM/xml/XmlController.tcl @@ -15,7 +15,7 @@ proc MPM::xml::Init { } { Model::ForgetElements Model::getElements Elements.xml - Model::ForgetSolutionStrategies + Model::ForgetSolutionStrategies Model::getSolutionStrategies Strategies.xml # Modify the schemes so more elements are filtered From a05d776024b8f1b5a25c987ee54825d85fb54ba1 Mon Sep 17 00:00:00 2001 From: Laura Date: Sun, 2 Oct 2022 12:56:07 +0200 Subject: [PATCH 18/67] changing loction of gravity --- kratos.gid/apps/MPM/xml/Main.spd | 2 +- kratos.gid/apps/MPM/xml/NodalConditions.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/Main.spd b/kratos.gid/apps/MPM/xml/Main.spd index 440d4217d..fd828369b 100644 --- a/kratos.gid/apps/MPM/xml/Main.spd +++ b/kratos.gid/apps/MPM/xml/Main.spd @@ -5,9 +5,9 @@ + - diff --git a/kratos.gid/apps/MPM/xml/NodalConditions.xml b/kratos.gid/apps/MPM/xml/NodalConditions.xml index ccc7660c6..b4a6a085d 100644 --- a/kratos.gid/apps/MPM/xml/NodalConditions.xml +++ b/kratos.gid/apps/MPM/xml/NodalConditions.xml @@ -1,7 +1,6 @@ - + From 84e0860cc2aa196dc4414246528c479961739e8c Mon Sep 17 00:00:00 2001 From: Laura Date: Mon, 3 Oct 2022 09:00:54 +0200 Subject: [PATCH 19/67] updated some dependences in the tree --- kratos.gid/apps/MPM/app.json | 2 +- .../apps/MPM/write/writeProjectParameters.tcl | 2 +- kratos.gid/apps/MPM/xml/Elements.xml | 82 +++++++++---------- kratos.gid/apps/MPM/xml/NodalConditions.xml | 10 +-- kratos.gid/apps/MPM/xml/Procs.spd | 4 +- kratos.gid/apps/MPM/xml/XmlController.tcl | 23 +++++- 6 files changed, 72 insertions(+), 51 deletions(-) diff --git a/kratos.gid/apps/MPM/app.json b/kratos.gid/apps/MPM/app.json index ef6695dd3..e538a4fad 100644 --- a/kratos.gid/apps/MPM/app.json +++ b/kratos.gid/apps/MPM/app.json @@ -47,4 +47,4 @@ }, "main_launch_file": "../../exec/MainKratos.py", "examples": "examples/examples.xml" -} \ No newline at end of file +} diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index 5c3624fb9..e6273d866 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -181,7 +181,7 @@ proc ::MPM::write::GetOutputProcessesList { } { #set outputCT [getValueByXPath $vtk_options_xpath OutputControlType] #dict set resultDict output_control_type $outputCT #if {$outputCT eq "time"} {set frequency [getValueByXPath $vtk_options_xpath OutputDeltaTime]} {set frequency [getValueByXPath $vtk_options_xpath OutputDeltaStep]} - #dict set body_output_configuration_dict Parameters output_frequency + #dict set body_output_configuration_dict Parameters output_frequency dict unset body_output_configuration_dict Parameters output_path dict set body_output_configuration_dict Parameters folder_name "vtk_output" dict unset body_output_configuration_dict Parameters gauss_point_variables_extrapolated_to_nodes diff --git a/kratos.gid/apps/MPM/xml/Elements.xml b/kratos.gid/apps/MPM/xml/Elements.xml index a2443de42..321b798f5 100644 --- a/kratos.gid/apps/MPM/xml/Elements.xml +++ b/kratos.gid/apps/MPM/xml/Elements.xml @@ -1,7 +1,7 @@ - + @@ -23,20 +23,20 @@ - - - - - - + + + + + + - - + + - - + + @@ -54,15 +54,15 @@ - - - - - - + + + + + + - + @@ -85,15 +85,15 @@ - - - - - - + + + + + + - + @@ -114,15 +114,15 @@ - - - - - - + + + + + + - + @@ -143,16 +143,16 @@ - - - - - - + + + + + + - + @@ -171,7 +171,7 @@ - + @@ -190,7 +190,7 @@ - + diff --git a/kratos.gid/apps/MPM/xml/NodalConditions.xml b/kratos.gid/apps/MPM/xml/NodalConditions.xml index b4a6a085d..19fd334e0 100644 --- a/kratos.gid/apps/MPM/xml/NodalConditions.xml +++ b/kratos.gid/apps/MPM/xml/NodalConditions.xml @@ -1,10 +1,10 @@ - - - - - + + + + + diff --git a/kratos.gid/apps/MPM/xml/Procs.spd b/kratos.gid/apps/MPM/xml/Procs.spd index 2f6e51566..8ac854598 100644 --- a/kratos.gid/apps/MPM/xml/Procs.spd +++ b/kratos.gid/apps/MPM/xml/Procs.spd @@ -1,9 +1,9 @@ - + diff --git a/kratos.gid/apps/MPM/xml/XmlController.tcl b/kratos.gid/apps/MPM/xml/XmlController.tcl index ac664323d..b004d6048 100644 --- a/kratos.gid/apps/MPM/xml/XmlController.tcl +++ b/kratos.gid/apps/MPM/xml/XmlController.tcl @@ -5,7 +5,6 @@ namespace eval MPM::xml { } - proc MPM::xml::Init { } { # Namespace variables inicialization Model::InitVariables dir $::MPM::dir @@ -71,6 +70,28 @@ proc ::MPM::xml::ProcGetSolutionStrategiesMPM { domNode args } { return $pnames } + +proc ::MPM::xml::ProcCheckNodalConditionStateMPM {domNode args} { + # Overwritten the base function to add Solution Type restrictions + set parts_un STParts + if {[spdAux::getRoute $parts_un] ne ""} { + set conditionId [$domNode @n] + set condition [Model::getNodalConditionbyId $conditionId] + set cnd_dim [$condition getAttribute WorkingSpaceDimension] + if {$cnd_dim ne ""} { + if {$cnd_dim ne $Model::SpatialDimension} {return "hidden"} + } + set elems [$domNode selectNodes "[spdAux::getRoute $parts_un]/condition/group/value\[@n='Element'\]"] + set elemnames [list ] + foreach elem $elems { lappend elemnames [$elem @v]} + set elemnames [lsort -unique $elemnames] + + set solutionType [get_domnode_attribute [$domNode selectNodes [spdAux::getRoute STSoluType]] v] + set params [list analysis_type $solutionType] + if {[::Model::CheckElementsNodalCondition $conditionId $elemnames $params]} {return "normal"} else {return "hidden"} + } {return "normal"} +} + proc MPM::xml::MultiAppEvent {args} { if {$args eq "init"} { spdAux::parseRoutes From 5f001d4468c8971dd6f82d3939bb5d79f07b4dac Mon Sep 17 00:00:00 2001 From: Laura Date: Mon, 3 Oct 2022 10:26:11 +0200 Subject: [PATCH 20/67] fixing sand_ball example with problemtype branch:MPM_VMS --- .../apps/MPM/examples/FallingSandBall.tcl | 2 +- .../apps/MPM/write/writeProjectParameters.tcl | 2 +- kratos.gid/apps/MPM/xml/Elements.xml | 60 +++++++++---------- .../Writing/WriteProjectParameters.tcl | 4 +- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/kratos.gid/apps/MPM/examples/FallingSandBall.tcl b/kratos.gid/apps/MPM/examples/FallingSandBall.tcl index 9ed41555d..2dd67554c 100644 --- a/kratos.gid/apps/MPM/examples/FallingSandBall.tcl +++ b/kratos.gid/apps/MPM/examples/FallingSandBall.tcl @@ -107,7 +107,7 @@ proc ::MPM::examples::FallingSandBall::TreeAssignation2D {args} { set mpm_parts_route [spdAux::getRoute "MPMParts"] ## Sand - set mpm_solid_parts_route "${mpm_parts_route}/condition\[@n='Parts_Solid'\]" + set mpm_solid_parts_route "${mpm_parts_route}/condition\[@n='Parts_Material_domain'\]" set mpm_solid_part [customlib::AddConditionGroupOnXPath $mpm_solid_parts_route Sand] $mpm_solid_part setAttribute ov surface set constitutive_law_name "HenckyMCPlasticPlaneStrain${nd}Law" diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index e6273d866..58bba7a23 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -181,7 +181,6 @@ proc ::MPM::write::GetOutputProcessesList { } { #set outputCT [getValueByXPath $vtk_options_xpath OutputControlType] #dict set resultDict output_control_type $outputCT #if {$outputCT eq "time"} {set frequency [getValueByXPath $vtk_options_xpath OutputDeltaTime]} {set frequency [getValueByXPath $vtk_options_xpath OutputDeltaStep]} - #dict set body_output_configuration_dict Parameters output_frequency dict unset body_output_configuration_dict Parameters output_path dict set body_output_configuration_dict Parameters folder_name "vtk_output" dict unset body_output_configuration_dict Parameters gauss_point_variables_extrapolated_to_nodes @@ -205,6 +204,7 @@ proc ::MPM::write::GetOutputProcessesList { } { lappend vtk_output_processes_list $body_output_configuration_dict dict set output_process vtk_output_processes $vtk_output_processes_list + } return $output_process diff --git a/kratos.gid/apps/MPM/xml/Elements.xml b/kratos.gid/apps/MPM/xml/Elements.xml index 321b798f5..019b47cb7 100644 --- a/kratos.gid/apps/MPM/xml/Elements.xml +++ b/kratos.gid/apps/MPM/xml/Elements.xml @@ -23,12 +23,12 @@ - - - - - - + + + + + + @@ -54,12 +54,12 @@ - - - - - - + + + + + + @@ -85,12 +85,12 @@ - - - - - - + + + + + + @@ -114,12 +114,12 @@ - - - - - - + + + + + + @@ -143,12 +143,12 @@ - - - - - - + + + + + + diff --git a/kratos.gid/scripts/Writing/WriteProjectParameters.tcl b/kratos.gid/scripts/Writing/WriteProjectParameters.tcl index 1955787d4..6d20fa38a 100644 --- a/kratos.gid/scripts/Writing/WriteProjectParameters.tcl +++ b/kratos.gid/scripts/Writing/WriteProjectParameters.tcl @@ -539,7 +539,7 @@ proc write::GetDefaultParametersOutputVTKDict { {appid ""} } { set outputCT [getValueByXPath $vtk_options_xpath OutputControlType] dict set resultDict output_control_type $outputCT if {$outputCT eq "time"} {set frequency [getValueByXPath $vtk_options_xpath OutputDeltaTime]} {set frequency [getValueByXPath $vtk_options_xpath OutputDeltaStep]} - dict set resultDict output_interval $frequency + dict set resultDict output_interval $frequency dict set resultDict file_format [getValueByXPath $vtk_options_xpath VtkFileFormat] dict set resultDict output_precision 7 dict set resultDict output_sub_model_parts "false" @@ -586,4 +586,4 @@ proc write::GetTimeStepIntervals { {time_parameters_un ""} } { set time_step_intervals_list [lsort -real -index 0 $time_step_intervals_list] return $time_step_intervals_list -} \ No newline at end of file +} From 0f0d16713ed4cab14e06e9bb73cea9c4e775a34b Mon Sep 17 00:00:00 2001 From: lmoreno Date: Tue, 4 Oct 2022 15:10:16 +0200 Subject: [PATCH 21/67] some modifications --- kratos.gid/apps/MPM/xml/Elements.xml | 4 ++-- kratos.gid/apps/MPM/xml/NodalConditions.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/Elements.xml b/kratos.gid/apps/MPM/xml/Elements.xml index 019b47cb7..4ca2714db 100644 --- a/kratos.gid/apps/MPM/xml/Elements.xml +++ b/kratos.gid/apps/MPM/xml/Elements.xml @@ -26,7 +26,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/kratos.gid/apps/MPM/xml/NodalConditions.xml b/kratos.gid/apps/MPM/xml/NodalConditions.xml index 19fd334e0..5e557b5f9 100644 --- a/kratos.gid/apps/MPM/xml/NodalConditions.xml +++ b/kratos.gid/apps/MPM/xml/NodalConditions.xml @@ -3,7 +3,7 @@ - + From 8106811918614e6ae5eaa383dc666d5bd032fc54 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Tue, 4 Oct 2022 15:26:02 +0200 Subject: [PATCH 22/67] deleted explicit scheme type from the tree --- kratos.gid/apps/MPM/xml/StageInfo.spd | 2 +- kratos.gid/apps/MPM/xml/Strategies.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/StageInfo.spd b/kratos.gid/apps/MPM/xml/StageInfo.spd index 56fc23cb6..90d3aa194 100644 --- a/kratos.gid/apps/MPM/xml/StageInfo.spd +++ b/kratos.gid/apps/MPM/xml/StageInfo.spd @@ -1,7 +1,7 @@ - + diff --git a/kratos.gid/apps/MPM/xml/Strategies.xml b/kratos.gid/apps/MPM/xml/Strategies.xml index 2745e34e1..b3a7e9a92 100644 --- a/kratos.gid/apps/MPM/xml/Strategies.xml +++ b/kratos.gid/apps/MPM/xml/Strategies.xml @@ -32,7 +32,7 @@ - + From e637b1b39617307f11c74be933cc6b86e455ff54 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Tue, 4 Oct 2022 15:34:28 +0200 Subject: [PATCH 23/67] Loads on materials points (changed position and name in the tree) --- kratos.gid/apps/MPM/xml/Conditions.xml | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/Conditions.xml b/kratos.gid/apps/MPM/xml/Conditions.xml index 622ea5869..df7c73b6b 100644 --- a/kratos.gid/apps/MPM/xml/Conditions.xml +++ b/kratos.gid/apps/MPM/xml/Conditions.xml @@ -15,21 +15,6 @@ - - - - - - - - - - - + + + + + + + + + + + Date: Tue, 4 Oct 2022 15:48:06 +0200 Subject: [PATCH 24/67] Time_intervals disabled and line_search deleted --- kratos.gid/apps/MPM/app.json | 2 +- kratos.gid/apps/MPM/xml/Strategies.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kratos.gid/apps/MPM/app.json b/kratos.gid/apps/MPM/app.json index e538a4fad..16de22c73 100644 --- a/kratos.gid/apps/MPM/app.json +++ b/kratos.gid/apps/MPM/app.json @@ -31,7 +31,7 @@ "permissions": { "open_tree": true, "show_toolbar": true, - "intervals": true, + "intervals": false, "wizard": false }, "unique_names": { diff --git a/kratos.gid/apps/MPM/xml/Strategies.xml b/kratos.gid/apps/MPM/xml/Strategies.xml index b3a7e9a92..b66cc61f3 100644 --- a/kratos.gid/apps/MPM/xml/Strategies.xml +++ b/kratos.gid/apps/MPM/xml/Strategies.xml @@ -5,7 +5,7 @@ - + @@ -66,7 +66,7 @@ - + From f6bf167e887b83885a2cdd604a12283d92ff2286 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Tue, 4 Oct 2022 15:57:04 +0200 Subject: [PATCH 25/67] deleted rayleigh beta and rayleigh alpha options --- kratos.gid/apps/MPM/xml/Strategies.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/Strategies.xml b/kratos.gid/apps/MPM/xml/Strategies.xml index b66cc61f3..e13fdc3e6 100644 --- a/kratos.gid/apps/MPM/xml/Strategies.xml +++ b/kratos.gid/apps/MPM/xml/Strategies.xml @@ -3,9 +3,9 @@ - + + --> @@ -92,6 +92,4 @@ - - From 5f36e720349fc0b60a268393bf40b717bda71dcb Mon Sep 17 00:00:00 2001 From: lmoreno Date: Tue, 4 Oct 2022 17:14:18 +0200 Subject: [PATCH 26/67] update gravity --- kratos.gid/apps/MPM/xml/Gravity.spd | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/Gravity.spd b/kratos.gid/apps/MPM/xml/Gravity.spd index 8c35d7e44..f5739ec29 100644 --- a/kratos.gid/apps/MPM/xml/Gravity.spd +++ b/kratos.gid/apps/MPM/xml/Gravity.spd @@ -1,7 +1,9 @@ - - - - - + + + + + + + From c7379b6ee7654f8b68755881665e3440672d7844 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Tue, 4 Oct 2022 17:22:18 +0200 Subject: [PATCH 27/67] output in Elements turned to false --- kratos.gid/apps/MPM/xml/Elements.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kratos.gid/apps/MPM/xml/Elements.xml b/kratos.gid/apps/MPM/xml/Elements.xml index 4ca2714db..06aef0bb1 100644 --- a/kratos.gid/apps/MPM/xml/Elements.xml +++ b/kratos.gid/apps/MPM/xml/Elements.xml @@ -57,7 +57,7 @@ - + From 8b1cd9360ce88c352bcfbf64bc853748c3b3a231 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Tue, 4 Oct 2022 17:38:18 +0200 Subject: [PATCH 28/67] customized gravity on and off --- kratos.gid/apps/MPM/xml/Gravity.spd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/Gravity.spd b/kratos.gid/apps/MPM/xml/Gravity.spd index f5739ec29..5b48898c1 100644 --- a/kratos.gid/apps/MPM/xml/Gravity.spd +++ b/kratos.gid/apps/MPM/xml/Gravity.spd @@ -2,8 +2,10 @@ + + - - + + From 04beade714e454d1edbb0c267cc5a84e557eb76a Mon Sep 17 00:00:00 2001 From: lmoreno Date: Tue, 4 Oct 2022 18:18:26 +0200 Subject: [PATCH 29/67] Added SolutionStrategy.spd for MPM --- kratos.gid/apps/MPM/app.json | 2 +- .../apps/MPM/examples/FallingSandBall.tcl | 3 +++ kratos.gid/apps/MPM/examples/examples.tcl | 2 +- kratos.gid/apps/MPM/xml/Main.spd | 2 +- kratos.gid/apps/MPM/xml/SolutionStrategy.spd | 17 +++++++++++++++++ 5 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 kratos.gid/apps/MPM/xml/SolutionStrategy.spd diff --git a/kratos.gid/apps/MPM/app.json b/kratos.gid/apps/MPM/app.json index 16de22c73..e538a4fad 100644 --- a/kratos.gid/apps/MPM/app.json +++ b/kratos.gid/apps/MPM/app.json @@ -31,7 +31,7 @@ "permissions": { "open_tree": true, "show_toolbar": true, - "intervals": false, + "intervals": true, "wizard": false }, "unique_names": { diff --git a/kratos.gid/apps/MPM/examples/FallingSandBall.tcl b/kratos.gid/apps/MPM/examples/FallingSandBall.tcl index 2dd67554c..d8f9c828c 100644 --- a/kratos.gid/apps/MPM/examples/FallingSandBall.tcl +++ b/kratos.gid/apps/MPM/examples/FallingSandBall.tcl @@ -141,6 +141,9 @@ proc ::MPM::examples::FallingSandBall::TreeAssignation2D {args} { set mpm_loads_route [spdAux::getRoute "MPMLoads"] [customlib::AddConditionGroupOnXPath "$mpm_loads_route/condition\[@n='Slip$nd'\]" Slip] setAttribute ov $condtype + # Set gravity On + spdAux::SetValueOnTreeItem v "On" ActivateGravity + # Solution strategy parameters spdAux::SetValueOnTreeItem v "0.005" MPMTimeParameters DeltaTime spdAux::SetValueOnTreeItem v "0.01" GiDOptions OutputDeltaTime diff --git a/kratos.gid/apps/MPM/examples/examples.tcl b/kratos.gid/apps/MPM/examples/examples.tcl index c9eafdaef..d18121a02 100644 --- a/kratos.gid/apps/MPM/examples/examples.tcl +++ b/kratos.gid/apps/MPM/examples/examples.tcl @@ -10,4 +10,4 @@ proc ::MPM::examples::ErasePreviousIntervals { } { foreach int [$root selectNodes "$interval_base/blockdata\[@n='Interval'\]"] { if {[$int @name] ni [list Initial Total Custom1]} {$int delete} } -} \ No newline at end of file +} diff --git a/kratos.gid/apps/MPM/xml/Main.spd b/kratos.gid/apps/MPM/xml/Main.spd index fd828369b..a78db049d 100644 --- a/kratos.gid/apps/MPM/xml/Main.spd +++ b/kratos.gid/apps/MPM/xml/Main.spd @@ -7,7 +7,7 @@ - + diff --git a/kratos.gid/apps/MPM/xml/SolutionStrategy.spd b/kratos.gid/apps/MPM/xml/SolutionStrategy.spd new file mode 100644 index 000000000..346469c0d --- /dev/null +++ b/kratos.gid/apps/MPM/xml/SolutionStrategy.spd @@ -0,0 +1,17 @@ + + + + + + + + + + + + + From 30dcda5807ba12b5dc3d4a64b6e1f891da770a3a Mon Sep 17 00:00:00 2001 From: lmoreno Date: Thu, 6 Oct 2022 11:51:00 +0200 Subject: [PATCH 30/67] tracking of material points added in GiD tree --- kratos.gid/apps/MPM/xml/Main.spd | 2 +- kratos.gid/apps/MPM/xml/Results.spd | 64 +++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 kratos.gid/apps/MPM/xml/Results.spd diff --git a/kratos.gid/apps/MPM/xml/Main.spd b/kratos.gid/apps/MPM/xml/Main.spd index a78db049d..a72393857 100644 --- a/kratos.gid/apps/MPM/xml/Main.spd +++ b/kratos.gid/apps/MPM/xml/Main.spd @@ -8,7 +8,7 @@ - + diff --git a/kratos.gid/apps/MPM/xml/Results.spd b/kratos.gid/apps/MPM/xml/Results.spd new file mode 100644 index 000000000..f25ce2888 --- /dev/null +++ b/kratos.gid/apps/MPM/xml/Results.spd @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 21c4914eecfbe8405f5d1d53cbc9ddf02860de0d Mon Sep 17 00:00:00 2001 From: lmoreno Date: Thu, 6 Oct 2022 15:04:17 +0200 Subject: [PATCH 31/67] tracking of a material point enable for writting --- .../apps/MPM/write/writeProjectParameters.tcl | 23 +++++++++++++++++++ kratos.gid/apps/MPM/xml/Results.spd | 7 +++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index 58bba7a23..3445f1ced 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -92,6 +92,29 @@ proc ::MPM::write::getParametersDict { } { dict set gravity_dict Parameters $gravity_parameters_dict dict set project_parameters_dict processes gravity [list $gravity_dict] + # Tracking of points + set tracking_dict [dict create ] + dict set tracking_dict python_module mpm_point_output_process + dict set tracking_dict kratos_module "KratosMultiphysics.ParticleMechanicsApplication" + dict set tracking_dict process_name MPMPointOutputProcess + set tracking_parameters_dict [dict create ] + dict set tracking_parameters_dict model_part_name MPM_Material + lassign [write::getValue MPTracking position] dx dy dz + dict set tracking_parameters_dict position [list [expr $dx] [expr $dy] [expr $dz]] + lassign [write::getValue MPTracking interval] t0 tf + dict set tracking_parameters_dict interval [list [expr $t0] [expr $tf]] + dict set tracking_parameters_dict search_tolerance [write::getValue MPTracking tolerance] + lassign [write::getValue MPTracking print_format] press + if {$press eq "Yes"} { + dict set tracking_parameters_dict output_pressure true + } else { + dict set tracking_parameters_dict output_pressure false + } + dict set tracking_parameters_dict print_format [write::getValue MPTracking print_format] + dict set tracking_parameters_dict write_tracking_output_file true + dict set tracking_dict Parameters $tracking_parameters_dict + dict set project_parameters_dict processes tracking [list $tracking_dict] + # Output processes dict set project_parameters_dict output_processes [MPM::write::GetOutputProcessesList] diff --git a/kratos.gid/apps/MPM/xml/Results.spd b/kratos.gid/apps/MPM/xml/Results.spd index f25ce2888..a6675543e 100644 --- a/kratos.gid/apps/MPM/xml/Results.spd +++ b/kratos.gid/apps/MPM/xml/Results.spd @@ -50,13 +50,14 @@ - + - - + + + From 025e8f970bfb508e926dec1914bef779593576e0 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Thu, 6 Oct 2022 15:28:14 +0200 Subject: [PATCH 32/67] fixing error when tracking of a material point is disabled --- .../apps/MPM/write/writeProjectParameters.tcl | 45 ++++++++++--------- kratos.gid/apps/MPM/xml/SolutionStrategy.spd | 6 +-- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index 3445f1ced..3461d1ffc 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -93,27 +93,30 @@ proc ::MPM::write::getParametersDict { } { dict set project_parameters_dict processes gravity [list $gravity_dict] # Tracking of points - set tracking_dict [dict create ] - dict set tracking_dict python_module mpm_point_output_process - dict set tracking_dict kratos_module "KratosMultiphysics.ParticleMechanicsApplication" - dict set tracking_dict process_name MPMPointOutputProcess - set tracking_parameters_dict [dict create ] - dict set tracking_parameters_dict model_part_name MPM_Material - lassign [write::getValue MPTracking position] dx dy dz - dict set tracking_parameters_dict position [list [expr $dx] [expr $dy] [expr $dz]] - lassign [write::getValue MPTracking interval] t0 tf - dict set tracking_parameters_dict interval [list [expr $t0] [expr $tf]] - dict set tracking_parameters_dict search_tolerance [write::getValue MPTracking tolerance] - lassign [write::getValue MPTracking print_format] press - if {$press eq "Yes"} { - dict set tracking_parameters_dict output_pressure true - } else { - dict set tracking_parameters_dict output_pressure false - } - dict set tracking_parameters_dict print_format [write::getValue MPTracking print_format] - dict set tracking_parameters_dict write_tracking_output_file true - dict set tracking_dict Parameters $tracking_parameters_dict - dict set project_parameters_dict processes tracking [list $tracking_dict] + lassign [write::getValue MPTracking ActivateTracking] track + if {$track eq "On"} { + set tracking_dict [dict create ] + dict set tracking_dict python_module mpm_point_output_process + dict set tracking_dict kratos_module "KratosMultiphysics.ParticleMechanicsApplication" + dict set tracking_dict process_name MPMPointOutputProcess + set tracking_parameters_dict [dict create ] + dict set tracking_parameters_dict model_part_name MPM_Material + lassign [write::getValue MPTracking position] dx dy dz + dict set tracking_parameters_dict position [list [expr $dx] [expr $dy] [expr $dz]] + lassign [write::getValue MPTracking interval] t0 tf + dict set tracking_parameters_dict interval [list [expr $t0] [expr $tf]] + dict set tracking_parameters_dict search_tolerance [write::getValue MPTracking tolerance] + lassign [write::getValue MPTracking print_format] press + if {$press eq "Yes"} { + dict set tracking_parameters_dict output_pressure true + } else { + dict set tracking_parameters_dict output_pressure false + } + dict set tracking_parameters_dict print_format [write::getValue MPTracking print_format] + dict set tracking_parameters_dict write_tracking_output_file true + dict set tracking_dict Parameters $tracking_parameters_dict + dict set project_parameters_dict processes tracking [list $tracking_dict] + } # Output processes dict set project_parameters_dict output_processes [MPM::write::GetOutputProcessesList] diff --git a/kratos.gid/apps/MPM/xml/SolutionStrategy.spd b/kratos.gid/apps/MPM/xml/SolutionStrategy.spd index 346469c0d..6c4cf091c 100644 --- a/kratos.gid/apps/MPM/xml/SolutionStrategy.spd +++ b/kratos.gid/apps/MPM/xml/SolutionStrategy.spd @@ -1,11 +1,11 @@ - - + - --> + From 1e1dff082310e2a450bd8180732b43ac1f5d9c37 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Thu, 6 Oct 2022 16:30:11 +0200 Subject: [PATCH 33/67] modified time_stepping_table --- kratos.gid/apps/MPM/app.json | 2 +- kratos.gid/apps/MPM/examples/examples.tcl | 14 +++++++------- .../apps/MPM/write/writeProjectParameters.tcl | 6 ++++++ kratos.gid/apps/MPM/xml/Main.spd | 2 +- kratos.gid/apps/MPM/xml/SolutionStrategy.spd | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/kratos.gid/apps/MPM/app.json b/kratos.gid/apps/MPM/app.json index e538a4fad..16de22c73 100644 --- a/kratos.gid/apps/MPM/app.json +++ b/kratos.gid/apps/MPM/app.json @@ -31,7 +31,7 @@ "permissions": { "open_tree": true, "show_toolbar": true, - "intervals": true, + "intervals": false, "wizard": false }, "unique_names": { diff --git a/kratos.gid/apps/MPM/examples/examples.tcl b/kratos.gid/apps/MPM/examples/examples.tcl index d18121a02..e00f1ad5c 100644 --- a/kratos.gid/apps/MPM/examples/examples.tcl +++ b/kratos.gid/apps/MPM/examples/examples.tcl @@ -4,10 +4,10 @@ namespace eval ::MPM::examples { } -proc ::MPM::examples::ErasePreviousIntervals { } { - set root [customlib::GetBaseRoot] - set interval_base [spdAux::getRoute "Intervals"] - foreach int [$root selectNodes "$interval_base/blockdata\[@n='Interval'\]"] { - if {[$int @name] ni [list Initial Total Custom1]} {$int delete} - } -} +# proc ::MPM::examples::ErasePreviousIntervals { } { +# set root [customlib::GetBaseRoot] +# set interval_base [spdAux::getRoute "Intervals"] +# foreach int [$root selectNodes "$interval_base/blockdata\[@n='Interval'\]"] { +# if {[$int @name] ni [list Initial Total Custom1]} {$int delete} +# } +# } diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index 3461d1ffc..1c649da9d 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -13,6 +13,12 @@ proc ::MPM::write::getParametersDict { } { dict set project_parameters_dict solver_settings scheme_type [write::getValue STcheme] } + # Time Parameters + if {$solutiontype eq "Dynamic"} { + dict unset project_parameters_dict solver_settings time_stepping "time_step_table" + dict set project_parameters_dict solver_settings time_stepping "time_step" [write::getValue MPTimeParameters DeltaTime] + } + # Change the model part name dict set project_parameters_dict solver_settings model_part_name MPM_Material diff --git a/kratos.gid/apps/MPM/xml/Main.spd b/kratos.gid/apps/MPM/xml/Main.spd index a72393857..ceab0720d 100644 --- a/kratos.gid/apps/MPM/xml/Main.spd +++ b/kratos.gid/apps/MPM/xml/Main.spd @@ -2,11 +2,11 @@ - + diff --git a/kratos.gid/apps/MPM/xml/SolutionStrategy.spd b/kratos.gid/apps/MPM/xml/SolutionStrategy.spd index 6c4cf091c..c2b2ae99a 100644 --- a/kratos.gid/apps/MPM/xml/SolutionStrategy.spd +++ b/kratos.gid/apps/MPM/xml/SolutionStrategy.spd @@ -1,7 +1,7 @@ - + From 9955ee64d8b7d7d4ab8cd3dc67312e3e9db809be Mon Sep 17 00:00:00 2001 From: lmoreno Date: Thu, 6 Oct 2022 17:09:35 +0200 Subject: [PATCH 34/67] new spd file for future InitialConditions --- kratos.gid/apps/MPM/app.json | 2 +- kratos.gid/apps/MPM/examples/FallingSandBall.tcl | 2 ++ kratos.gid/apps/MPM/xml/InitialConditions.spd | 5 +++++ kratos.gid/apps/MPM/xml/Main.spd | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 kratos.gid/apps/MPM/xml/InitialConditions.spd diff --git a/kratos.gid/apps/MPM/app.json b/kratos.gid/apps/MPM/app.json index 16de22c73..e538a4fad 100644 --- a/kratos.gid/apps/MPM/app.json +++ b/kratos.gid/apps/MPM/app.json @@ -31,7 +31,7 @@ "permissions": { "open_tree": true, "show_toolbar": true, - "intervals": false, + "intervals": true, "wizard": false }, "unique_names": { diff --git a/kratos.gid/apps/MPM/examples/FallingSandBall.tcl b/kratos.gid/apps/MPM/examples/FallingSandBall.tcl index d8f9c828c..c78708a97 100644 --- a/kratos.gid/apps/MPM/examples/FallingSandBall.tcl +++ b/kratos.gid/apps/MPM/examples/FallingSandBall.tcl @@ -121,6 +121,8 @@ proc ::MPM::examples::FallingSandBall::TreeAssignation2D {args} { set props [list Element GRID$nd ] spdAux::SetValuesOnBaseNode $mpm_grid_part $props + # Set Initial Conditions Off + spdAux::SetValueOnTreeItem v "Off" InitialCondition # Fix Displacement ## Create interval subgroup diff --git a/kratos.gid/apps/MPM/xml/InitialConditions.spd b/kratos.gid/apps/MPM/xml/InitialConditions.spd new file mode 100644 index 000000000..89852bd15 --- /dev/null +++ b/kratos.gid/apps/MPM/xml/InitialConditions.spd @@ -0,0 +1,5 @@ + + + + + diff --git a/kratos.gid/apps/MPM/xml/Main.spd b/kratos.gid/apps/MPM/xml/Main.spd index ceab0720d..9c6d1fcb0 100644 --- a/kratos.gid/apps/MPM/xml/Main.spd +++ b/kratos.gid/apps/MPM/xml/Main.spd @@ -2,6 +2,7 @@ + From 515e7ef0685d40b5b23ae4fdcd6b9b4f6468a092 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Mon, 10 Oct 2022 19:54:49 +0200 Subject: [PATCH 35/67] fixed a bug about writeparameters --- kratos.gid/apps/MPM/xml/SolutionStrategy.spd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kratos.gid/apps/MPM/xml/SolutionStrategy.spd b/kratos.gid/apps/MPM/xml/SolutionStrategy.spd index c2b2ae99a..88bd9b796 100644 --- a/kratos.gid/apps/MPM/xml/SolutionStrategy.spd +++ b/kratos.gid/apps/MPM/xml/SolutionStrategy.spd @@ -1,6 +1,6 @@ - + From 1fb7e18fb21aaef47cd6f4ebb3c55274f5e4ccc9 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Tue, 1 Nov 2022 10:45:51 +0100 Subject: [PATCH 36/67] gravity On by default --- kratos.gid/apps/MPM/xml/Gravity.spd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kratos.gid/apps/MPM/xml/Gravity.spd b/kratos.gid/apps/MPM/xml/Gravity.spd index 5b48898c1..a2edeb357 100644 --- a/kratos.gid/apps/MPM/xml/Gravity.spd +++ b/kratos.gid/apps/MPM/xml/Gravity.spd @@ -1,6 +1,6 @@ - + From f92e5b2e1d337f700312989bfd46b2a4eb6b354d Mon Sep 17 00:00:00 2001 From: lmoreno Date: Fri, 4 Nov 2022 16:30:20 +0100 Subject: [PATCH 37/67] initial condition added to the tree --- kratos.gid/apps/MPM/xml/Main.spd | 1 + 1 file changed, 1 insertion(+) diff --git a/kratos.gid/apps/MPM/xml/Main.spd b/kratos.gid/apps/MPM/xml/Main.spd index ceab0720d..9c6d1fcb0 100644 --- a/kratos.gid/apps/MPM/xml/Main.spd +++ b/kratos.gid/apps/MPM/xml/Main.spd @@ -2,6 +2,7 @@ + From 705a1ef2516f3e39375e12d7dca7a7c5f3ae243a Mon Sep 17 00:00:00 2001 From: lmoreno Date: Mon, 7 Nov 2022 09:12:44 +0100 Subject: [PATCH 38/67] fixing error with a } symbol --- kratos.gid/apps/MPM/write/writeProjectParameters.tcl | 1 + 1 file changed, 1 insertion(+) diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index de5c49cbe..83ad4dac5 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -103,6 +103,7 @@ proc ::MPM::write::getParametersDict { } { dict set gravity_parameters_dict direction [list [expr $dx] [expr $dy] [expr $dz]] dict set gravity_dict Parameters $gravity_parameters_dict dict set project_parameters_dict processes gravity [list $gravity_dict] + } # Tracking of points lassign [write::getValue MPTracking ActivateTracking] track From 47922802dba1b61f8a9f6e55a5b4835ed4c617a8 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Mon, 28 Nov 2022 18:00:54 +0100 Subject: [PATCH 39/67] asgs stabilization option added --- kratos.gid/apps/MPM/write/writeProjectParameters.tcl | 3 ++- kratos.gid/apps/MPM/xml/SolutionStrategy.spd | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index 35789c00e..6b1c2dc8e 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -52,7 +52,8 @@ proc ::MPM::write::getParametersDict { } { if {$active_stab eq "Off"} { dict set project_parameters_dict solver_settings stabilization "none" } else { - dict set project_parameters_dict solver_settings stabilization "ppp" + set stab_type [write::getValue STStratParams stabilization] + dict set project_parameters_dict solver_settings stabilization $stab_type } dict unset project_parameters_dict solver_settings ActivateStabilization break diff --git a/kratos.gid/apps/MPM/xml/SolutionStrategy.spd b/kratos.gid/apps/MPM/xml/SolutionStrategy.spd index dc6f4e629..c653e813d 100644 --- a/kratos.gid/apps/MPM/xml/SolutionStrategy.spd +++ b/kratos.gid/apps/MPM/xml/SolutionStrategy.spd @@ -11,7 +11,7 @@ - + From 5f5fdb587765e81e8fb54a423470c99efd8369d2 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Wed, 30 Nov 2022 20:22:56 +0100 Subject: [PATCH 40/67] Working on add Initial Boundary conditions in the tree for material points --- kratos.gid/apps/MPM/app.json | 3 ++- kratos.gid/apps/MPM/write/write.tcl | 1 + .../apps/MPM/write/writeProjectParameters.tcl | 5 +++++ .../apps/MPM/xml/BoundaryConditions.spd | 2 +- kratos.gid/apps/MPM/xml/Elements.xml | 1 + kratos.gid/apps/MPM/xml/InitialConditions.spd | 5 ++--- kratos.gid/apps/MPM/xml/NodalConditions.xml | 7 +++++-- kratos.gid/apps/MPM/xml/Processes.xml | 19 +++++++++++++------ kratos.gid/apps/MPM/xml/SolutionStrategy.spd | 2 +- kratos.gid/apps/MPM/xml/Strategies.xml | 4 ++-- 10 files changed, 33 insertions(+), 16 deletions(-) diff --git a/kratos.gid/apps/MPM/app.json b/kratos.gid/apps/MPM/app.json index b249cb69d..9d852cb63 100644 --- a/kratos.gid/apps/MPM/app.json +++ b/kratos.gid/apps/MPM/app.json @@ -39,7 +39,8 @@ "unique_names": { "parts": "MPMParts", "nodal_conditions": "MPMNodalConditions", - "conditions": "MPMLoads" + "conditions": "MPMLoads", + "initial_conditions": "MPMInitialConditions" }, "write": { "coordinates": "all", diff --git a/kratos.gid/apps/MPM/write/write.tcl b/kratos.gid/apps/MPM/write/write.tcl index bd4d67eaf..0cc333150 100644 --- a/kratos.gid/apps/MPM/write/write.tcl +++ b/kratos.gid/apps/MPM/write/write.tcl @@ -14,6 +14,7 @@ proc MPM::write::Init { } { SetAttribute parts_un [::MPM::GetUniqueName parts] SetAttribute nodal_conditions_un [::MPM:::GetUniqueName nodal_conditions] SetAttribute conditions_un [::MPM::GetUniqueName conditions] + SetAttribute initial_conditions_un [::MPM::GetUniqueName initial_conditions] SetAttribute writeCoordinatesByGroups [::MPM::GetWriteProperty coordinates] SetAttribute main_launch_file [::MPM::GetAttribute main_launch_file] diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index 6b1c2dc8e..0997fa74c 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -93,6 +93,11 @@ proc ::MPM::write::getParametersDict { } { dict set project_parameters_dict processes loads_process_list $new_load_process_list dict set project_parameters_dict processes list_other_processes $slip_process_list + # Initial Conditions + set initial_conditions_list [write::getConditionsParametersDict [GetAttribute initial_conditions_un] "Nodal"] + dict set project_parameters_dict processes initial_conditions_processes $initial_conditions_list +# dict set project_parameters_dict processes initial_conditions_processes Parameteres model_part_name MPM_Material + # Gravity set activate_gravity [write::getValue ActivateGravity] if {$activate_gravity eq "On"} { diff --git a/kratos.gid/apps/MPM/xml/BoundaryConditions.spd b/kratos.gid/apps/MPM/xml/BoundaryConditions.spd index c33eca7ec..955bc6622 100644 --- a/kratos.gid/apps/MPM/xml/BoundaryConditions.spd +++ b/kratos.gid/apps/MPM/xml/BoundaryConditions.spd @@ -1,5 +1,5 @@ - + diff --git a/kratos.gid/apps/MPM/xml/Elements.xml b/kratos.gid/apps/MPM/xml/Elements.xml index 82eaf91d7..6d8fbe961 100644 --- a/kratos.gid/apps/MPM/xml/Elements.xml +++ b/kratos.gid/apps/MPM/xml/Elements.xml @@ -17,6 +17,7 @@ + diff --git a/kratos.gid/apps/MPM/xml/InitialConditions.spd b/kratos.gid/apps/MPM/xml/InitialConditions.spd index 89852bd15..a91ce3578 100644 --- a/kratos.gid/apps/MPM/xml/InitialConditions.spd +++ b/kratos.gid/apps/MPM/xml/InitialConditions.spd @@ -1,5 +1,4 @@ - - - + + diff --git a/kratos.gid/apps/MPM/xml/NodalConditions.xml b/kratos.gid/apps/MPM/xml/NodalConditions.xml index 5e557b5f9..ad4b07b5d 100644 --- a/kratos.gid/apps/MPM/xml/NodalConditions.xml +++ b/kratos.gid/apps/MPM/xml/NodalConditions.xml @@ -1,10 +1,13 @@ - + - + + + + diff --git a/kratos.gid/apps/MPM/xml/Processes.xml b/kratos.gid/apps/MPM/xml/Processes.xml index 08aab9363..bec738256 100644 --- a/kratos.gid/apps/MPM/xml/Processes.xml +++ b/kratos.gid/apps/MPM/xml/Processes.xml @@ -1,20 +1,20 @@ - + + kratos_module="KratosMultiphysics" help="" > - + + kratos_module="KratosMultiphysics.ParticleMechanicsApplication" help="" > - - @@ -22,5 +22,12 @@ + + + + + + diff --git a/kratos.gid/apps/MPM/xml/SolutionStrategy.spd b/kratos.gid/apps/MPM/xml/SolutionStrategy.spd index c653e813d..b5477ff4d 100644 --- a/kratos.gid/apps/MPM/xml/SolutionStrategy.spd +++ b/kratos.gid/apps/MPM/xml/SolutionStrategy.spd @@ -12,7 +12,7 @@ - + diff --git a/kratos.gid/apps/MPM/xml/Strategies.xml b/kratos.gid/apps/MPM/xml/Strategies.xml index 2483a4d00..1a72348e8 100644 --- a/kratos.gid/apps/MPM/xml/Strategies.xml +++ b/kratos.gid/apps/MPM/xml/Strategies.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - + From af74b6d441974cf0b7f87133c56f3a757d6b8e65 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Mon, 30 Jan 2023 14:55:42 +0100 Subject: [PATCH 41/67] osgs option added to stabilization types --- kratos.gid/apps/MPM/xml/SolutionStrategy.spd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kratos.gid/apps/MPM/xml/SolutionStrategy.spd b/kratos.gid/apps/MPM/xml/SolutionStrategy.spd index b5477ff4d..d9f414e20 100644 --- a/kratos.gid/apps/MPM/xml/SolutionStrategy.spd +++ b/kratos.gid/apps/MPM/xml/SolutionStrategy.spd @@ -11,7 +11,7 @@ - + From 6846132875b66742a90d58532597b31191c28c62 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Tue, 31 Jan 2023 15:03:45 +0100 Subject: [PATCH 42/67] fixing a bug for tracking mp --- kratos.gid/apps/MPM/write/writeProjectParameters.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index 0997fa74c..ed70e9678 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -129,7 +129,7 @@ proc ::MPM::write::getParametersDict { } { lassign [write::getValue MPTracking interval] t0 tf dict set tracking_parameters_dict interval [list [expr $t0] [expr $tf]] dict set tracking_parameters_dict search_tolerance [write::getValue MPTracking tolerance] - lassign [write::getValue MPTracking print_format] press + lassign [write::getValue MPTracking output_press] press if {$press eq "Yes"} { dict set tracking_parameters_dict output_pressure true } else { From 57f67e565f452a287d752625a2b44c7d4f8cd3e7 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Wed, 1 Feb 2023 19:55:18 +0100 Subject: [PATCH 43/67] improvements in the tracking of a mp in time setup --- kratos.gid/apps/MPM/write/writeProjectParameters.tcl | 1 - kratos.gid/apps/MPM/xml/Results.spd | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index ed70e9678..cd3793a20 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -128,7 +128,6 @@ proc ::MPM::write::getParametersDict { } { dict set tracking_parameters_dict position [list [expr $dx] [expr $dy] [expr $dz]] lassign [write::getValue MPTracking interval] t0 tf dict set tracking_parameters_dict interval [list [expr $t0] [expr $tf]] - dict set tracking_parameters_dict search_tolerance [write::getValue MPTracking tolerance] lassign [write::getValue MPTracking output_press] press if {$press eq "Yes"} { dict set tracking_parameters_dict output_pressure true diff --git a/kratos.gid/apps/MPM/xml/Results.spd b/kratos.gid/apps/MPM/xml/Results.spd index f4641ae6d..268c4b9cb 100644 --- a/kratos.gid/apps/MPM/xml/Results.spd +++ b/kratos.gid/apps/MPM/xml/Results.spd @@ -49,15 +49,12 @@ - - - + - - + + - From 151c490d52c23c4e9c8a0d2ae479158a0309e907 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Thu, 27 Apr 2023 11:30:41 +0200 Subject: [PATCH 44/67] fixing SurfaceCondition3D3N --- kratos.gid/apps/MPM/xml/Conditions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kratos.gid/apps/MPM/xml/Conditions.xml b/kratos.gid/apps/MPM/xml/Conditions.xml index df7c73b6b..995729b50 100644 --- a/kratos.gid/apps/MPM/xml/Conditions.xml +++ b/kratos.gid/apps/MPM/xml/Conditions.xml @@ -134,7 +134,7 @@ WorkingSpaceDimension="3D" LocalSpaceDimension="2" RequiresLocalAxes="False" LargeDeformation="False" ElementType="Surface" ProcessName="ApplyMPMSlipBoundaryProcess" help=""> - + From f9910513a73f87fe4756680a1c4126b8af3a81d3 Mon Sep 17 00:00:00 2001 From: lmoreno Date: Fri, 2 Feb 2024 16:33:48 +0100 Subject: [PATCH 45/67] added tracking in time of a Grid point --- .../apps/MPM/write/writeProjectParameters.tcl | 31 +++++++++++++++++-- kratos.gid/apps/MPM/xml/Results.spd | 12 +++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index 1de9039f3..fec1d6756 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -117,7 +117,7 @@ proc ::MPM::write::getParametersDict { } { dict set project_parameters_dict processes gravity [list $gravity_dict] } - # Tracking of points + # Tracking of mp points lassign [write::getValue MPTracking ActivateTracking] track if {$track eq "On"} { set tracking_dict [dict create ] @@ -139,7 +139,34 @@ proc ::MPM::write::getParametersDict { } { dict set tracking_parameters_dict print_format [write::getValue MPTracking print_format] dict set tracking_parameters_dict write_tracking_output_file true dict set tracking_dict Parameters $tracking_parameters_dict - dict set project_parameters_dict processes tracking [list $tracking_dict] + dict set project_parameters_dict processes mp_tracking [list $tracking_dict] + } + + + + # Tracking of Grid points + lassign [write::getValue GridTracking ActivateTrackingGrid] track + if {$track eq "On"} { + set tracking_dict [dict create ] + dict set tracking_dict python_module point_output_process + dict set tracking_dict kratos_module "KratosMultiphysics" + dict set tracking_dict process_name PointOutputProcess + set tracking_parameters_dict [dict create ] + dict set tracking_parameters_dict model_part_name Background_Grid + lassign [write::getValue GridTracking positionGrid] dx dy dz + dict set tracking_parameters_dict position [list [expr $dx] [expr $dy] [expr $dz]] + lassign [write::getValue GridTracking intervalGrid] t0 tf + dict set tracking_parameters_dict interval [list [expr $t0] [expr $tf]] + + dict set tracking_parameters_dict print_format [write::getValue GridTracking print_formatGrid] + dict set tracking_parameters_dict entity_type element + dict set tracking_parameters_dict search_configuration initial + dict set tracking_parameters_dict output_variables [list "DISPLACEMENT" "VELOCITY"] + set output_file_settings_dict [dict create ] + dict set output_file_settings_dict file_name "grid_point_tracking.dat" + dict set tracking_parameters_dict output_file_settings $output_file_settings_dict + dict set tracking_dict Parameters $tracking_parameters_dict + dict set project_parameters_dict processes grid_point_tracking [list $tracking_dict] } # Output processes diff --git a/kratos.gid/apps/MPM/xml/Results.spd b/kratos.gid/apps/MPM/xml/Results.spd index 0f1c738e1..d2cb1dbbc 100644 --- a/kratos.gid/apps/MPM/xml/Results.spd +++ b/kratos.gid/apps/MPM/xml/Results.spd @@ -61,6 +61,18 @@ + + + + + + + + + + + + From 529ae2089a875209e54544219e73bc261b76011e Mon Sep 17 00:00:00 2001 From: lmoreno Date: Fri, 2 Feb 2024 16:55:39 +0100 Subject: [PATCH 46/67] tracking of a point background grid --- .../apps/MPM/write/writeProjectParameters.tcl | 2 +- kratos.gid/apps/MPM/xml/Results.spd | 41 ++++++++++--------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl index fec1d6756..41e48e76f 100644 --- a/kratos.gid/apps/MPM/write/writeProjectParameters.tcl +++ b/kratos.gid/apps/MPM/write/writeProjectParameters.tcl @@ -163,7 +163,7 @@ proc ::MPM::write::getParametersDict { } { dict set tracking_parameters_dict search_configuration initial dict set tracking_parameters_dict output_variables [list "DISPLACEMENT" "VELOCITY"] set output_file_settings_dict [dict create ] - dict set output_file_settings_dict file_name "grid_point_tracking.dat" + dict set output_file_settings_dict file_name "Grid_point_tracking.dat" dict set tracking_parameters_dict output_file_settings $output_file_settings_dict dict set tracking_dict Parameters $tracking_parameters_dict dict set project_parameters_dict processes grid_point_tracking [list $tracking_dict] diff --git a/kratos.gid/apps/MPM/xml/Results.spd b/kratos.gid/apps/MPM/xml/Results.spd index d2cb1dbbc..15f1292d7 100644 --- a/kratos.gid/apps/MPM/xml/Results.spd +++ b/kratos.gid/apps/MPM/xml/Results.spd @@ -50,28 +50,29 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + From 32d3a6d19c1cb85f34f03f743a2d4f56207600c2 Mon Sep 17 00:00:00 2001 From: Laura Date: Mon, 5 Feb 2024 11:09:51 +0100 Subject: [PATCH 47/67] slip on lines in 3D --- kratos.gid/apps/MPM/xml/Conditions.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/kratos.gid/apps/MPM/xml/Conditions.xml b/kratos.gid/apps/MPM/xml/Conditions.xml index 51412fd78..64de7a0d2 100644 --- a/kratos.gid/apps/MPM/xml/Conditions.xml +++ b/kratos.gid/apps/MPM/xml/Conditions.xml @@ -129,7 +129,21 @@ - + + + + + + + + + + From cecf7593d76e60ec2d378523614d2e0cd4daf2d7 Mon Sep 17 00:00:00 2001 From: Laura Date: Mon, 5 Feb 2024 13:53:28 +0100 Subject: [PATCH 48/67] mpm bc commented --- kratos.gid/apps/MPM/xml/Conditions.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/Conditions.xml b/kratos.gid/apps/MPM/xml/Conditions.xml index 64de7a0d2..993f8cd37 100644 --- a/kratos.gid/apps/MPM/xml/Conditions.xml +++ b/kratos.gid/apps/MPM/xml/Conditions.xml @@ -92,7 +92,7 @@ - + Date: Mon, 5 Feb 2024 17:40:11 +0100 Subject: [PATCH 49/67] Slip conditions for 3d case --- kratos.gid/apps/MPM/xml/Conditions.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/Conditions.xml b/kratos.gid/apps/MPM/xml/Conditions.xml index 993f8cd37..9a32b414e 100644 --- a/kratos.gid/apps/MPM/xml/Conditions.xml +++ b/kratos.gid/apps/MPM/xml/Conditions.xml @@ -130,7 +130,7 @@ - @@ -143,7 +143,7 @@ - From 7fb2882dd54b8208812596901d288865039eb41b Mon Sep 17 00:00:00 2001 From: Laura Date: Thu, 15 Feb 2024 11:32:04 +0100 Subject: [PATCH 50/67] non-conforming loads --- .../apps/MPM/xml/BoundaryConditions.spd | 5 ++- kratos.gid/apps/MPM/xml/Conditions.xml | 43 +++++++++++++------ kratos.gid/apps/MPM/xml/Loads.spd | 4 ++ 3 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 kratos.gid/apps/MPM/xml/Loads.spd diff --git a/kratos.gid/apps/MPM/xml/BoundaryConditions.spd b/kratos.gid/apps/MPM/xml/BoundaryConditions.spd index 955bc6622..5aee43d97 100644 --- a/kratos.gid/apps/MPM/xml/BoundaryConditions.spd +++ b/kratos.gid/apps/MPM/xml/BoundaryConditions.spd @@ -1,5 +1,8 @@ - + + + + diff --git a/kratos.gid/apps/MPM/xml/Conditions.xml b/kratos.gid/apps/MPM/xml/Conditions.xml index 9a32b414e..6f72a3bc8 100644 --- a/kratos.gid/apps/MPM/xml/Conditions.xml +++ b/kratos.gid/apps/MPM/xml/Conditions.xml @@ -92,17 +92,6 @@ - - - @@ -141,9 +130,9 @@ - + --> - @@ -158,4 +147,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kratos.gid/apps/MPM/xml/Loads.spd b/kratos.gid/apps/MPM/xml/Loads.spd new file mode 100644 index 000000000..962d5b347 --- /dev/null +++ b/kratos.gid/apps/MPM/xml/Loads.spd @@ -0,0 +1,4 @@ + + + + From d5fcec59f554ef078a79f352cee00a6eed2bacbd Mon Sep 17 00:00:00 2001 From: Laura Date: Thu, 15 Feb 2024 11:39:30 +0100 Subject: [PATCH 51/67] fixed stab option if up element is activated --- kratos.gid/apps/MPM/xml/XmlController.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kratos.gid/apps/MPM/xml/XmlController.tcl b/kratos.gid/apps/MPM/xml/XmlController.tcl index 59834dfd6..c48a74b48 100644 --- a/kratos.gid/apps/MPM/xml/XmlController.tcl +++ b/kratos.gid/apps/MPM/xml/XmlController.tcl @@ -125,7 +125,7 @@ proc MPM::xml::ProcCheckGeometry {domNode args} { proc MPM::xml::ProcCheckActivateStabilizationState {domNode args} { set ret "hidden" - set up_mixed UpdatedLagrangianUP$::Model::SpatialDimension + set up_mixed MPMUpdatedLagrangianUP$::Model::SpatialDimension set used_elements [::MPM::write::GetUsedElements Name] if {$up_mixed in $used_elements} { set ret "normal" From 6aa3ecc78de99d6307d44e6a23a259b6665e014b Mon Sep 17 00:00:00 2001 From: Laura Date: Thu, 15 Feb 2024 12:00:21 +0100 Subject: [PATCH 52/67] deleted duplicated displacements --- kratos.gid/apps/MPM/xml/BoundaryConditions.spd | 2 -- kratos.gid/apps/MPM/xml/Results.spd | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/BoundaryConditions.spd b/kratos.gid/apps/MPM/xml/BoundaryConditions.spd index 5aee43d97..77a4b16b6 100644 --- a/kratos.gid/apps/MPM/xml/BoundaryConditions.spd +++ b/kratos.gid/apps/MPM/xml/BoundaryConditions.spd @@ -2,7 +2,5 @@ - - diff --git a/kratos.gid/apps/MPM/xml/Results.spd b/kratos.gid/apps/MPM/xml/Results.spd index 15f1292d7..e3d6f8120 100644 --- a/kratos.gid/apps/MPM/xml/Results.spd +++ b/kratos.gid/apps/MPM/xml/Results.spd @@ -9,7 +9,7 @@ - + From c99798d0668e98565d4ab2a0b5f3935a0cf96089 Mon Sep 17 00:00:00 2001 From: Laura Date: Thu, 15 Feb 2024 12:39:05 +0100 Subject: [PATCH 53/67] only load on points neumann implemented --- kratos.gid/apps/MPM/xml/Conditions.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/Conditions.xml b/kratos.gid/apps/MPM/xml/Conditions.xml index 6f72a3bc8..e03438939 100644 --- a/kratos.gid/apps/MPM/xml/Conditions.xml +++ b/kratos.gid/apps/MPM/xml/Conditions.xml @@ -159,7 +159,7 @@ - @@ -169,7 +169,7 @@ - + --> From c216c781468ebffcb3112a18dd0c236bb9e05d1e Mon Sep 17 00:00:00 2001 From: Laura Date: Thu, 15 Feb 2024 15:07:48 +0100 Subject: [PATCH 54/67] NonConforming DirichletBoundaryConditions added --- kratos.gid/apps/MPM/xml/BoundaryConditions.spd | 6 +++--- kratos.gid/apps/MPM/xml/Conditions.xml | 16 ++++++++++++++++ kratos.gid/apps/MPM/xml/Processes.xml | 13 ++++++++++++- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/kratos.gid/apps/MPM/xml/BoundaryConditions.spd b/kratos.gid/apps/MPM/xml/BoundaryConditions.spd index 77a4b16b6..c69d6d8e2 100644 --- a/kratos.gid/apps/MPM/xml/BoundaryConditions.spd +++ b/kratos.gid/apps/MPM/xml/BoundaryConditions.spd @@ -1,6 +1,6 @@ - - - + + + diff --git a/kratos.gid/apps/MPM/xml/Conditions.xml b/kratos.gid/apps/MPM/xml/Conditions.xml index e03438939..d8527db63 100644 --- a/kratos.gid/apps/MPM/xml/Conditions.xml +++ b/kratos.gid/apps/MPM/xml/Conditions.xml @@ -159,6 +159,22 @@ + + + + + + + + + + + + +