File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ proc ::CDEM::LoadMyFiles { } {
4040 uplevel #0 [list source [file join $dir write write.tcl]]
4141 uplevel #0 [list source [file join $dir write writeMDPA_Parts.tcl]]
4242 uplevel #0 [list source [file join $dir write writeMDPA_Walls.tcl]]
43- # uplevel #0 [list source [file join $dir write writeMDPA_Inlet.tcl]]
43+ uplevel #0 [list source [file join $dir write writeMDPA_Inlet.tcl]]
4444 uplevel #0 [list source [file join $dir write writeProjectParameters.tcl]]
4545 uplevel #0 [list source [file join $dir examples examples.tcl]]
4646}
Original file line number Diff line number Diff line change 1+
2+ proc DEM::write::GetInletElementType {} {
3+ return SphericContinuumParticle3D
4+ }
5+ proc DEM::write::GetInjectorElementType {} {
6+ return SphericContinuumParticle3D
7+ }
Original file line number Diff line number Diff line change @@ -100,7 +100,7 @@ proc DEM::write::GetUsedClusters { } {
100100}
101101
102102proc DEM::write::DefineInletConditions {inletProperties mid contains_clusters} {
103- set inlet_element_type SphericParticle3D
103+ set inlet_element_type [DEM::write::GetInletElementType]
104104 if {[dict get $inletProperties Material Variables InletElementType] eq " Cluster3D" } {
105105 set contains_clusters 1
106106 if {[dict get $inletProperties Material Variables ClusterType] eq " FromFile" } {
@@ -116,11 +116,18 @@ proc DEM::write::DefineInletConditions {inletProperties mid contains_clusters} {
116116 }
117117
118118 write::WriteString " IDENTIFIER $mid "
119- write::WriteString " INJECTOR_ELEMENT_TYPE SphericParticle3D "
119+ write::WriteString " INJECTOR_ELEMENT_TYPE [ DEM::write::GetInjectorElementType ] "
120120 write::WriteString " ELEMENT_TYPE $inlet_element_type "
121121 write::WriteString " CONTAINS_CLUSTERS $contains_clusters "
122122}
123123
124+ proc DEM::write::GetInletElementType {} {
125+ return SphericParticle3D
126+ }
127+ proc DEM::write::GetInjectorElementType {} {
128+ return SphericParticle3D
129+ }
130+
124131proc DEM::write::writeInletMeshes { } {
125132 variable inletProperties
126133
You can’t perform that action at this time.
0 commit comments