Skip to content

Commit 84acb28

Browse files
jginternationaljginternational
committed
Merge branch 'master' into fsi-geoms-migration
2 parents 63a2dcb + 862965a commit 84acb28

15 files changed

Lines changed: 92 additions & 64 deletions

File tree

‎kratos.gid/apps/ConjugateHeatTransfer/examples/BFS.tcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ proc ::ConjugateHeatTransfer::examples::BFS::TreeAssignation2D {args} {
221221
# Solid parts
222222
set parts [spdAux::getRoute "CNVDFFParts"]
223223
set fluidNode [customlib::AddConditionGroupOnXPath $parts Heating]
224-
set props [list Element EulerianConvDiff$nd DENSITY 0.0 CONDUCTIVITY 10 SPECIFIC_HEAT 0.0]
224+
set props [list Element EulerianConvDiff$nd DENSITY 0.0 CONDUCTIVITY 10.0 SPECIFIC_HEAT 0.0]
225225
spdAux::SetValuesOnBaseNode $fluidNode $props
226226

227227
# Solid thermal initial conditions

‎kratos.gid/apps/Fluid/xml/Elements.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,34 @@
104104
</outputs>
105105
</ElementItem>
106106

107+
<ElementItem n="QSVMS2DAxisymmetric" pn="Quasi-static VMS (axisymmetric)" ImplementedInFile="axisymmetric_navier_stokes.cpp" ImplementedInApplication="FluidDynamicsApplication" FormulationElementType="axisymmetric_navier_stokes"
108+
MinimumKratosVersion="9000" WorkingSpaceDimension="2D" LocalSpaceDimension="2" RequiresLocalAxes="False"
109+
LargeDeformation="False" ElementType="Fluid" help="This element implements a VMS stabilized incompressible Navier-Stokes monolithic formulation in cylindrical coordinates. Revolution axis is assumed to be aligned with the x-axis.">
110+
<!--here we could add a list of all of the possible geometries-->
111+
<TopologyFeatures>
112+
<item GeometryType="Triangle" nodes="3" KratosName="Element2D3N"/>
113+
<item GeometryType="Quadrilateral" nodes="4" KratosName="Element2D4N"/>
114+
</TopologyFeatures>
115+
<!-- here we add the block of features which we require from the constitutive law-->
116+
117+
<ConstitutiveLaw_FilterFeatures>
118+
<filter field="App" value="Fluid"/>
119+
<filter field="ElementCompressibility" value="Incompressible"/>
120+
</ConstitutiveLaw_FilterFeatures>
121+
122+
<!--define list of NodalConditions-->
123+
<NodalConditions>
124+
<NodalCondition n="VELOCITY"/>
125+
<NodalCondition n="PRESSURE"/>
126+
</NodalConditions>
127+
128+
<inputs>
129+
</inputs>
130+
131+
<outputs>
132+
</outputs>
133+
</ElementItem>
134+
107135
<ElementItem n="DVMS2D" pn="Dynamic VMS" ImplementedInFile="d_vms.cpp" ImplementedInApplication="FluidDynamicsApplication" FormulationElementType="dvms"
108136
MinimumKratosVersion="9000" WorkingSpaceDimension="2D" LocalSpaceDimension="2" RequiresLocalAxes="False"
109137
LargeDeformation="False" ElementType="Fluid" help="This element implements a dynamic Variational MultiScale (VMS) monolithic element">

‎kratos.gid/apps/Fluid/xml/Strategies.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<scheme n="bdf2" pn="BDF2" help="2nd order Backward Differenctiation Formula (BDF2) scheme for CFD problems." >
5151
<parameter_list></parameter_list>
5252
<element_filters>
53-
<filter field="n" value="QSVMS2D,QSVMS3D,DVMS2D,DVMS3D,FIC2D,FIC3D,WeaklyCompressible2D,WeaklyCompressible3D,P2P12D,P2P13D"/>
53+
<filter field="n" value="QSVMS2D,QSVMS2DAxisymmetric,QSVMS3D,DVMS2D,DVMS3D,FIC2D,FIC3D,WeaklyCompressible2D,WeaklyCompressible3D,P2P12D,P2P13D"/>
5454
</element_filters>
5555
</scheme>
5656
</schemes>

‎kratos.gid/apps/MPM/app.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"name": "MPM",
44
"prefix": "MPM",
55
"themed": false,
6-
"kratos_name": "ParticleMechanicsApplication",
6+
"kratos_name": "MPMApplication",
77
"python_packages": [
8-
"KratosParticleMechanicsApplication",
8+
"KratosMPMApplication",
99
"KratosLinearSolversApplication"
1010
],
1111
"dimensions": [

‎kratos.gid/apps/MPM/examples/CantileverBeam.tcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ proc ::MPM::examples::CantileverBeam::TreeAssignation2D {args} {
127127
set mpm_solid_part [customlib::AddConditionGroupOnXPath $mpm_solid_parts_route HyperelasticBeam]
128128
$mpm_solid_part setAttribute ov surface
129129
set constitutive_law_name "HyperElasticNeoHookeanPlaneStrain${nd}Law"
130-
set props [list Element MPMUpdatedLagrangian$nd ConstitutiveLaw $constitutive_law_name Material HyperelasticBeam DENSITY 1000 YOUNG_MODULUS 90000000 POISSON_RATIO 0.49 THICKNESS 0.1 PARTICLES_PER_ELEMENT 6]
130+
set props [list Element MPMUpdatedLagrangian$nd ConstitutiveLaw $constitutive_law_name Material HyperelasticBeam DENSITY 1000 YOUNG_MODULUS 90000000 POISSON_RATIO 0.49 THICKNESS 0.1 MATERIAL_POINTS_PER_ELEMENT 6]
131131
spdAux::SetValuesOnBaseNode $mpm_solid_part $props
132132

133133
## Grid

‎kratos.gid/apps/MPM/examples/FallingSandBall.tcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ proc ::MPM::examples::FallingSandBall::TreeAssignation2D {args} {
114114
set mpm_solid_part [customlib::AddConditionGroupOnXPath $mpm_solid_parts_route Sand]
115115
$mpm_solid_part setAttribute ov surface
116116
set constitutive_law_name "HenckyMCPlasticPlaneStrain${nd}Law"
117-
set props [list Element MPMUpdatedLagrangian$nd ConstitutiveLaw $constitutive_law_name Material Sand DENSITY 2300 YOUNG_MODULUS 6e6 POISSON_RATIO 0.3 THICKNESS 0.1 PARTICLES_PER_ELEMENT 6]
117+
set props [list Element MPMUpdatedLagrangian$nd ConstitutiveLaw $constitutive_law_name Material Sand DENSITY 2300 YOUNG_MODULUS 6e6 POISSON_RATIO 0.3 THICKNESS 0.1 MATERIAL_POINTS_PER_ELEMENT 6]
118118
spdAux::SetValuesOnBaseNode $mpm_solid_part $props
119119

120120
## Grid

‎kratos.gid/apps/MPM/examples/GranularFlow.tcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ proc ::MPM::examples::GranularFlow::TreeAssignation2D {args} {
127127
set mpm_solid_part [customlib::AddConditionGroupOnXPath $mpm_solid_parts_route GranularMaterial]
128128
$mpm_solid_part setAttribute ov surface
129129
set constitutive_law_name "HenckyMCPlasticPlaneStrain${nd}Law"
130-
set props [list Element MPMUpdatedLagrangian$nd ConstitutiveLaw $constitutive_law_name Material GranularMaterial DENSITY 2650 YOUNG_MODULUS 840000 POISSON_RATIO 0.3 INTERNAL_FRICTION_ANGLE 19.8 THICKNESS 0.1 PARTICLES_PER_ELEMENT 3]
130+
set props [list Element MPMUpdatedLagrangian$nd ConstitutiveLaw $constitutive_law_name Material GranularMaterial DENSITY 2650 YOUNG_MODULUS 840000 POISSON_RATIO 0.3 INTERNAL_FRICTION_ANGLE 19.8 THICKNESS 0.1 MATERIAL_POINTS_PER_ELEMENT 3]
131131
spdAux::SetValuesOnBaseNode $mpm_solid_part $props
132132

133133
## Grid

‎kratos.gid/apps/MPM/examples/StaticCantileverBeam.tcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ proc ::MPM::examples::StaticCantileverBeam::TreeAssignation2D {args} {
132132
set mpm_solid_part [customlib::AddConditionGroupOnXPath $mpm_solid_parts_route LinearElasticBeam]
133133
$mpm_solid_part setAttribute ov surface
134134
set constitutive_law_name "LinearElasticIsotropicPlaneStrain{nd}Law"
135-
set props [list Element MPMUpdatedLagrangian$nd ConstitutiveLaw $constitutive_law_name Material LinearElasticBeam DENSITY 7850 YOUNG_MODULUS 206.9e9 POISSON_RATIO 0.29 THICKNESS 0.1 PARTICLES_PER_ELEMENT 6]
135+
set props [list Element MPMUpdatedLagrangian$nd ConstitutiveLaw $constitutive_law_name Material LinearElasticBeam DENSITY 7850 YOUNG_MODULUS 206.9e9 POISSON_RATIO 0.29 THICKNESS 0.1 MATERIAL_POINTS_PER_ELEMENT 6]
136136
spdAux::SetValuesOnBaseNode $mpm_solid_part $props
137137

138138
## Grid

‎kratos.gid/apps/MPM/write/writeProjectParameters.tcl‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ proc ::MPM::write::getParametersDict { } {
33
set project_parameters_dict [Structural::write::getParametersDict]
44

55
# Analysis stage field
6-
dict set project_parameters_dict analysis_stage "KratosMultiphysics.ParticleMechanicsApplication.particle_mechanics_analysis"
6+
dict set project_parameters_dict analysis_stage "KratosMultiphysics.MPMApplication.mpm_analysis"
77

88
# Quasi-static must be written as Quasi-static...
99
set solutiontype [write::getValue STSoluType]
@@ -98,9 +98,9 @@ proc ::MPM::write::getParametersDict { } {
9898
set activate_gravity [write::getValue ActivateGravity]
9999
if {$activate_gravity eq "On"} {
100100
set gravity_dict [dict create ]
101-
dict set gravity_dict python_module assign_gravity_to_particle_process
102-
dict set gravity_dict kratos_module "KratosMultiphysics.ParticleMechanicsApplication"
103-
dict set gravity_dict process_name AssignGravityToParticleProcess
101+
dict set gravity_dict python_module assign_gravity_to_material_point_process
102+
dict set gravity_dict kratos_module "KratosMultiphysics.MPMApplication"
103+
dict set gravity_dict process_name AssignGravityToMaterialPointProcess
104104
set gravity_parameters_dict [dict create ]
105105
dict set gravity_parameters_dict model_part_name MPM_Material
106106
dict set gravity_parameters_dict variable_name MP_VOLUME_ACCELERATION
@@ -156,9 +156,9 @@ proc ::MPM::write::GetOutputProcessesList { } {
156156

157157
set body_output_configuration_dict [lindex [dict get $project_parameters_dict output_processes gid_output] 0]
158158
set grid_output_configuration_dict [lindex [dict get $project_parameters_dict output_processes gid_output] 0]
159-
dict set body_output_configuration_dict python_module particle_gid_output_process
160-
dict set body_output_configuration_dict kratos_module KratosMultiphysics.ParticleMechanicsApplication
161-
dict set body_output_configuration_dict process_name ParticleMPMGiDOutputProcess
159+
dict set body_output_configuration_dict python_module mpm_gid_output_process
160+
dict set body_output_configuration_dict kratos_module KratosMultiphysics.MPMApplication
161+
dict set body_output_configuration_dict process_name MPMGiDOutputProcess
162162
dict set body_output_configuration_dict Parameters model_part_name MPM_Material
163163
dict set grid_output_configuration_dict Parameters model_part_name Background_Grid
164164
dict set body_output_configuration_dict Parameters output_name [dict get $project_parameters_dict solver_settings model_import_settings input_filename]
@@ -188,9 +188,9 @@ proc ::MPM::write::GetOutputProcessesList { } {
188188
set grid_output_configuration_dict [lindex [dict get $project_parameters_dict output_processes vtk_output] 0]
189189

190190

191-
dict set body_output_configuration_dict python_module particle_vtk_output_process
192-
dict set body_output_configuration_dict kratos_module KratosMultiphysics.ParticleMechanicsApplication
193-
dict set body_output_configuration_dict process_name ParticleVtkOutputProcess
191+
dict set body_output_configuration_dict python_module mpm_vtk_output_process
192+
dict set body_output_configuration_dict kratos_module KratosMultiphysics.MPMApplication
193+
dict set body_output_configuration_dict process_name MPMVtkOutputProcess
194194
dict set body_output_configuration_dict Parameters model_part_name MPM_Material
195195
dict unset body_output_configuration_dict Parameters nodal_data_value_variables
196196
dict unset body_output_configuration_dict Parameters element_data_value_variables

0 commit comments

Comments
 (0)