Merge branch 'master' into use-gids-python

jginternational · jginternational · commit 8892121bfd4f · 2023-03-21T10:56:17.000+01:00
diff --git a/kratos.gid/apps/Fluid/write/writeProjectParameters.tcl b/kratos.gid/apps/Fluid/write/writeProjectParameters.tcl
@@ -39,10 +39,10 @@ proc ::Fluid::write::process_special_conditions { list_of_processes } {
     foreach process $list_of_processes {
         # Wall law has nested parameters
         if {[dict get $process process_name] eq "ApplyWallLawProcess" } {
-            if {[dict get $process Parameters wall_model] eq "navier_slip"} {
+            if {[dict get $process Parameters wall_model_name] eq "navier_slip"} {
                 dict set process Parameters wall_model_settings slip_length [dict get $process Parameters slip_length]
             }
-            if {[dict get $process Parameters wall_model] eq "linear_log"} {
+            if {[dict get $process Parameters wall_model_name] eq "linear_log"} {
                 dict set process Parameters wall_model_settings y_wall [dict get $process Parameters y_wall]
             }
             dict unset process Parameters y_wall
@@ -293,4 +293,4 @@ proc ::Fluid::write::GetMonolithicElementTypeFromElementName {element_name} {
     if {![$element hasAttribute FormulationElementType]} {error "Your monolithic element $element_name need to define the FormulationElementType field"}
     set formulation_element_type [$element getAttribute FormulationElementType]
     return {*}$formulation_element_type
-}
+}
diff --git a/kratos.gid/apps/Fluid/xml/Processes.xml b/kratos.gid/apps/Fluid/xml/Processes.xml
@@ -31,7 +31,7 @@
 
     <Process n="ApplyWallLawProcess" pn="Assign wall law process" python_module="apply_wall_law_process" kratos_module="KratosMultiphysics.FluidDynamicsApplication" help="">
         <inputs>
-            <parameter n="wall_model" pn="Wall model" type="combo" values="navier_slip,linear_log" pvalues="Navier-slip,Linear-log" v="navier_slip" help="">
+            <parameter n="wall_model_name" pn="Wall model" type="combo" values="navier_slip,linear_log" pvalues="Navier-slip,Linear-log" v="navier_slip" help="">
                 <parameter parent="navier_slip" n="slip_length" pn="Slip length" type="double" v="0.001" unit_magnitude="L" units="m" help=""/>
                 <parameter parent="linear_log" n="y_wall" pn="Wall distance" type="double" v="0.001" unit_magnitude="L" units="m" help=""/>
             </parameter>
diff --git a/kratos.gid/apps/MPM/write/write.tcl b/kratos.gid/apps/MPM/write/write.tcl
@@ -90,10 +90,9 @@ proc MPM::write::GetPartsGroups { part_type {what "name"} } {
     return $body_groups
 }
 
-
 proc ::MPM::write::GetUsedElements { {get "Objects"} } {
     set lista [list ]
-    foreach gNode [write::getPartsGroupsId node] {
+    foreach gNode [MPM::write::GetPartsGroups Body node] {
         set elem_name [write::getValueByNode [$gNode selectNodes ".//value\[@n='Element']"] ]
         set e [Model::getElement $elem_name]
         if {$get eq "Name"} { set e [$e getName] }
@@ -102,7 +101,6 @@ proc ::MPM::write::GetUsedElements { {get "Objects"} } {
     return $lista
 }
 
-
 proc MPM::write::writeBodyNodalCoordinates { } {
     write::writeNodalCoordinatesOnGroups [MPM::write::GetPartsGroups Body]
 }
diff --git a/kratos.gid/apps/MPM/xml/Elements.xml b/kratos.gid/apps/MPM/xml/Elements.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ElementList>
   <!--updated lagrangian-->
-  <ElementItem n="UpdatedLagrangian2D" pn="Updated lagrangian" ov="surface" ImplementedInFile="updated_lagrangian.cpp" ImplementedInApplication="ParticleMechanicsApplication" MinimumKratosVersion="9000"  WorkingSpaceDimension="2D" LocalSpaceDimension="2" RequiresLocalAxes="No" LargeDeformation="Yes,No" ElementType="Material_domain" help="Updated Lagrangian 2D element for large deformation kinematics consist of a material point and connectivity nodes." AnalysisType="non_linear">
+  <ElementItem n="UpdatedLagrangian2D" pn="Updated lagrangian" ov="surface" ImplementedInFile="updated_lagrangian.cpp" ImplementedInApplication="ParticleMechanicsApplication" MinimumKratosVersion="9000" WorkingSpaceDimension="2D" LocalSpaceDimension="2" RequiresLocalAxes="No" LargeDeformation="Yes,No" ElementType="Material_domain" help="Updated Lagrangian 2D element for large deformation kinematics consist of a material point and connectivity nodes." AnalysisType="non_linear">
     <!--here we could add a list of all of the possible geometries-->
     <TopologyFeatures>
       <item GeometryType="Triangle" nodes="3" KratosName="UpdatedLagrangian2D3N"/>
       <item GeometryType="Quadrilateral" nodes="4" KratosName="UpdatedLagrangian2D4N"/>
     </TopologyFeatures>
-        <!-- here we add the block of features which we require from the constitutive law-->
+    <!-- here we add the block of features which we require from the constitutive law-->
     <ConstitutiveLaw_FilterFeatures>
       <filter field="App" value="MPM"/>
       <filter field="FormulationType" value="Irreducible"/>
@@ -19,8 +19,8 @@
       <NodalCondition n="ACCELERATION"/>
     </NodalConditions>
     <inputs>
-      <parameter n="THICKNESS" pn="Thickness" v="1.0" unit_magnitude="L" units="m"  />
-      <parameter n="PARTICLES_PER_ELEMENT" pn="Particles per element" type="combo" v="1" values="1,3,4,6,9,12,16,33"  pvalues="1 (for triangles or quads),3 (for triangles),4 (for quads),6 (for triangles),9 (for quads),12 (for triangles),16 (for triangles or quads),33 (for triangles)" help="Number of particle generated for each element. Available options are: Triangular: 1,3,6,12,16,33 and Quadrilateral: 1,4,9,16" />
+      <parameter n="THICKNESS" pn="Thickness" v="1.0" unit_magnitude="L" units="m" />
+      <parameter n="PARTICLES_PER_ELEMENT" pn="Particles per element" type="combo" v="1" values="1,3,4,6,9,12,16,33" pvalues="1 (for triangles or quads),3 (for triangles),4 (for quads),6 (for triangles),9 (for quads),12 (for triangles),16 (for triangles or quads),33 (for triangles)" help="Number of particle generated for each element. Available options are: Triangular: 1,3,6,12,16,33 and Quadrilateral: 1,4,9,16" />
     </inputs>
     <outputs>
       <parameter n="MP_VELOCITY" pn="Material point velocity" v="true" />
@@ -50,7 +50,7 @@
       <NodalCondition n="ACCELERATION"/>
     </NodalConditions>
     <inputs>
-      <parameter n="THICKNESS" pn="Thickness" v="1.0" unit_magnitude="L" units="m"  />
+      <parameter n="THICKNESS" pn="Thickness" v="1.0" unit_magnitude="L" units="m" />
       <parameter n="PARTICLES_PER_ELEMENT" pn="Particle per element" type="integer" v="1" help="Number of particle generated for each element. Available options are: Triangular: 1,3,6,12,16,33 and Quadrilateral: 1,4,9,16" />
     </inputs>
     <outputs>
@@ -64,7 +64,7 @@
   </ElementItem>
   <ElementItem n="UpdatedLagrangian2DAxisymmetry" pn="Updated lagrangian" ov="surface" ImplementedInFile="updated_lagrangian_axisymmetry.cpp" ImplementedInApplication="ParticleMechanicsApplication" MinimumKratosVersion="9000" WorkingSpaceDimension="2Da" LocalSpaceDimension="2" RequiresLocalAxes="No" LargeDeformation="Yes,No" ElementType="Material_domain" help="Updated Lagrangian 2D axis-symmetric element for large deformation kinematics consist of a material point and connectivity nodes" AnalysisType="non_linear,linear">
 
-      <!--here we could add a list of all of the possible geometries-->
+    <!--here we could add a list of all of the possible geometries-->
     <TopologyFeatures>
       <item GeometryType="Triangle" nodes="3" KratosName="UpdatedLagrangianAxisymmetry2D3N"/>
       <item GeometryType="Quadrilateral" nodes="4" KratosName="UpdatedLagrangianAxisymmetry2D4N"/>
@@ -81,7 +81,7 @@
       <NodalCondition n="ACCELERATION"/>
     </NodalConditions>
     <inputs>
-      <parameter n="THICKNESS" pn="Thickness" v="1.0" unit_magnitude="L" units="m"  />
+      <parameter n="THICKNESS" pn="Thickness" v="1.0" unit_magnitude="L" units="m" />
       <parameter n="PARTICLES_PER_ELEMENT" pn="Particles per element" type="combo" v="1" values="1,3,4,6,9,12,16,33" pvalues="1 (for triangles or quads),3 (for triangles),4 (for quads),6 (for triangles),9 (for quads),12 (for triangles),16 (for triangles or quads),33 (for triangles)" help="Number of particle generated for each element. Available options are: Triangular: 1,3,6,12,16,33 and Quadrilateral: 1,4,9,16" />
     </inputs>
     <outputs>
@@ -94,7 +94,7 @@
     </outputs>
   </ElementItem>
 
-  <ElementItem n="UpdatedLagrangian3D" pn="Updated lagrangian" ov="volume" ImplementedInFile="updated_lagrangian.cpp" ImplementedInApplication="ParticleMechanicsApplication" MinimumKratosVersion="9000"  WorkingSpaceDimension="3D" LocalSpaceDimension="3" RequiresLocalAxes="False" LargeDeformation="False" ElementType="Material_domain" help="Updated Lagrangian 3D element for large deformation kinematics consists of a material point and connectivity nodes." AnalysisType="non_linear">
+  <ElementItem n="UpdatedLagrangian3D" pn="Updated lagrangian" ov="volume" ImplementedInFile="updated_lagrangian.cpp" ImplementedInApplication="ParticleMechanicsApplication" MinimumKratosVersion="9000" WorkingSpaceDimension="3D" LocalSpaceDimension="3" RequiresLocalAxes="False" LargeDeformation="False" ElementType="Material_domain" help="Updated Lagrangian 3D element for large deformation kinematics consists of a material point and connectivity nodes." AnalysisType="non_linear">
     <!--here we could add a list of all of the possible geometries-->
     <TopologyFeatures>
       <item GeometryType="Tetrahedra" nodes="4" KratosName="UpdatedLagrangian3D4N"/>
@@ -123,7 +123,7 @@
       <parameter n="MP_EQUIVALENT_PLASTIC_STRAIN" pn="Material point equivalent plastic strain" v="false" />
     </outputs>
   </ElementItem>
-   <ElementItem n="UpdatedLagrangianUP3D" pn="Updated lagrangian mixed UP" ov="volume" ImplementedInFile="updated_lagrangian.cpp" ImplementedInApplication="ParticleMechanicsApplication" MinimumKratosVersion="9000" ProductionReady="ProductionReady" WorkingSpaceDimension="3D" LocalSpaceDimension="3" RequiresLocalAxes="No" LargeDeformation="No" ElementType="Material_domain" help="Updated Lagrangian 3D element for large deformation kinematics consists of a material point and connectivity nodes." AnalysisType="non_linear">
+  <ElementItem n="UpdatedLagrangianUP3D" pn="Updated lagrangian mixed UP" ov="volume" ImplementedInFile="updated_lagrangian.cpp" ImplementedInApplication="ParticleMechanicsApplication" MinimumKratosVersion="9000" ProductionReady="ProductionReady" WorkingSpaceDimension="3D" LocalSpaceDimension="3" RequiresLocalAxes="No" LargeDeformation="No" ElementType="Material_domain" help="Updated Lagrangian 3D element for large deformation kinematics consists of a material point and connectivity nodes." AnalysisType="non_linear">
     <!--here we could add a list of all of the possible geometries-->
     <TopologyFeatures>
       <item GeometryType="Tetrahedra" nodes="4" KratosName="UpdatedLagrangian3D4N"/>
@@ -141,7 +141,7 @@
       <NodalCondition n="ACCELERATION"/>
     </NodalConditions>
     <inputs>
-      <parameter n="PARTICLES_PER_ELEMENT" pn="Particles per element" type="combo" v="1" values="1,3,4,6,9,12,16,33"  pvalues="1 (for triangles or quads),3 (for triangles),4 (for quads),6 (for triangles),9 (for quads),12 (for triangles),16 (for triangles or quads),33 (for triangles)" help="Number of particle generated for each element. Available options are: Tetrahedral: 1,3,6,12 and Hexahedral: 1,4,9,16" />
+      <parameter n="PARTICLES_PER_ELEMENT" pn="Particles per element" type="combo" v="1" values="1,3,4,6,9,12,16,33" pvalues="1 (for triangles or quads),3 (for triangles),4 (for quads),6 (for triangles),9 (for quads),12 (for triangles),16 (for triangles or quads),33 (for triangles)" help="Number of particle generated for each element. Available options are: Tetrahedral: 1,3,6,12 and Hexahedral: 1,4,9,16" />
     </inputs>
     <outputs>
       <parameter n="MP_VELOCITY" pn="Material point velocity" v="true" />
@@ -192,7 +192,7 @@
     <inputs></inputs>
     <outputs></outputs>
   </ElementItem>
-  <ElementItem n="GRID3D" pn="Background Grid" ov="volume" ImplementedInApplication="ParticleMechanicsApplication"  WorkingSpaceDimension="3D" LocalSpaceDimension="3" RequiresLocalAxes="No" LargeDeformation="No" ElementType="Grid" help="3D Background element required for the computation of material point method." AnalysisType="non_linear">
+  <ElementItem n="GRID3D" pn="Background Grid" ov="volume" ImplementedInApplication="ParticleMechanicsApplication" WorkingSpaceDimension="3D" LocalSpaceDimension="3" RequiresLocalAxes="No" LargeDeformation="No" ElementType="Grid" help="3D Background element required for the computation of material point method." AnalysisType="non_linear">
     <!--here we could add a list of all of the possible geometries-->
     <TopologyFeatures>
       <item GeometryType="Tetrahedra" nodes="4" KratosName="Element3D4N"/>
diff --git a/kratos.gid/apps/MPM/xml/Procs.spd b/kratos.gid/apps/MPM/xml/Procs.spd
@@ -24,6 +24,16 @@
 	  return [MPM::xml::ProcGetSolutionStrategiesMPM $domNode $args]
 	  ]]>
 	</proc>
+	<proc n='CheckActivateStabilizationState' args='args'>
+	  <![CDATA[
+	  return [MPM::xml::ProcCheckActivateStabilizationState $domNode $args]
+	  ]]>
+	</proc>
 		  		
+	<proc n='CheckStabilizationState' args='args'>
+	  <![CDATA[
+	  return [MPM::xml::ProcCheckStabilizationState $domNode $args]
+	  ]]>
+	</proc>
 
 </container>
diff --git a/kratos.gid/apps/MPM/xml/SolutionStrategy.spd b/kratos.gid/apps/MPM/xml/SolutionStrategy.spd
@@ -7,14 +7,11 @@
 		<value n="DeltaTime" pn="Delta time" v="0.01" help="User-defined time step" />
 	</container>
 	<container n="StratParams" pn="Strategy parameters" un="STStratParams" icon="groupsTreeNew.gif" open_window="0" state="[HideIfUniqueName STSoluType eigen_value]">
-	   <value n="ActivateStabilization" pn="Stabilization" type="combo" v="Off" values="Off,On" help="Stabilization" open_window="0" actualize_tree="1" state="normal">
-		  <dependencies value="Off" node="../value[@n='stabilization']" att1="state" v1="hidden"/>
-		  <dependencies value="On" node="../value[@n='stabilization']" att1="state" v1="normal"/>
-		</value>
-		<value n="stabilization" pn="Stabilization method" type="combo" v="ppp" values="ppp" pvalues="PPP" help="Stabilization method"/>
+		<value n="ActivateStabilization" pn="Stabilization" type="combo" v="Off" values="Off,On" help="Stabilization" open_window="0" actualize_tree="1" state="[CheckActivateStabilizationState]" />
+		<value n="stabilization" pn="Stabilization method" type="combo" v="ppp" values="ppp" pvalues="PPP" help="Stabilization method" state="[CheckStabilizationState]"/>
 		<dynamicnode command="spdAux::injectSolStratParams" args="ImplementedInApplication StructuralMechanicsApplication"/>
 	</container>
-   <include n="Gravity" active="1" path="apps/MPM/xml/Gravity.spd"/>
+	<include n="Gravity" active="1" path="apps/MPM/xml/Gravity.spd"/>
 	<include n="Parallelism" active="1" path="apps/Common/xml/Parallelism.spd"/>
 	<dynamicnode command="spdAux::injectSolvers" args=""/>
 </container>
diff --git a/kratos.gid/apps/MPM/xml/XmlController.tcl b/kratos.gid/apps/MPM/xml/XmlController.tcl
@@ -74,3 +74,23 @@ proc MPM::xml::ProcCheckGeometry {domNode args} {
     }
     return $ret
 }
+
+proc MPM::xml::ProcCheckActivateStabilizationState {domNode args} {
+    set ret "hidden"
+    set up_mixed UpdatedLagrangianUP$::Model::SpatialDimension
+    set used_elements [::MPM::write::GetUsedElements Name]
+    if {$up_mixed in $used_elements} {
+        set ret "normal"
+    }
+    return $ret
+}
+
+proc MPM::xml::ProcCheckStabilizationState {domNode args} {
+    set ret "hidden"
+    set first_check [MPM::xml::ProcCheckActivateStabilizationState domNode args]
+    if {$first_check eq "normal"} {
+        set second_check [write::getValueByNode [$domNode selectNodes "..//value\[@n='ActivateStabilization']"] ]
+        if {$second_check eq "On"} {set ret "normal"}
+    }
+    return $ret
+}

Original file line number	Diff line number	Diff line change
`@@ -90,10 +90,9 @@ proc MPM::write::GetPartsGroups { part_type {what "name"} } {`
`90`	`90`	`return $body_groups`
`91`	`91`	`}`
`92`	`92`
`93`		`-`
`94`	`93`	`proc ::MPM::write::GetUsedElements { {get "Objects"} } {`
`95`	`94`	`set lista [list ]`
`96`		`- foreach gNode [write::getPartsGroupsId node] {`
	`95`	`+ foreach gNode [MPM::write::GetPartsGroups Body node] {`
`97`	`96`	`set elem_name [write::getValueByNode [$gNode selectNodes ".//value\[@n='Element']"] ]`
`98`	`97`	`set e [Model::getElement $elem_name]`
`99`	`98`	`if {$get eq "Name"} { set e [$e getName] }`
`@@ -102,7 +101,6 @@ proc ::MPM::write::GetUsedElements { {get "Objects"} } {`
`102`	`101`	`return $lista`
`103`	`102`	`}`
`104`	`103`
`105`		`-`
`106`	`104`	`proc MPM::write::writeBodyNodalCoordinates { } {`
`107`	`105`	`write::writeNodalCoordinatesOnGroups [MPM::write::GetPartsGroups Body]`
`108`	`106`	`}`