Merge pull request #694 from KratosMultiphysics/dem/parts-over-entities-2d-3d

[dem] Parts can select different types of entities depending on number of dimensions

Author: jginternational

kratos.gid/apps/DEM/xml/Parts.spd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<condition n="Parts" pn="Parts" ov="point,line,surface,volume" ovm="node,element" icon="shells16" help="Select your group" un="DEMParts">
+<condition n="Parts" pn="Parts" ov="[GetDEMPartsOvWhat]" ovm="node,element" icon="shells16" help="Select your group" un="DEMParts">
 	<value n="Element" pn="Element" actualize="1" values="" v="" dict="[GetElements ElementType DEM]" help="Select an element" state="hidden">
 		<dependencies node="../value[@n = 'ConstitutiveLaw']" actualize="1" />
 	</value>

kratos.gid/apps/DEM/xml/Procs.spd

@@ -5,11 +5,16 @@
                 return [DEM::xml::ProcGetElements $domNode $args]
                 ]]>
 		</proc>
-			<proc n='getStateBoundingBoxParams' args='args'>
+		<proc n='getStateBoundingBoxParams' args='args'>
 			<![CDATA[
                 return [DEM::xml::ProcGetStateBoundingBoxParams $domNode $args]
                 ]]>
 		</proc>
+		<proc n='GetDEMPartsOvWhat' args='args'>
+			<![CDATA[
+                return [DEM::xml::ProcGetDEMPartsOvWhat $domNode $args]
+                ]]>
+		</proc>
 </container>
 
 

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

@@ -87,6 +87,14 @@ proc DEM::xml::ProcGetStateBoundingBoxParams { domNode args } {
     return $ret
 }
 
+proc DEM::xml::ProcGetDEMPartsOvWhat { domNode args } {
+    if {$::Model::SpatialDimension eq "2D"} {
+        return "point,line,surface"
+    } else {
+        return "point,line,surface,volume"
+    }
+}
+
 
 
 DEM::xml::Init