Merge pull request #756 from KratosMultiphysics/hotfix/dem-save

Miguel Angel Celigueta · web-flow · commit 04f81723bfe9 · 2020-09-10T11:26:01.000+02:00
Hotfix/dem save spheres in group
diff --git a/kratos.gid/apps/CDEM/start.tcl b/kratos.gid/apps/CDEM/start.tcl
@@ -71,4 +71,8 @@ proc ::CDEM::CustomToolbarItems { } {
     Kratos::ToolbarAddItem "Bulk grouping" [file join $dir images stone.png] [list -np- ::CDEM::xml::BulkGroup] [= "Plugin\nBulk grouping"]
 }
 
+proc ::CDEM::AfterSaveModel {filespd} {
+    ::DEM::AfterSaveModel $filespd
+}
+
 ::CDEM::Init
diff --git a/kratos.gid/apps/Common/xml/Processes.xml b/kratos.gid/apps/Common/xml/Processes.xml
@@ -2,64 +2,56 @@
 
 <ProcessList>
 
-	<!--Kratos base process --> 
-	<Process n="PythonProcess" pn="Base Python process" python_module="python_process"
-				   kratos_module="KratosMultiphysics" help="Python processes empty base class which does nothing">
+	<!--Kratos base process -->
+	<Process n="PythonProcess" pn="Base Python process" python_module="python_process" kratos_module="KratosMultiphysics" help="Python processes empty base class which does nothing">
 		<inputs>
 		</inputs>
 	</Process>
 
-	<!--Processes for nodes --> 
-	<Process n="AssignScalarVariableProcess" pn="Assign scalar variable process" python_module="assign_scalar_variable_process"
-					 kratos_module="KratosMultiphysics" help="This process fixes the selected components of a given vector variable">
+	<!--Processes for nodes -->
+	<Process n="AssignScalarVariableProcess" pn="Assign scalar variable process" python_module="assign_scalar_variable_process" kratos_module="KratosMultiphysics" help="This process fixes the selected components of a given vector variable">
 		<inputs>
 			<parameter n="constrained" pn="Imposed" type="bool" v="1" />
 			<parameter n="value" pn="Value" type="double" function="1" v="0.0" has_units="1"/>
 		</inputs>
 	</Process>
 
-	<Process n="AssignVectorVariableProcess" pn="Assign vector variable process" python_module="assign_vector_variable_process"
-					kratos_module="KratosMultiphysics" help="This process fixes the selected components of a given vector variable"
-					write_command="write::ProcessVectorFunctionComponents" >
+	<Process n="AssignVectorVariableProcess" pn="Assign vector variable process" python_module="assign_vector_variable_process" kratos_module="KratosMultiphysics" help="This process fixes the selected components of a given vector variable" write_command="write::ProcessVectorFunctionComponents">
 		<inputs>
-			<parameter n="component" pn="Component" type="vector" vectorType="double" function="1" cv="ByValue,ByValue,ByValue" v="0.0,0.0,0.0" fv="2*x,2*y*t,0.5*z" has_units="1"/> 
+			<parameter n="component" pn="Component" type="vector" vectorType="double" function="1" cv="ByValue,ByValue,ByValue" v="0.0,0.0,0.0" fv="2*x,2*y*t,0.5*z" has_units="1"/>
 		</inputs>
 	</Process>
 
-	<Process n="AssignAutomaticDirectionVectorProcess" pn="Assign automatic direction vector process" python_module="assign_vector_by_direction_process"
-				   kratos_module="KratosMultiphysics" help="" >
+	<Process n="AssignAutomaticDirectionVectorProcess" pn="Assign automatic direction vector process" python_module="assign_vector_by_direction_process" kratos_module="KratosMultiphysics" help="">
 		<inputs>
-      <parameter n="modulus" pn="Value" type="double" v="1.0" function="1" has_units="1"/>
+			<parameter n="modulus" pn="Value" type="double" v="1.0" function="1" has_units="1"/>
 			<parameter n="direction" pn="Normal direction" type="combo" values="automatic_inwards_normal,automatic_outwards_normal" pvalues="Inwards,Outwards" v="automatic_inwards_normal" help=""/>
 		</inputs>
 	</Process>
 
-	<Process n="AssignVectorByDirectionProcess" pn="Assign vector by direction process" python_module="assign_vector_by_direction_process"
-				   kratos_module="KratosMultiphysics" help="This process sets a vector variable value over a condition according to a given modulus an direction"  check="DirectorVectorNonZero direction">
+	<Process n="AssignVectorByDirectionProcess" pn="Assign vector by direction process" python_module="assign_vector_by_direction_process" kratos_module="KratosMultiphysics" help="This process sets a vector variable value over a condition according to a given modulus an direction" check="DirectorVectorNonZero direction">
 		<inputs>
-      <parameter n="modulus" pn="Value" type="double" v="1.0" function="1" has_units="1"/>
+			<parameter n="constrained" pn="Constrained" type="bool" v="0" values="0,1" has_units="0"/>
+			<parameter n="modulus" pn="Value" type="double" v="1.0" function="1" has_units="1"/>
 			<parameter n="direction" pn="Direction" type="vector" vectorType="double" v="0.0,0.0,0.0" help=""/>
 		</inputs>
 	</Process>
 
-	<!--Processes for conditions --> 
-	<Process n="AssignScalarVariableToConditionProcess" pn="Apply a scalar value over a condition" python_module="assign_scalar_variable_to_conditions_process" 
-			 kratos_module="KratosMultiphysics" help="This process sets a scalar variable value over a condition">
+	<!--Processes for conditions -->
+	<Process n="AssignScalarVariableToConditionProcess" pn="Apply a scalar value over a condition" python_module="assign_scalar_variable_to_conditions_process" kratos_module="KratosMultiphysics" help="This process sets a scalar variable value over a condition">
 		<inputs>
 			<parameter n="value" pn="Value" type="double" v="0.0" function="1" has_units="1"/>
 		</inputs>
 	</Process>
 
-	<Process n="AssignVectorVariableToConditionProcess" pn="Assign a vector variable over a condition " python_module="assign_vector_variable_to_condition_process" 
-			 kratos_module="KratosMultiphysics" help="This process sets a scalar variable value over a condition">
+	<Process n="AssignVectorVariableToConditionProcess" pn="Assign a vector variable over a condition " python_module="assign_vector_variable_to_condition_process" kratos_module="KratosMultiphysics" help="This process sets a scalar variable value over a condition">
 		<inputs>
 			<parameter n="constrained" pn="Imposed" type="vector" vectorType="bool" v="1,1,1" />
 			<parameter n="value" pn="Value" type="vector" vectorType="double" function="1" v="0.0,0.0,0.0" has_units="1"/>
 		</inputs>
 	</Process>
 
-	<Process n="AssignVectorByDirectionToConditionProcess" pn="Assign a vector value on a condition" python_module="assign_vector_by_direction_to_condition_process" 
-			 kratos_module="KratosMultiphysics" help="This process sets a vector variable value over a condition according to a given modulus an direction" check="DirectorVectorNonZero direction">
+	<Process n="AssignVectorByDirectionToConditionProcess" pn="Assign a vector value on a condition" python_module="assign_vector_by_direction_to_condition_process" kratos_module="KratosMultiphysics" help="This process sets a vector variable value over a condition according to a given modulus an direction" check="DirectorVectorNonZero direction">
 		<inputs>
 			<parameter n="modulus" pn="Modulus" type="double" v="1.0" function="1" has_units="1"/>
 			<parameter n="direction" pn="Direction" type="vector" v="0.0,0.0,0.0" />
diff --git a/kratos.gid/apps/DEM/start.tcl b/kratos.gid/apps/DEM/start.tcl
@@ -166,6 +166,36 @@ proc ::DEM::AfterMeshGeneration { fail } {
     # }
 }
 
+proc ::DEM::AfterSaveModel { filespd } {
+
+    # GiD bug detected in versions prev to 15.0.1
+    # Spheres disapear in groups after load. Fixing it by removing the limitation in the prj file.
+    # GiD Team -> @jginternationa and @escolano
+    # Fixed in any 15.1.X (developer) and 15.0.1 and later (official)
+    if {[GidUtils::VersionCmp "15.0.0"] <= 0} {
+        ::DEM::PatchMissingSpheresInGroup $filespd
+    }
+}
+
+proc ::DEM::PatchMissingSpheresInGroup {filespd} {
+    set prj_file [file join [file dirname $filespd] [file rootname $filespd].prj]
+    if {[file exists $prj_file]} {
+        dom parse [tDOM::xmlReadFile $prj_file] doc
+
+        set grlist [$doc getElementsByTagName group]
+        foreach group $grlist {
+            if {[$group hasAttribute allowed_element_types]} {
+                $group removeAttribute allowed_element_types
+            }
+            if {[$group hasAttribute allowed_types]} {
+                $group removeAttribute allowed_types
+            }
+        }
+        set fp [open $prj_file w]
+        puts $fp [$doc asXML]
+        close $fp
+    }
+}
 
 
 ::DEM::Init
diff --git a/kratos.gid/apps/DEM/write/writeMDPA_Parts.tcl b/kratos.gid/apps/DEM/write/writeMDPA_Parts.tcl
@@ -428,6 +428,7 @@ proc DEM::write::GetSpheresGroups { } {
 
 proc DEM::write::writeMaterialsParts { } {
     variable partsProperties
+    #TODO: check this nonsense conditions/parts ??
     set xp1 "[spdAux::getRoute [GetAttribute conditions_un]]/condition\[@n = 'Parts'\]/group"
     set partsProperties $::write::mat_dict
     #set ::write::mat_dict [dict create]
diff --git a/kratos.gid/apps/DEMPFEM/start.tcl b/kratos.gid/apps/DEMPFEM/start.tcl
@@ -64,4 +64,8 @@ proc ::DEMPFEM::CustomToolbarItems { } {
     Kratos::ToolbarAddItem "Example" "example.png" [list -np- ::DEMPFEM::examples::InnerSphere] [= "Example\nInnerSphere"]
 }
 
+proc ::DEMPFEM::AfterSaveModel {filespd} {
+    ::DEM::AfterSaveModel $filespd
+}
+
 ::DEMPFEM::Init
diff --git a/kratos.gid/apps/FluidDEM/start.tcl b/kratos.gid/apps/FluidDEM/start.tcl
@@ -65,4 +65,8 @@ proc ::FluidDEM::CustomToolbarItems { } {
     Kratos::ToolbarAddItem "Example" [file join $dir images drop.png] [list -np- ::FluidDEM::examples::CylinderInFlow] [= "Example\nCylinderInFlow"]
 }
 
+proc ::FluidDEM::AfterSaveModel {filespd} {
+    ::DEM::AfterSaveModel $filespd
+}
+
 ::FluidDEM::Init
diff --git a/kratos.gid/apps/Structural/xml/Elements.xml b/kratos.gid/apps/Structural/xml/Elements.xml
@@ -458,8 +458,8 @@
   <ElementItem n="PrestressedMembraneElement" pn="Membrane prestressed" ov="surface" ImplementedInFile="prestress_membrane_element.cpp" ImplementedInApplication="StructuralMechanicsApplication" MinimumKratosVersion="9000" ProductionReady="ProductionReady" WorkingSpaceDimension="3D" LocalSpaceDimension="2" RequiresLocalAxes="False" LargeDeformation="False" help="This element it implements a membrane structural model" RotationDofs="False" ElementType="Membrane" AnalysisType="non_linear">
     <!--here we could add a list of all of the possible geometries-->
     <TopologyFeatures>
-      <item GeometryType="Triangle" nodes="3" KratosName="PreStressMembraneElement3D3N"/>
-      <item GeometryType="Quadrilateral" nodes="4" KratosName="PreStressMembraneElement3D4N"/>
+      <item GeometryType="Triangle" nodes="3" KratosName="MembraneElement3D3N"/>
+      <item GeometryType="Quadrilateral" nodes="4" KratosName="MembraneElement3D4N"/>
     </TopologyFeatures>
     <!-- here we add the block of features which we require from the constitutive law-->
     <ConstitutiveLaw_FilterFeatures>
@@ -478,11 +478,10 @@
       <parameter n="THICKNESS" pn="Thickness" v="1.0" unit_magnitude="L" units="m" />
       <parameter n="PRESTRESS_VECTOR" pn="Membrane prestress" type="inline_vector" v="0,0,0"/>
       <parameter n="PROJECTION_TYPE_COMBO" pn="Projection type" type="combo" v="rotational" values="rotational,planar,file">
-        <parameter n="PRESTRESS_AXIS_GLOBAL" pn="Projection direction" type="inline_vector" v="0,0,0" parent="rotational"/>
-        <parameter n="PRESTRESS_AXIS_1_GLOBAL" pn="Projection direction 1" type="inline_vector" v="0,0,0" parent="planar"/>
+        <parameter n="PRESTRESS_AXIS_1_GLOBAL" pn="Projection direction 1" type="inline_vector" v="0,0,0" parent="rotational,planar"/>
         <parameter n="PRESTRESS_AXIS_2_GLOBAL" pn="Projection direction 2" type="inline_vector" v="0,0,0" parent="planar"/>
         <parameter n="PROJECTION_TYPE_FILEPATH" pn="Projection file" type="tablefile" parent="file" v="- No file"/>
-      </parameter>
+      </parameter> 
     </inputs>
     <outputs>
       <parameter n="CAUCHY_STRESS_TENSOR" pn="Cauchy stress tensor" />

Original file line number	Diff line number	Diff line change
`@@ -71,4 +71,8 @@ proc ::CDEM::CustomToolbarItems { } {`
`71`	`71`	`Kratos::ToolbarAddItem "Bulk grouping" [file join $dir images stone.png] [list -np- ::CDEM::xml::BulkGroup] [= "Plugin\nBulk grouping"]`
`72`	`72`	`}`
`73`	`73`
	`74`	`+proc ::CDEM::AfterSaveModel {filespd} {`
	`75`	`+ ::DEM::AfterSaveModel $filespd`
	`76`	`+}`
	`77`	`+`
`74`	`78`	`::CDEM::Init`
Original file line number	Diff line number	Diff line change
`@@ -64,4 +64,8 @@ proc ::DEMPFEM::CustomToolbarItems { } {`
`64`	`64`	`Kratos::ToolbarAddItem "Example" "example.png" [list -np- ::DEMPFEM::examples::InnerSphere] [= "Example\nInnerSphere"]`
`65`	`65`	`}`
`66`	`66`
	`67`	`+proc ::DEMPFEM::AfterSaveModel {filespd} {`
	`68`	`+ ::DEM::AfterSaveModel $filespd`
	`69`	`+}`
	`70`	`+`
`67`	`71`	`::DEMPFEM::Init`
Original file line number	Diff line number	Diff line change
`@@ -65,4 +65,8 @@ proc ::FluidDEM::CustomToolbarItems { } {`
`65`	`65`	`Kratos::ToolbarAddItem "Example" [file join $dir images drop.png] [list -np- ::FluidDEM::examples::CylinderInFlow] [= "Example\nCylinderInFlow"]`
`66`	`66`	`}`
`67`	`67`
	`68`	`+proc ::FluidDEM::AfterSaveModel {filespd} {`
	`69`	`+ ::DEM::AfterSaveModel $filespd`
	`70`	`+}`
	`71`	`+`
`68`	`72`	`::FluidDEM::Init`