Skip to content

Commit 73d5671

Browse files
author
Miguel Angel
committed
Arranging DEM vs CDEM
1 parent 16cff57 commit 73d5671

6 files changed

Lines changed: 38 additions & 51 deletions

File tree

‎kratos.gid/apps/CDEM/xml/Conditions.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ConditionList>
3+
<ConditionItem n="DEM-Cohesive2D" pn="Bonded domains" Interval="False" ImplementedInApplication="DEMApplication" MinimumKratosVersion="9000" ProductionReady="ProductionReady" WorkingSpaceDimension="2D" ElementType="Surface" LocalSpaceDimension="1" ProcessName="Cohesive2D-Process" help="Assign this condition for each continuum group" VariableName="COHESIVE">
4+
<TopologyFeatures></TopologyFeatures>
5+
<inputs></inputs>
6+
<outputs></outputs>
7+
</ConditionItem>
8+
9+
<ConditionItem n="DEM-Cohesive" pn="Bonded domains" Interval="False" ImplementedInApplication="DEMApplication" MinimumKratosVersion="9000" ProductionReady="ProductionReady" WorkingSpaceDimension="3D" ElementType="Volume" LocalSpaceDimension="2" ProcessName="Cohesive-Process" help="Assign this condition for each continuum group" VariableName="COHESIVE">
10+
<TopologyFeatures></TopologyFeatures>
11+
<inputs></inputs>
12+
<outputs></outputs>
13+
</ConditionItem>
14+
</ConditionList>

‎kratos.gid/apps/CDEM/xml/Processes.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ProcessList>
3+
<Process n="Cohesive2D-Process" pn="Define bonded domains" python_module=" " kratos_module="KratosMultiphysics" check="DirectorVectorNonZero direction">
4+
<inputs>
5+
</inputs>
6+
</Process>
7+
8+
<Process n="Cohesive-Process" pn="Define bonded domains" python_module=" " kratos_module="KratosMultiphysics" check="DirectorVectorNonZero direction">
9+
<inputs>
10+
</inputs>
11+
</Process>
12+
</ProcessList>

‎kratos.gid/apps/CDEM/xml/XmlController.tcl‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,21 @@ proc CDEM::xml::Init { } {
1212
Model::ForgetConstitutiveLaws
1313
Model::ForgetElement SphericPartDEMElement3D
1414
Model::getElements ElementsC.xml
15+
Model::ForgetConditions
16+
Model::getConditions Conditions.xml
17+
Model::getConditions "../../DEM/xml/Conditions.xml"
1518
Model::getConstitutiveLaws ConstitutiveLawsC.xml
1619
Model::getMaterials MaterialsC.xml
1720
Model::getProcesses "../../Common/xml/Processes.xml"
21+
Model::getProcesses Processes.xml
1822
}
1923

2024
proc CDEM::xml::getUniqueName {name} {
2125
return ${::CDEM::prefix}${name}
2226
}
2327

2428
proc CDEM::xml::CustomTree { args } {
25-
spdAux::SetValueOnTreeItem values OpenMP ParallelType
26-
spdAux::SetValueOnTreeItem state hidden DEMTimeParameters StartTime
27-
28-
set root [customlib::GetBaseRoot]
29-
#set result_node [$root selectNodes "[spdAux::getRoute DEMStratSection]/container\[@n = 'ParallelType'\]"]
30-
#if { $result_node ne "" } {$result_node delete}
31-
#set result_node [$root selectNodes "[spdAux::getRoute DEMStratSection]/container\[@n = 'DEMGravity'\]"]
32-
#if { $result_node ne "" } {$result_node delete}
29+
DEM::xml::CustomTree args
3330

3431
gid_groups_conds::addF [spdAux::getRoute BondElem] value [list n TypeOfFailure pn "Type of failure" v No values {Yes,No} icon "black1" help "Displays different numbers for different types of failure. 2: tension. 4: shear or combination of stresses. 6: neighbour not found by search. 8: less bonds than minimum"]
3532
spdAux::SetValueOnTreeItem state {[getStateFromXPathValue {string(../value[@n='ContactMeshOption']/@v)} true]} BondElem TypeOfFailure

‎kratos.gid/apps/DEM/xml/Conditions.xml‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ConditionList>
3-
<ConditionItem n="DEM-Cohesive2D" pn="Bonded domains" Interval="False" ImplementedInApplication="DEMApplication" MinimumKratosVersion="9000" ProductionReady="ProductionReady" WorkingSpaceDimension="2D" ElementType="Surface" LocalSpaceDimension="1" ProcessName="Cohesive2D-Process" help="Assign this condition for each continuum group" VariableName="COHESIVE">
4-
<TopologyFeatures></TopologyFeatures>
5-
<inputs></inputs>
6-
<outputs></outputs>
7-
</ConditionItem>
8-
9-
<ConditionItem n="DEM-Cohesive" pn="Bonded domains" Interval="False" ImplementedInApplication="DEMApplication" MinimumKratosVersion="9000" ProductionReady="ProductionReady" WorkingSpaceDimension="3D" ElementType="Volume" LocalSpaceDimension="2" ProcessName="Cohesive-Process" help="Assign this condition for each continuum group" VariableName="COHESIVE">
10-
<TopologyFeatures></TopologyFeatures>
11-
<inputs></inputs>
12-
<outputs></outputs>
13-
</ConditionItem>
143

154
<ConditionItem n="DEM-FEM-Wall" pn="DEM-FEM Wall" Interval="False" ImplementedInApplication="DEMApplication" MinimumKratosVersion="9000" ProductionReady="ProductionReady" WorkingSpaceDimension="3D" LocalSpaceDimension="2" ElementType="Surface" ProcessName="DEM-FEM-Wall-Process" help="Assign kinematic conditions for each group containing finite elements" VariableName="WALL">
165
<TopologyFeatures>
@@ -76,15 +65,4 @@
7665
<outputs></outputs>
7766
</ConditionItem>
7867

79-
<!-- <ConditionItem n="VELOCITY" pn="Velocity" ProcessName="Linear_Velocity_Process" VariableName="VELOCITY" ImplementedInApplication="DEMApplication" analysis_type="Dynamic" unit_magnitude="Velocity" units="m/s" App="DEM" Interval="Total">
80-
<TopologyFeatures></TopologyFeatures>
81-
<inputs></inputs>
82-
<outputs></outputs>
83-
</ConditionItem>
84-
<ConditionItem n="ANGULAR_VELOCITY" pn="Angular Velocity" ProcessName="Angular_Velocity_Process" VariableName="ANGULAR_VELOCITY" Interval="Total" analysis_type="Dynamic" unit_magnitude="Angle/T" units="rad/s" App="DEM" ImplementedInApplication="DEMApplication">
85-
<TopologyFeatures></TopologyFeatures>
86-
<inputs></inputs>
87-
<outputs></outputs>
88-
</ConditionItem> -->
89-
9068
</ConditionList>

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -348,22 +348,6 @@
348348
</inputs>
349349
</Process>
350350

351-
<Process n="Cohesive2D-Process" pn="Define bonded domains" python_module=" " kratos_module="KratosMultiphysics" check="DirectorVectorNonZero direction">
352-
<inputs>
353-
<!-- <parameter n="WhatMdpa" pn="Destination mdpa" type="combo" values="DEM,DEM-Inlet,FEM" help="Decide what mpda file you want this SubModelPart to be added to"/> -->
354-
</inputs>
355-
</Process>
356-
357-
<Process n="Cohesive-Process" pn="Define bonded domains" python_module=" " kratos_module="KratosMultiphysics" check="DirectorVectorNonZero direction">
358-
<inputs>
359-
<!-- <parameter n="WhatMdpa" pn="Destination mdpa" type="combo" values="DEM,DEM-Inlet,FEM" help="Decide what mpda file you want this SubModelPart to be added to"/> -->
360-
</inputs>
361-
</Process>
362-
363-
364-
365-
366-
367351
<Process n="Angular_Velocity_Process" pn="" python_module="" kratos_module="KratosMultiphysics">
368352
<inputs>
369353
<parameter n="ANGULAR_VELOCITY" pn="ω" type="vector" v="0.0,0.0,0.0" function="0" has_units="1"/>

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ proc DEM::xml::CustomTree { args } {
2828
spdAux::SetValueOnTreeItem values OpenMP ParallelType
2929
spdAux::SetValueOnTreeItem state hidden DEMTimeParameters StartTime
3030

31-
set result_node [$root selectNodes "[spdAux::getRoute "DEMConditions"]/condition\[@n = 'DEM-Cohesive'\]"]
32-
if { $result_node ne "" } {$result_node delete}
33-
34-
set result_node [$root selectNodes "[spdAux::getRoute "DEMConditions"]/condition\[@n = 'DEM-Cohesive2D'\]"]
35-
if { $result_node ne "" } {$result_node delete}
31+
# 3D gravity
32+
if {$Model::SpatialDimension eq "3D"} {
33+
catch {
34+
spdAux::SetValueOnTreeItem v 0.0 DEMGravity Cy
35+
spdAux::SetValueOnTreeItem v -1.0 DEMGravity Cz
36+
}
37+
}
3638

3739
# # Graphs in output settings
3840
# if {[$root selectNodes "[spdAux::getRoute DEMResults]/condition\[@n='Graphs'\]"] eq ""} {

0 commit comments

Comments
 (0)