Skip to content

Commit f7d2aa2

Browse files
several fixes
1 parent f0f2b3b commit f7d2aa2

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

kratos.gid/apps/CDEM/write/writeMDPA_Parts.tcl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ proc DEM::write::WriteMDPAParts { } {
3131

3232
# SubmodelParts
3333
write::writePartSubModelPart
34-
if {$::Model::SpatialDimension eq "2D"} {DEM::write::writeDEMConditionMeshes2D
35-
} else {DEM::write::writeDEMConditionMeshes}
34+
DEM::write::writeDEMConditionMeshes
3635

3736
# CustomSubmodelParts
3837
#WriteWallCustomDEMSmp not required for dem.

kratos.gid/apps/CDEM/write/writeMDPA_Walls.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ proc DEM::write::WriteMDPAWalls { } {
1111
write::writeNodalCoordinatesOnGroups [GetNodesForGraphs]
1212

1313
# Nodal conditions and conditions
14-
CDEM::write::writeConditions $wall_properties
14+
DEM::write::writeConditions $wall_properties
1515

1616
# SubmodelParts
1717
DEM::write::writeWallConditionMeshes

kratos.gid/apps/DEM/write/writeMDPA_Parts.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ proc DEM::write::writeDEMConditionMeshes { } {
262262
write::WriteString "End SubModelPart"
263263
write::WriteString ""
264264
}
265-
} elseif {$cond eq "DEM-VelocityIC"} {
265+
} elseif {$cond eq "DEM-VelocityIC" || $cond eq "DEM-VelocityIC2D"} {
266266
set rigid_body_motion 0
267267
set cnd [Model::getCondition $cond]
268268
foreach group $group_list {

kratos.gid/apps/DEM/write/writeMDPA_Walls.tcl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,9 @@ proc DEM::write::GetNodesForGraphs { } {
137137
}
138138

139139
proc DEM::write::writeConditions { wall_properties } {
140-
141-
write::writeConditionsByGiDId DEMConditions DEM-FEM-Wall $wall_properties
140+
if {$::Model::SpatialDimension eq "2D"} {write::writeConditionsByGiDId DEMConditions DEM-FEM-Wall2D $wall_properties
141+
} else {write::writeConditionsByGiDId DEMConditions DEM-FEM-Wall $wall_properties
142+
}
142143
}
143144

144145

0 commit comments

Comments
 (0)