Skip to content

Commit cd5ab67

Browse files
proc call depends on ActiveId
fixed
1 parent f7d2aa2 commit cd5ab67

2 files changed

Lines changed: 27 additions & 38 deletions

File tree

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,29 @@ proc CDEM::write::GetNodesForGraphs { } {
6969
lappend groups [write::GetWriteGroupName $groupid]
7070
}
7171
return $groups
72+
}
73+
74+
proc DEM::write::DefineMaterialTestConditions {group_node} {
75+
set material_analysis [write::getValue DEMTestMaterial Active]
76+
if {$material_analysis == "true"} {
77+
set is_material_test [write::getValueByNode [$group_node selectNodes "./value\[@n='MaterialTest'\]"]]
78+
if {$is_material_test == "true"} {
79+
set as_condition [write::getValueByNode [$group_node selectNodes "./value\[@n='DefineTopBot'\]"]]
80+
if {$as_condition eq "top"} {
81+
write::WriteString " TOP 1"
82+
write::WriteString " BOTTOM 0"
83+
} else {
84+
write::WriteString " TOP 0"
85+
write::WriteString " BOTTOM 1"}
86+
}
87+
} else {
88+
write::WriteString " TOP 0"
89+
write::WriteString " BOTTOM 0"}
90+
set GraphPrint [write::getValueByNode [$group_node selectNodes "./value\[@n='GraphPrint'\]"]]
91+
if {$GraphPrint == "true" || $material_analysis == "true"} {
92+
set GraphPrintval 1
93+
} else {
94+
set GraphPrintval 0
95+
}
96+
write::WriteString " FORCE_INTEGRATION_GROUP $GraphPrintval"
7297
}

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

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ proc DEM::write::writeWallConditionMeshes { } {
433433
write::WriteString " IS_GHOST $is_ghost"
434434
write::WriteString " IDENTIFIER [write::transformGroupName $group]"
435435

436-
DEM::write::DefineMaterialTestConditions $group_node
436+
DefineMaterialTestConditions $group_node
437437

438438
}
439439
write::WriteString " End SubModelPartData"
@@ -455,40 +455,4 @@ proc DEM::write::writeWallConditionMeshes { } {
455455
}
456456
}
457457

458-
proc DEM::write::DefineMaterialTestConditions {group_node} {
459-
if {[apps::getActiveAppId] eq "CDEM"} {
460-
set material_analysis [write::getValue DEMTestMaterial Active]
461-
if {$material_analysis == "true"} {
462-
set is_material_test [write::getValueByNode [$group_node selectNodes "./value\[@n='MaterialTest'\]"]]
463-
if {$is_material_test == "true"} {
464-
set as_condition [write::getValueByNode [$group_node selectNodes "./value\[@n='DefineTopBot'\]"]]
465-
if {$as_condition eq "top"} {
466-
write::WriteString " TOP 1"
467-
write::WriteString " BOTTOM 0"
468-
} else {
469-
write::WriteString " TOP 0"
470-
write::WriteString " BOTTOM 1"
471-
}
472-
}
473-
} else {
474-
write::WriteString " TOP 0"
475-
write::WriteString " BOTTOM 0"
476-
}
477-
478-
set GraphPrint [write::getValueByNode [$group_node selectNodes "./value\[@n='GraphPrint'\]"]]
479-
if {$GraphPrint == "true" || $material_analysis == "true"} {
480-
set GraphPrintval 1
481-
} else {
482-
set GraphPrintval 0
483-
}
484-
} else {
485-
486-
set GraphPrint [write::getValueByNode [$group_node selectNodes "./value\[@n='GraphPrint'\]"]]
487-
if {$GraphPrint == "true"} {
488-
set GraphPrintval 1
489-
} else {
490-
set GraphPrintval 0
491-
}
492-
}
493-
write::WriteString " FORCE_INTEGRATION_GROUP $GraphPrintval"
494-
}
458+
proc DEM::write::DefineMaterialTestConditions {group_node} {}

0 commit comments

Comments
 (0)