Skip to content

Commit ceb69ff

Browse files
minor dem fixes
1 parent 64b25c7 commit ceb69ff

4 files changed

Lines changed: 17 additions & 16 deletions

File tree

kratos.gid/apps/DEM/examples/SpheresDrop.tcl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ proc ::DEM::examples::SpheresDrop::AssignToTree { } {
6464
set walls "$DEMConditions/condition\[@n='DEM-FEM-Wall'\]"
6565
set wallsNode [customlib::AddConditionGroupOnXPath $walls Floor]
6666
$wallsNode setAttribute ov surface
67-
67+
6868
# Inlet
6969
set DEMInlet "$DEMConditions/condition\[@n='Inlet'\]"
7070
set inletNode [customlib::AddConditionGroupOnXPath $DEMInlet "Inlet"]
@@ -82,9 +82,9 @@ proc ::DEM::examples::SpheresDrop::AssignToTree { } {
8282
spdAux::SetValuesOnBaseNode $inletNode $props
8383

8484
# DEM custom submodelpart
85-
set custom_dem "$DEMConditions/condition\[@n='DEM-CustomSmp'\]"
86-
set customNode [customlib::AddConditionGroupOnXPath $custom_dem Body]
87-
$customNode setAttribute ov volume
85+
# set custom_dem "$DEMConditions/condition\[@n='DEM-CustomSmp'\]"
86+
# set customNode [customlib::AddConditionGroupOnXPath $custom_dem Body]
87+
# $customNode setAttribute ov volume
8888

8989
# General data
9090
# Time parameters

kratos.gid/apps/DEM/start.tcl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace eval ::DEM {
22
Kratos::AddNamespace [namespace current]
3-
3+
44
# Variable declaration
55
variable dir
66
variable _app
@@ -26,14 +26,15 @@ proc ::DEM::Init { app } {
2626

2727
proc ::DEM::CustomToolbarItems { } {
2828
variable dir
29-
29+
3030
Kratos::ToolbarAddItem "MaterialRelations" "material-relation.png" [list -np- DEM::xml::ShowMaterialRelationWindow] [= "Material relations"]
3131
}
3232

3333
proc ::DEM::BeforeMeshGeneration {elementsize} {
3434
set root [customlib::GetBaseRoot]
3535
set xp1 "[spdAux::getRoute DEMParts]/group"
36-
foreach group [concat [$root selectNodes $xp1] [DEM::write::GetDEMGroupsCustomSubmodelpart]] {
36+
# [concat [$root selectNodes $xp1] [DEM::write::GetDEMGroupsCustomSubmodelpart]]
37+
foreach group [$root selectNodes $xp1] {
3738
set groupid [$group @n]
3839
set advanced_meshing_features [write::getValueByNode [$group selectNodes "./value\[@n='AdvancedMeshingFeatures'\]"]]
3940
if {![write::isBooleanTrue $advanced_meshing_features]} {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,8 @@
398398
<Process n="CustomSMP-Process" pn="Define custom submodelparts" python_module="assign_vector_by_direction_to_condition_process" kratos_module="KratosMultiphysics" check="DirectorVectorNonZero direction">
399399
<inputs>
400400
<parameter n="WhatMdpa" pn="Destination mdpa" type="combo" v="DEM" values="DEM,DEM-Inlet,FEM" help="Decide what mpda file you want this SubModelPart to be added to"/>
401-
<parameter n="Element" pn="Element" type="combo" help=""/>
402-
<parameter n="AdvancedMeshingFeatures" pn="AdvancedMeshingFeatures" type="combo" v="0" values="1,0" help="" />
401+
<!-- <parameter n="Element" pn="Element" type="combo" help=""/>
402+
<parameter n="AdvancedMeshingFeatures" pn="AdvancedMeshingFeatures" type="combo" v="0" values="1,0" help="" /> -->
403403
</inputs>
404404
</Process>
405405

kratos.gid/apps/DEM/xml/XmlController.tcl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace eval ::DEM::xml {
22
namespace path ::DEM
33
Kratos::AddNamespace [namespace current]
4-
4+
55
variable dir
66
}
77

@@ -36,17 +36,17 @@ proc ::DEM::xml::CustomTree { args } {
3636
}
3737
}
3838

39-
set custom_smp_xpath "[spdAux::getRoute DEMConditions]/condition\[@n='DEM-CustomSmp'\]/value\[@n='Element'\]"
40-
gid_groups_conds::setAttributes $custom_smp_xpath [list state hidden dict {[GetElements ElementType DEM]} ]
41-
set custom_smp_xpath "[spdAux::getRoute DEMConditions]/condition\[@n='DEM-CustomSmp'\]/value\[@n='AdvancedMeshingFeatures'\]"
42-
gid_groups_conds::setAttributes $custom_smp_xpath [list state hidden ]
39+
# set custom_smp_xpath "[spdAux::getRoute DEMConditions]/condition\[@n='DEM-CustomSmp'\]/value\[@n='Element'\]"
40+
# gid_groups_conds::setAttributes $custom_smp_xpath [list state hidden dict {[GetElements ElementType DEM]} ]
41+
# set custom_smp_xpath "[spdAux::getRoute DEMConditions]/condition\[@n='DEM-CustomSmp'\]/value\[@n='AdvancedMeshingFeatures'\]"
42+
# gid_groups_conds::setAttributes $custom_smp_xpath [list state hidden ]
4343

4444
# Inlet 2D or 3D special parameters
4545
set 3dinlet_xpath "[spdAux::getRoute DEMConditions]/condition\[@n='Inlet'\]/value\[@n='InletElementType'\]"
4646
gid_groups_conds::setAttributes $3dinlet_xpath [list values "SphericParticle3D,Cluster3D,SingleSphereCluster" ]
4747
set 2dinlet_xpath "[spdAux::getRoute DEMConditions]/condition\[@n='Inlet2D'\]/value\[@n='InletElementType'\]"
4848
gid_groups_conds::setAttributes $2dinlet_xpath [list values "CylinderParticle2D" ]
49-
49+
5050

5151
# spdAux::parseRoutes
5252
spdAux::processDynamicNodes [customlib::GetBaseRoot]
@@ -104,7 +104,7 @@ proc ::DEM::xml::InertiaType { args } {
104104
}
105105

106106
proc ::DEM::xml::injectMaterialRelations { basenode args } {
107-
107+
108108
set base [$basenode parent]
109109
set materials_relations [Model::GetMaterialRelations {*}$args]
110110
foreach mat $materials_relations {

0 commit comments

Comments
 (0)