fixed inactive inlet bug

Author: jginternational

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

@@ -8,14 +8,10 @@ proc CDEM::xml::Init { } {
     variable dir
     Model::InitVariables dir $CDEM::dir
     Model::ForgetElements
-    Model::ForgetMaterials
     Model::ForgetConstitutiveLaws
     Model::getElements ElementsC.xml
-    Model::ForgetConditions
     Model::getConditions Conditions.xml
-    Model::getConditions "../../DEM/xml/Conditions.xml"
     Model::getConstitutiveLaws ConstitutiveLawsC.xml
-    Model::getMaterials "../../DEM/xml/Materials.xml"
     Model::getProcesses "../../Common/xml/Processes.xml"
     Model::getProcesses Processes.xml
 }

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

@@ -33,11 +33,16 @@ proc DEM::write::GetInletConditionXpath { } {
     return $xp1
 }
 
-proc DEM::write::GetInletGroups { } {
+# That can be all or active / All by default
+proc DEM::write::GetInletGroups { {that all}} {
     set groups [list ]
 
     foreach group [[customlib::GetBaseRoot] selectNodes [DEM::write::GetInletConditionXpath]/group] {
         set groupid [$group @n]
+        if {$that eq "active"} {
+            set active_inlet [write::getValueByNodeChild $group SetActive]
+            if {[write::isBooleanFalse $active_inlet]} {continue}
+        }
         lappend groups [write::GetWriteGroupName $groupid]
     }
     return $groups
@@ -127,6 +132,11 @@ proc DEM::write::writeInletMeshes { } {
             set mid [write::AddSubmodelpart $condition_name $groupid]
             set props [DEM::write::FindPropertiesBySubmodelpart $inletProperties $mid]
             if {$props eq ""} {W "Error printing inlet $groupid"}
+            set is_active [dict get $props Material Variables SetActive]
+            if {[write::isBooleanFalse $is_active]} {
+                continue
+            }
+
             set group_real_name [write::GetWriteGroupName $groupid]
             set gdict [dict create]
             set f "%10i\n"
@@ -135,10 +145,6 @@ proc DEM::write::writeInletMeshes { } {
             write::WriteString "Begin SubModelPart $mid // Group $groupid // Subtree Inlet"
             write::WriteString "    Begin SubModelPartData"
 
-            set is_active [dict get $props Material Variables SetActive]
-            if {$is_active=="No"} {
-                continue
-            }
 
             if {[write::isBooleanTrue $is_active]} {
                 set motion_type [dict get $props Material Variables InletMotionType]

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

@@ -52,6 +52,12 @@ proc DEM::write::getDEMMaterialsDict { } {
     set gnodes [[customlib::GetBaseRoot] selectNodes "//condition/group"]
     foreach gnode $gnodes {
         set mat_child [$gnode selectNodes "value\[@n='Material'\]"]
+        set active_group_node [$gnode selectNodes "value\[@n='SetActive'\]"]
+        if {$active_group_node ne ""} {
+            if {[write::isBooleanFalse [write::getValueByNode $active_group_node]]} {
+                continue
+            }
+        }
         if {$mat_child ne ""} {
             set mat_name [write::getValueByNode $mat_child]
             set group_name [write::GetWriteGroupName [$gnode @n]]

kratos.gid/scripts/Writing/Writing.tcl

@@ -485,6 +485,10 @@ proc write::getValueByNode { node {what noforce} } {
     }
     return [getFormattedValue [get_domnode_attribute $node v]]
 }
+proc write::getValueByNodeChild { parent_node child_name {what noforce} } {
+    set node [$parent_node find n $child_name]
+    return [write::getValueByNode $node $what]
+}
 proc write::getValueByXPath { xpath { it "" }} {
     set root [customlib::GetBaseRoot]
     set node [$root selectNodes $xpath]