Merge pull request #12540 from KratosMultiphysics/particle/remove_dep…

…recation_warn [MPM] Update tests due to renaming of the Application
KratosMultiphysics · Aug 1, 2024 · 5939cad · 5939cad
2 parents fcfc8a3 + ae2441f
commit 5939cad
Show file tree

Hide file tree

Showing 36 changed files with 155 additions and 158 deletions.
diff --git a/applications/CoSimulationApplication/tests/mpm_dem/ParticleMaterials.json b/applications/CoSimulationApplication/tests/mpm_dem/ParticleMaterials.json
@@ -7,11 +7,11 @@
                 "name" : "LinearElasticIsotropicPlaneStrain2DLaw"
             },
             "Variables"        : {
-                "THICKNESS"             : 1.0,
-                "PARTICLES_PER_ELEMENT" : 3,
-                "DENSITY"               : 1000.0,
-                "YOUNG_MODULUS"         : 90000000.0,
-                "POISSON_RATIO"         : 0.0
+                "THICKNESS"                     : 1.0,
+                "MATERIAL_POINTS_PER_ELEMENT"   : 3,
+                "DENSITY"                       : 1000.0,
+                "YOUNG_MODULUS"                 : 90000000.0,
+                "POISSON_RATIO"                 : 0.0
             },
             "Tables"           : {}
         }

diff --git a/applications/CoSimulationApplication/tests/mpm_dem/ProjectParametersMPM.json b/applications/CoSimulationApplication/tests/mpm_dem/ProjectParametersMPM.json
@@ -61,16 +61,16 @@
         "kratos_module": "KratosMultiphysics.MPMApplication",
         "Parameters": {
           "model_part_name": "Background_Grid.INTERFACE_coupling_to_dem",
-          "particles_per_condition": 1
+          "material_points_per_condition": 1
         }
       }
     ],
     "list_other_processes": [
       {
-        "python_module": "particle_from_json_check_result_process",
+        "python_module": "mpm_from_json_check_result_process",
         "kratos_module": "KratosMultiphysics.MPMApplication",
         "help": "",
-        "process_name": "ParticleFromJsonCheckResultProcess",
+        "process_name": "MPMFromJsonCheckResultProcess",
         "Parameters": {
           "check_variables": [ "MP_DISPLACEMENT" ],
           "input_file_name": "mpm_dem/cosim_mpm_dem_results.json",
@@ -83,10 +83,10 @@
   },
   "print_output_process": [
     {
-      "python_module": "particle_json_output_process",
+      "python_module": "mpm_json_output_process",
       "kratos_module": "KratosMultiphysics.MPMApplication",
       "help": "",
-      "process_name": "ParticleJsonOutputProcess",
+      "process_name": "MPMJsonOutputProcess",
       "Parameters": {
         "gauss_points_output_variables": [ "MP_DISPLACEMENT" ],
         "output_file_name": "mpm_dem/cosim_mpm_dem_results.json",

diff --git a/applications/CoSimulationApplication/tests/mpm_dem/cosim_mpm_dem_parameters.json b/applications/CoSimulationApplication/tests/mpm_dem/cosim_mpm_dem_parameters.json
@@ -83,7 +83,7 @@
                 }
             },
           "structure": {
-            "type": "solver_wrappers.kratos.particle_mechanics_neumann_wrapper",
+            "type": "solver_wrappers.kratos.mpm_neumann_wrapper",
             "solver_wrapper_settings": {
               "input_file": "mpm_dem/ProjectParametersMPM",
               "interface_model_part_name": "MPM_Material.INTERFACE_coupling_to_dem"

diff --git a/applications/CoSimulationApplication/tests/mpm_fem_beam/ParticleMaterials.json b/applications/CoSimulationApplication/tests/mpm_fem_beam/ParticleMaterials.json
@@ -7,11 +7,11 @@
                 "name" : "HyperElasticNeoHookeanPlaneStrain2DLaw"
             },
             "Variables"        : {
-                "THICKNESS"     : 1.0,
-                "PARTICLES_PER_ELEMENT" : 4,
-                "DENSITY"       : 1000.0,
-                "YOUNG_MODULUS" : 90000000.0,
-                "POISSON_RATIO" : 0
+                "THICKNESS"                     : 1.0,
+                "MATERIAL_POINTS_PER_ELEMENT"   : 4,
+                "DENSITY"                       : 1000.0,
+                "YOUNG_MODULUS"                 : 90000000.0,
+                "POISSON_RATIO"                 : 0
             },
             "Tables"           : {}
         }

diff --git a/applications/CoSimulationApplication/tests/mpm_fem_beam/ProjectParametersMPM.json b/applications/CoSimulationApplication/tests/mpm_fem_beam/ProjectParametersMPM.json
@@ -47,15 +47,15 @@
             "kratos_module" : "KratosMultiphysics.MPMApplication",
             "Parameters"    : {
                 "model_part_name" : "Background_Grid.INTERFACE_coupling_to_fem",
-                "particles_per_condition" : 7,
+                "material_points_per_condition" : 7,
                 "penalty_factor"  : 900000000.0,
                 "constrained"     : "fixed"
             }
         },{
-            "python_module"   : "particle_from_json_check_result_process",
+            "python_module"   : "mpm_from_json_check_result_process",
             "kratos_module" : "KratosMultiphysics.MPMApplication",
             "help"                  : "",
-            "process_name"          : "ParticleFromJsonCheckResultProcess",
+            "process_name"          : "MPMFromJsonCheckResultProcess",
             "Parameters"            : {
                 "check_variables"  : ["MP_DISPLACEMENT"],
                 "input_file_name"  : "mpm_fem_beam/cosim_mpm_fem_beam_particle_results.json",
@@ -65,9 +65,9 @@
             }
         }],
         "gravity"                  : [{
-            "python_module" : "assign_gravity_to_particle_process",
+            "python_module" : "assign_gravity_to_material_point_process",
             "kratos_module" : "KratosMultiphysics.MPMApplication",
-            "process_name"  : "AssignGravityToParticleProcess",
+            "process_name"  : "AssignGravityToMaterialPointProcess",
             "Parameters"    : {
                 "model_part_name" : "MPM_Material",
                 "variable_name"   : "MP_VOLUME_ACCELERATION",
@@ -78,10 +78,10 @@
         }]
     },
     "print_output_process" : [{
-        "python_module"   : "particle_json_output_process",
+        "python_module"   : "mpm_json_output_process",
         "kratos_module"   : "KratosMultiphysics.MPMApplication",
         "help"                  : "",
-        "process_name"          : "ParticleJsonOutputProcess",
+        "process_name"          : "MPMJsonOutputProcess",
         "Parameters"            : {
             "gauss_points_output_variables"  : ["MP_DISPLACEMENT"],
             "output_file_name"  : "mpm_fem_beam/cosim_mpm_fem_beam_particle_results.json",

diff --git a/applications/CoSimulationApplication/tests/mpm_fem_beam/cosim_mpm_fem_beam_parameters.json b/applications/CoSimulationApplication/tests/mpm_fem_beam/cosim_mpm_fem_beam_parameters.json
@@ -83,7 +83,7 @@
         {
             "particle":
             {
-                "type" : "solver_wrappers.kratos.particle_mechanics_dirichlet_wrapper",
+                "type" : "solver_wrappers.kratos.mpm_dirichlet_wrapper",
                 "solver_wrapper_settings" : {
                     "input_file"  : "mpm_fem_beam/ProjectParametersMPM",
                     "interface_model_part_name": "MPM_Material.INTERFACE_coupling_to_fem"

diff --git a/applications/MPMApplication/python_scripts/apply_mpm_slip_boundary_process.py b/applications/MPMApplication/python_scripts/apply_mpm_slip_boundary_process.py
@@ -14,7 +14,6 @@ def __init__(self, Model, settings ):
         default_parameters = KratosMultiphysics.Parameters( """
             {
                 "model_part_name"           :"PLEASE_CHOOSE_MODEL_PART_NAME",
-                "mesh_id"                   : 0,
                 "friction_coefficient"      : 0,
                 "tangential_penalty_factor" : 0,
                 "option"                    : "",

diff --git a/applications/MPMApplication/python_scripts/assign_gravity_to_material_point_process.py b/applications/MPMApplication/python_scripts/assign_gravity_to_material_point_process.py
@@ -13,7 +13,6 @@ def __init__(self, Model, settings ):
 
         default_settings = KratosMultiphysics.Parameters("""
             {
-                "mesh_id"              : 0,
                 "model_part_name"      : "please_specify_model_part_name",
                 "variable_name"        : "MP_VOLUME_ACCELERATION",
                 "modulus"              : 1.0,

diff --git a/...ations/MPMApplication/python_scripts/assign_initial_velocity_to_material_point_process.py b/...ations/MPMApplication/python_scripts/assign_initial_velocity_to_material_point_process.py
@@ -13,7 +13,6 @@ def __init__(self, Model, settings ):
 
         default_settings = KratosMultiphysics.Parameters("""
             {
-                "mesh_id"              : 0,
                 "model_part_name"      : "please_specify_model_part_name",
                 "variable_name"        : "MP_VELOCITY",
                 "modulus"              : 1.0,

diff --git a/...lication/tests/beam_tests/cantilever_beam/particle_point_load_2D_tri_test_parameters.json b/...lication/tests/beam_tests/cantilever_beam/particle_point_load_2D_tri_test_parameters.json
@@ -51,9 +51,9 @@
             }
         }],
         "gravity"                  : [{
-            "python_module" : "assign_gravity_to_particle_process",
+            "python_module" : "assign_gravity_to_material_point_process",
             "kratos_module" : "KratosMultiphysics.MPMApplication",
-            "process_name"  : "AssignGravityToParticleProcess",
+            "process_name"  : "AssignGravityToMaterialPointProcess",
             "Parameters"    : {
                 "model_part_name" : "MPM_Material",
                 "variable_name"   : "MP_VOLUME_ACCELERATION",

diff --git a/...ests/dynamic_UP_hyperelastic_cantilever_test/dynamic_UP_hyperelastic_test_parameters.json b/...ests/dynamic_UP_hyperelastic_cantilever_test/dynamic_UP_hyperelastic_test_parameters.json
@@ -54,9 +54,9 @@
         }],
         "loads_process_list"       : [],
         "list_other_processes"     : [{
-            "python_module"   : "particle_from_json_check_result_process",
+            "python_module"   : "mpm_from_json_check_result_process",
             "kratos_module"   : "KratosMultiphysics.MPMApplication",
-            "process_name"          : "ParticleFromJsonCheckResultProcess",
+            "process_name"          : "MPMFromJsonCheckResultProcess",
             "Parameters"            : {
                 "check_variables"  : ["MP_DISPLACEMENT","MP_PRESSURE"],
                 "input_file_name"  : "beam_tests/dynamic_UP_hyperelastic_cantilever_test/dynamic_UP_hyperelastic_test_results.json",
@@ -65,9 +65,9 @@
             }
         }],
         "gravity"                  : [{
-            "python_module" : "assign_gravity_to_particle_process",
+            "python_module" : "assign_gravity_to_material_point_process",
             "kratos_module" : "KratosMultiphysics.MPMApplication",
-            "process_name"  : "AssignGravityToParticleProcess",
+            "process_name"  : "AssignGravityToMaterialPointProcess",
             "Parameters"    : {
                 "model_part_name" : "MPM_Material",
                 "variable_name"   : "MP_VOLUME_ACCELERATION",
@@ -77,15 +77,15 @@
         }]
     },
     "print_output_process" : [{
-       "python_module"   : "particle_json_output_process",
+       "python_module"   : "mpm_json_output_process",
        "kratos_module"   : "KratosMultiphysics.MPMApplication",
-       "process_name"          : "ParticleJsonOutputProcess",
+       "process_name"          : "MPMJsonOutputProcess",
        "Parameters"            : {
           "gauss_points_output_variables"  : ["MP_DISPLACEMENT","MP_PRESSURE"],
           "output_file_name"  : "beam_tests/dynamic_UP_hyperelastic_cantilever_test/dynamic_UP_hyperelastic_test_results.json",
           "model_part_name"   : "MPM_Material",
           "time_frequency"    : 0.05
        }
     }],
-    "analysis_stage"   : "KratosMultiphysics.MPMApplication.particle_mechanics_analysis"
+    "analysis_stage"   : "KratosMultiphysics.MPMApplication.mpm_analysis"
 }
diff --git a/...sts/beam_tests/dynamic_cantilever/dynamic_cantilever_consistent_mass_test_parameters.json b/...sts/beam_tests/dynamic_cantilever/dynamic_cantilever_consistent_mass_test_parameters.json
@@ -53,10 +53,10 @@
         }],
         "loads_process_list"       : [],
         "list_other_processes"     : [{
-            "python_module"   : "particle_from_json_check_result_process",
+            "python_module"   : "mpm_from_json_check_result_process",
             "kratos_module" : "KratosMultiphysics.MPMApplication",
             "help"                  : "",
-            "process_name"          : "ParticleFromJsonCheckResultProcess",
+            "process_name"          : "MPMFromJsonCheckResultProcess",
             "Parameters"            : {
                 "check_variables"  : ["MP_VELOCITY","MP_DISPLACEMENT","MP_VOLUME"],
                 "input_file_name"  : "beam_tests/dynamic_cantilever/dynamic_cantilever_consistent_mass_test_results.json",
@@ -65,9 +65,9 @@
             }
         }],
         "gravity"                  : [{
-            "python_module" : "assign_gravity_to_particle_process",
+            "python_module" : "assign_gravity_to_material_point_process",
             "kratos_module" : "KratosMultiphysics.MPMApplication",
-            "process_name"  : "AssignGravityToParticleProcess",
+            "process_name"  : "AssignGravityToMaterialPointProcess",
             "Parameters"    : {
                 "model_part_name" : "MPM_Material",
                 "variable_name"   : "MP_VOLUME_ACCELERATION",
@@ -77,10 +77,10 @@
         }]
     },
 		"print_output_process" : [{
-        "python_module"   : "particle_json_output_process",
+        "python_module"   : "mpm_json_output_process",
         "kratos_module" : "KratosMultiphysics.MPMApplication",
         "help"                  : "",
-        "process_name"          : "ParticleJsonOutputProcess",
+        "process_name"          : "MPMJsonOutputProcess",
         "Parameters"            : {
             "gauss_points_output_variables" : ["MP_VELOCITY","MP_DISPLACEMENT","MP_VOLUME"],
             "output_file_name"              : "beam_tests/dynamic_cantilever/dynamic_cantilever_consistent_mass_test_results.json",

diff --git a/...m_tests/hyperelastic_cantilever_beam/linear_self_weight_load_2D_quad_test_parameters.json b/...m_tests/hyperelastic_cantilever_beam/linear_self_weight_load_2D_quad_test_parameters.json
@@ -49,9 +49,9 @@
             }
         }],
         "gravity"                  : [{
-            "python_module" : "assign_gravity_to_particle_process",
+            "python_module" : "assign_gravity_to_material_point_process",
             "kratos_module" : "KratosMultiphysics.MPMApplication",
-            "process_name"  : "AssignGravityToParticleProcess",
+            "process_name"  : "AssignGravityToMaterialPointProcess",
             "Parameters"    : {
                 "model_part_name" : "MPM_Material",
                 "variable_name"   : "MP_VOLUME_ACCELERATION",

diff --git a/..._tests/hyperelastic_cantilever_beam/penalty_self_weight_load_2D_quad_test_parameters.json b/..._tests/hyperelastic_cantilever_beam/penalty_self_weight_load_2D_quad_test_parameters.json
@@ -40,9 +40,9 @@
     "processes"        : {
         "constraints_process_list" : [],
         "gravity"                  : [{
-            "python_module" : "assign_gravity_to_particle_process",
+            "python_module" : "assign_gravity_to_material_point_process",
             "kratos_module" : "KratosMultiphysics.MPMApplication",
-            "process_name"  : "AssignGravityToParticleProcess",
+            "process_name"  : "AssignGravityToMaterialPointProcess",
             "Parameters"    : {
                 "model_part_name" : "MPM_Material",
                 "variable_name"   : "MP_VOLUME_ACCELERATION",

diff --git a/...sts/beam_tests/hyperelastic_cantilever_beam/self_weight_load_2D_quad_test_parameters.json b/...sts/beam_tests/hyperelastic_cantilever_beam/self_weight_load_2D_quad_test_parameters.json
@@ -49,9 +49,9 @@
             }
         }],
         "gravity"                  : [{
-            "python_module" : "assign_gravity_to_particle_process",
+            "python_module" : "assign_gravity_to_material_point_process",
             "kratos_module" : "KratosMultiphysics.MPMApplication",
-            "process_name"  : "AssignGravityToParticleProcess",
+            "process_name"  : "AssignGravityToMaterialPointProcess",
             "Parameters"    : {
                 "model_part_name" : "MPM_Material",
                 "variable_name"   : "MP_VOLUME_ACCELERATION",

diff --git a/applications/MPMApplication/tests/cl_tests/fluid_cl/newtonian_fluid_test_parameters.json b/applications/MPMApplication/tests/cl_tests/fluid_cl/newtonian_fluid_test_parameters.json
@@ -66,9 +66,9 @@
         }],
         "loads_process_list"       : [],
         "list_other_processes"     : [{
-            "python_module"   : "particle_from_json_check_result_process",
+            "python_module"   : "mpm_from_json_check_result_process",
             "kratos_module"   : "KratosMultiphysics.MPMApplication",
-            "process_name"          : "ParticleFromJsonCheckResultProcess",
+            "process_name"          : "MPMFromJsonCheckResultProcess",
             "Parameters"            : {
                 "check_variables"  : ["MP_DISPLACEMENT"],
                 "input_file_name"  : "cl_tests/fluid_cl/newtonian_fluid_test_results.json",
@@ -77,9 +77,9 @@
             }
         }],
         "gravity"                  : [{
-            "python_module" : "assign_gravity_to_particle_process",
+            "python_module" : "assign_gravity_to_material_point_process",
             "kratos_module" : "KratosMultiphysics.MPMApplication",
-            "process_name"  : "AssignGravityToParticleProcess",
+            "process_name"  : "AssignGravityToMaterialPointProcess",
             "Parameters"    : {
                 "model_part_name" : "MPM_Material",
                 "variable_name"   : "MP_VOLUME_ACCELERATION",
@@ -89,15 +89,15 @@
         }]
     },
     "print_output_process" : [{
-       "python_module"   : "particle_json_output_process",
+       "python_module"   : "mpm_json_output_process",
        "kratos_module" : "KratosMultiphysics.MPMApplication",
-       "process_name"          : "ParticleJsonOutputProcess",
+       "process_name"          : "MPMJsonOutputProcess",
        "Parameters"            : {
           "gauss_points_output_variables"  : ["MP_DISPLACEMENT"],
           "output_file_name"  : "cl_tests/fluid_cl/newtonian_fluid_test_results.json",
           "model_part_name"   : "MPM_Material",
           "time_frequency"    : 0.1
        }
     }],
-    "analysis_stage"   : "KratosMultiphysics.MPMApplication.particle_mechanics_analysis"
+    "analysis_stage"   : "KratosMultiphysics.MPMApplication.mpm_analysis"
 }
diff --git a/...ations/MPMApplication/tests/cl_tests/solid_cl/linear_elastic_3D_hexa_test_parameters.json b/...ations/MPMApplication/tests/cl_tests/solid_cl/linear_elastic_3D_hexa_test_parameters.json
@@ -59,10 +59,10 @@
             }
         }],
         "list_other_processes": [{
-            "python_module"   : "particle_from_json_check_result_process",
+            "python_module"   : "mpm_from_json_check_result_process",
             "kratos_module" : "KratosMultiphysics.MPMApplication",
             "help"                  : "",
-            "process_name"          : "ParticleFromJsonCheckResultProcess",
+            "process_name"          : "MPMFromJsonCheckResultProcess",
             "Parameters"            : {
                 "check_variables"  : ["MP_CAUCHY_STRESS_VECTOR","MP_ALMANSI_STRAIN_VECTOR"],
                 "input_file_name"  : "cl_tests/solid_cl/linear_elastic_3D_hexa_test_results.json",
@@ -72,10 +72,10 @@
         }]
     },
     "print_output_process" : [{
-        "python_module"   : "particle_json_output_process",
+        "python_module"   : "mpm_json_output_process",
         "kratos_module" : "KratosMultiphysics.MPMApplication",
         "help"                  : "",
-        "process_name"          : "ParticleJsonOutputProcess",
+        "process_name"          : "MPMJsonOutputProcess",
         "Parameters"            : {
             "gauss_points_output_variables" : ["MP_CAUCHY_STRESS_VECTOR","MP_ALMANSI_STRAIN_VECTOR"],
             "output_file_name"              : "cl_tests/solid_cl/linear_elastic_3D_hexa_test_results.json",

diff --git a/...licit_tests/axisymmetric_disk/quad_compressible_explicit_axisym_disk_test_parameters.json b/...licit_tests/axisymmetric_disk/quad_compressible_explicit_axisym_disk_test_parameters.json
@@ -55,9 +55,9 @@
         }],
         "loads_process_list"       : [],
 		"gravity"                  : [{
-            "python_module" : "assign_gravity_to_particle_process",
+            "python_module" : "assign_gravity_to_material_point_process",
             "kratos_module" : "KratosMultiphysics.MPMApplication",
-            "process_name"  : "AssignGravityToParticleProcess",
+            "process_name"  : "AssignGravityToMaterialPointProcess",
             "Parameters"    : {
                 "model_part_name" : "MPM_Material",
                 "variable_name"   : "MP_VOLUME_ACCELERATION",
@@ -66,10 +66,10 @@
             }
         }],
         "list_other_processes"     : [{
-            "python_module"   : "particle_from_json_check_result_process",
+            "python_module"   : "mpm_from_json_check_result_process",
             "kratos_module" : "KratosMultiphysics.MPMApplication",
             "help"                  : "",
-            "process_name"          : "ParticleFromJsonCheckResultProcess",
+            "process_name"          : "MPMFromJsonCheckResultProcess",
             "Parameters"            : {
                 "check_variables"  : ["MP_VELOCITY","MP_DISPLACEMENT","MP_VOLUME"],
                 "input_file_name"  : "explicit_tests/axisymmetric_disk/quad_compressible_explicit_axisym_disk_results.json",
@@ -79,10 +79,10 @@
         }]
     },
 		"print_output_process" : [{
-        "python_module"   : "particle_json_output_process",
+        "python_module"   : "mpm_json_output_process",
         "kratos_module" : "KratosMultiphysics.MPMApplication",
         "help"                  : "",
-        "process_name"          : "ParticleJsonOutputProcess",
+        "process_name"          : "MPMJsonOutputProcess",
         "Parameters"            : {
             "gauss_points_output_variables" : ["MP_VELOCITY","MP_DISPLACEMENT","MP_VOLUME"],
             "output_file_name"              : "explicit_tests/axisymmetric_disk/quad_compressible_explicit_axisym_disk_results.json",