Skip to content

Commit 2e23659

Browse files
fixed typo, removed unused cdem proc
1 parent d8a2787 commit 2e23659

2 files changed

Lines changed: 14 additions & 32 deletions

File tree

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

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ proc CDEM::write::WriteWallGraphsFlag { } {
4747
set xp1 "[spdAux::getRoute [GetAttribute graphs_un]]/group"
4848
#set xp1 "[spdAux::getRoute [GetAttribute conditions_un]]/condition\[@n = 'DEM-CustomSmp'\]/group"
4949
foreach group [[customlib::GetBaseRoot] selectNodes $xp1] {
50-
set groupid [$group @n]
51-
write::WriteString "Begin SubModelPart $groupid \/\/ Custom SubModelPart. Group name: $groupid"
52-
write::WriteString "Begin SubModelPartData // DEM-FEM-Wall. Group name: $groupid"
53-
write::WriteString "FORCE_INTEGRATION_GROUP 1"
54-
write::WriteString "End SubModelPartData"
55-
write::WriteString "Begin SubModelPartNodes"
56-
GiD_WriteCalculationFile nodes -sorted [dict create [write::GetWriteGroupName $groupid] [subst "%10i\n"]]
57-
write::WriteString "End SubModelPartNodes"
58-
write::WriteString "End SubModelPart"
59-
write::WriteString ""
60-
}
50+
set groupid [$group @n]
51+
write::WriteString "Begin SubModelPart $groupid \/\/ Custom SubModelPart. Group name: $groupid"
52+
write::WriteString "Begin SubModelPartData // DEM-FEM-Wall. Group name: $groupid"
53+
write::WriteString "FORCE_INTEGRATION_GROUP 1"
54+
write::WriteString "End SubModelPartData"
55+
write::WriteString "Begin SubModelPartNodes"
56+
GiD_WriteCalculationFile nodes -sorted [dict create [write::GetWriteGroupName $groupid] [subst "%10i\n"]]
57+
write::WriteString "End SubModelPartNodes"
58+
write::WriteString "End SubModelPart"
59+
write::WriteString ""
60+
}
6161
}
6262

6363
proc CDEM::write::GetNodesForGraphs { } {
@@ -66,26 +66,8 @@ proc CDEM::write::GetNodesForGraphs { } {
6666
#set xp1 "[spdAux::getRoute [GetAttribute graphs_un]]/condition\[@n = 'Graphs'\]/group"
6767
set xp1 "[spdAux::getRoute [GetAttribute graphs_un]]/group"
6868
foreach group [[customlib::GetBaseRoot] selectNodes $xp1] {
69-
set groupid [$group @n]
70-
lappend groups [write::GetWriteGroupName $groupid]
69+
set groupid [$group @n]
70+
lappend groups [write::GetWriteGroupName $groupid]
7171
}
7272
return $groups
73-
}
74-
75-
# TODO: SHOULD NO LONGER BE REQUIRED SINCE NEW PROC IN DEM::
76-
proc CDEM::write::writeConditions { wall_properties } {
77-
foreach group [DEM::write::GetWallsGroups] {
78-
set mid [dict get $wall_properties $group]
79-
if {$::Model::SpatialDimension eq "2D"} {
80-
set rigid_type "RigidEdge3D2N"
81-
set format [write::GetFormatDict $group $mid 2]
82-
} else {
83-
set rigid_type "RigidFace3D3N"
84-
set format [write::GetFormatDict $group $mid 3]
85-
}
86-
write::WriteString "Begin Conditions $rigid_type // GUI DEM-FEM-Wall group identifier: $group"
87-
GiD_WriteCalculationFile connectivities $format
88-
write::WriteString "End Conditions"
89-
write::WriteString ""
90-
}
9173
}

kratos.gid/apps/DEM/xml/Processes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<parameter n="PoissonRatio" parent="false" pn="Poisson Ratio" v="0.25" show_in_window="0"/>
125125
</parameter>
126126
<parameter n="MaterialTest" parent="true" pn="Material testing" v="false" type="bool" help="Define the loading wall for material testing" show_in_window="0">
127-
<parameter n="DefineTopBot" parent="true" pn="Set wall as" type="combo" v="Pressure plate" values="Top,Bottom" pvalues="Pressure plate,Base support" help="Check Y-axis is the loading axis" show_in_window="0"/>
127+
<parameter n="DefineTopBot" parent="true" pn="Set wall as" type="combo" v="Pressure plate" values="top,bottom" pvalues="Pressure plate,Base support" help="Check Y-axis is the loading axis" show_in_window="0"/>
128128
</parameter>
129129
</parameter>
130130
</inputs>

0 commit comments

Comments
 (0)