Pfem melting application

kratos.gid/apps/Buoyancy/write/writeProjectParameters.tcl

@@ -12,7 +12,7 @@ proc ::Buoyancy::write::getParametersDict { } {
     dict set projectParametersDict output_processes [write::GetDefaultOutputProcessDict]
 
     # restart options
-    dict set projectParametersDict restart_options [Buoyancy::write::GetRestart_Dict]
+    dict set projectParametersDict restart_options [::write::GetDefaultRestartDict]
 
     # solver settings
     dict set projectParametersDict solver_settings [Buoyancy::write::GetSolverSettings_Dict]
@@ -55,14 +55,6 @@ proc ::Buoyancy::write::GetProblemData_Dict { } {
     # dict set problemDataDict model_part_name "ThermalModelPart"
 }
 
-proc ::Buoyancy::write::GetRestart_Dict { } {
-
-    set restartDict [dict create]
-    dict set restartDict SaveRestart False
-    dict set restartDict RestartFrequency 0
-    dict set restartDict LoadRestart False
-    dict set restartDict Restart_Step 0
-}
 
 proc ::Buoyancy::write::GetSolverSettings_Dict { } {
     set settings [dict create]

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

@@ -5,6 +5,11 @@
 		return "normal"
 	  ]]>
 	</proc>
+	<proc n='AfterApplyParts' args='args'>
+		<![CDATA[
+			Fluid::xml::ProcAfterApplyParts $domNode
+		]]>
+	</proc>
 	<proc n='CheckIdOnMyParent' args='args'>
 		<![CDATA[
 		set r "hidden"
@@ -132,8 +137,8 @@
 		}
 	]]>
 	</proc>
-		<proc n='HideIfElement' args='args'>
-	  <![CDATA[
+	<proc n='HideIfElement' args='args'>
+		<![CDATA[
 		return [Fluid::xml::ProcHideIfElement $domNode {*}$args]
 	  ]]>
 	</proc>

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

@@ -40,6 +40,8 @@ proc ::Buoyancy::xml::getUniqueName {name} {
 proc ::Buoyancy::xml::CustomTree { args } {
     spdAux::parseRoutes
 
+    set prev_active_app [[apps::getActiveApp] getName]
+
     apps::setActiveAppSoft Fluid
     Fluid::xml::CustomTree
 
@@ -54,4 +56,6 @@ proc ::Buoyancy::xml::CustomTree { args } {
 
     # Hide Fluid gravity -> Boussinesq
     spdAux::SetValueOnTreeItem state hidden FLGravity
+
+    apps::setActiveAppSoft $prev_active_app
 }

kratos.gid/apps/Common/xml/BoundaryConditions.spd

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container n="BoundaryConditions" pn="Conditions" un="BC" icon="nodal" open_window="0">
+	<dynamicnode command="spdAux::injectConditions" args=""/>
+</container>

kratos.gid/apps/Common/xml/Materials.spd

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container n="materials" pn="Materials" un="Materials" icon="material16" help="Materials database" open_window="0">
+    <dynamicnode command="spdAux::injectMaterials" args=""/>
+</container>

kratos.gid/apps/ConjugateHeatTransfer/write/writeProjectParameters.tcl

@@ -17,7 +17,7 @@ proc ::ConjugateHeatTransfer::write::getParametersDict { } {
     dict set projectParametersDict output_processes [ConjugateHeatTransfer::write::GetOutputProcessesList]
 
     # Restart options
-    dict set projectParametersDict restart_options [write::GetDefaultRestartDict]
+    dict set projectParametersDict restart_options [::write::GetDefaultRestartDict]
 
     # processes
     dict set projectParametersDict processes [ConjugateHeatTransfer::write::GetProcessList]

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

@@ -5,6 +5,11 @@
 		return "normal"
 	  ]]>
 	</proc>
+	<proc n='AfterApplyParts' args='args'>
+		<![CDATA[
+			Fluid::xml::ProcAfterApplyParts $domNode
+		]]>
+	</proc>
 	<proc n='CheckIdOnMyParent' args='args'>
 		<![CDATA[
 		set r "hidden"
@@ -61,7 +66,7 @@
         lappend arguments "SolutionType" $solutionType
         #W "arguments $arguments"
 		set Sols [::Model::GetSolutionStrategies $arguments ]
-    set ids [list ]
+    	set ids [list ]
 		foreach ss $Sols {
 			lappend ids [$ss getName]
 			append names [$ss getName] ","

kratos.gid/apps/ConvectionDiffusion/write/writeProjectParameters.tcl

@@ -29,8 +29,7 @@ proc ::ConvectionDiffusion::write::getParametersDict { } {
     dict set restartDict RestartFrequency 0
     dict set restartDict LoadRestart False
     dict set restartDict Restart_Step 0
-    dict set projectParametersDict restart_options $restartDict
-
+    dict set projectParametersDict restart_options [::write::GetDefaultRestartDict]
 
     return $projectParametersDict
 }

kratos.gid/apps/ConvectionDiffusion/xml/Strategies.xml

@@ -72,7 +72,8 @@
 				<parameter n="solution_relative_tolerance" pn="Temperature relative tolerance" type="double" v="1e-5" parent="displacement_criterion,and_criterion,or_criterion" help="Relative temperature tolerance employed in the nonlinear iteration"/>
 				<parameter n="solution_absolute_tolerance" pn="Temperature absolute tolerance" type="double" v="1e-7" parent="displacement_criterion,and_criterion,or_criterion" help="Absolute temperature tolerance employed in the nonlinear iteration"/>
 				<parameter n="residual_relative_tolerance" pn="Residual relative tolerance" type="double" v="1e-5" parent="residual_criterion,and_criterion,or_criterion" help="Relative residual tolerance employed in the nonlinear iteration"/>
-				<parameter n="residual_absolute_tolerance" pn="Residual absolute tolerance" type="double" v="1e-7" parent="residual_criterion,and_criterion,or_criterion" help="Absolute residual tolerance employed in the nonlinear iteration"/></parameter>
+				<parameter n="residual_absolute_tolerance" pn="Residual absolute tolerance" type="double" v="1e-7" parent="residual_criterion,and_criterion,or_criterion" help="Absolute residual tolerance employed in the nonlinear iteration"/>
+			</parameter>
         </parameter_list>
 
 		<!-- linear solver settings -->

kratos.gid/apps/DEM/app.json

@@ -26,6 +26,7 @@
         "write/write_utils.tcl",
         "examples/examples.tcl",
         "examples/SpheresDrop.tcl",
+        "examples/SpheresDropForTest.tcl",
         "examples/CirclesDrop.tcl"
     ],
     "start_script": "::DEM::Init",
@@ -38,12 +39,13 @@
         "show_toolbar": true,
         "intervals": true,
         "wizard": false,
-        "import_files": true
+        "import_files":true
     },
     "unique_names": {
         "parts": "DEMParts",
-        "nodal_conditions": "DEMNodalConditions",
+        "init_conditions": "DEMInitialConditions",
         "conditions": "DEMConditions",
+        "loads": "DEMFEMLoads",
         "materials": "DEMMaterials"
     },
     "write": {

kratos.gid/apps/DEM/examples/SpheresDropForTest.tcl

@@ -0,0 +1,131 @@
+namespace eval ::DEM::examples::SpheresDropForTest {
+    namespace path ::DEM::examples
+    Kratos::AddNamespace [namespace current]
+
+}
+
+proc ::DEM::examples::SpheresDropForTest::Init {args} {
+    if {![Kratos::IsModelEmpty]} {
+        set txt "We are going to draw the example geometry.\nDo you want to discard your previous work?"
+        set retval [tk_messageBox -default ok -icon question -message $txt -type okcancel]
+        if { $retval == "cancel" } { return }
+    }
+
+    DrawGeometry
+    AssignToTree
+    AssignMeshSize
+
+    GiD_Process 'Redraw
+    GidUtils::UpdateWindow GROUPS
+    GidUtils::UpdateWindow LAYER
+}
+
+proc ::DEM::examples::SpheresDropForTest::DrawGeometry { } {
+    Kratos::ResetModel
+
+    # Draw floor surface
+    GiD_Process Mescape Geometry Create Object Rectangle -5 -5 0 5 5 0 escape
+    # Draw inlet surface
+    GiD_Process Mescape Geometry Create Object Rectangle -2 -2 5 2 2 5 escape
+    # Draw the cluster inlet
+    GiD_Process Mescape Geometry Create Object Rectangle -2 -2 6 2 2 6 escape
+    # Draw the volume meshed with spheres
+    GiD_Process Mescape Geometry Create Object Sphere 0 0 2 1 escape escape
+
+    # Group creation
+    GiD_Groups create "Floor"
+    GiD_Groups create "Inlet"
+    #GiD_Groups create "ClusterInlet"
+    GiD_Groups create "Body"
+
+    # Group assignation
+    GiD_EntitiesGroups assign "Floor" surfaces 1
+    GiD_EntitiesGroups assign "Inlet" surfaces 2
+    #GiD_EntitiesGroups assign "ClusterInlet" surfaces 3
+    GiD_EntitiesGroups assign "Body" volumes 1
+}
+
+proc ::DEM::examples::SpheresDropForTest::AssignToTree { } {
+    # Material
+    set DEMmaterials [spdAux::getRoute "DEMMaterials"]
+    set props [list PARTICLE_DENSITY 2500.0 YOUNG_MODULUS 1.0e6]
+    set material_node [[customlib::GetBaseRoot] selectNodes "$DEMmaterials/blockdata\[@name = 'DEM-DefaultMaterial' \]"]
+    spdAux::SetValuesOnBaseNode $material_node $props
+
+    # DParts
+    set DEMParts [spdAux::getRoute "DEMParts"]/condition\[@n='Parts_DEM'\]
+    set DEMPartsNode [customlib::AddConditionGroupOnXPath $DEMParts Body]
+    $DEMPartsNode setAttribute ov volume
+    set props [list Material "DEM-DefaultMaterial"]
+    spdAux::SetValuesOnBaseNode $DEMPartsNode $props
+
+    # WallParts
+    set FEMParts_floor [spdAux::getRoute "DEMParts"]/condition\[@n='Parts_FEM'\]
+    set FEMParts_floorNode [customlib::AddConditionGroupOnXPath $FEMParts_floor Floor]
+    $FEMParts_floorNode setAttribute ov surface
+    set props [list Material "DEM-DefaultMaterial"]
+    spdAux::SetValuesOnBaseNode $FEMParts_floorNode $props
+
+
+    # BC over floor
+    set FloorBC {container[@n='DEM']/container[@n='BoundaryConditions']/condition[@n='FEMVelocity']}
+    #Velocity over walls is the name on the tree (pn)
+    set FloorBCNode [customlib::AddConditionGroupOnXPath $FloorBC Floor]
+    $FloorBCNode setAttribute ov surface
+    set props [list selector_component_X ByValue value_component_X 1.0 selector_component_Y ByValue value_component_Y 0.0 selector_component_Z ByValue value_component_Z 0.0 Interval Total]
+    spdAux::SetValuesOnBaseNode $FloorBCNode $props
+
+
+    # InletPart
+    set FEMParts_inlet [spdAux::getRoute "DEMParts"]/condition\[@n='Parts_FEM'\]
+    set FEMParts_inletNode [customlib::AddConditionGroupOnXPath $FEMParts_inlet Inlet]
+    $FEMParts_inletNode setAttribute ov surface
+    set props [list Material "DEM-DefaultMaterial"]
+    spdAux::SetValuesOnBaseNode $FEMParts_inletNode $props
+
+    # BC over Inlet
+    set InletBC {container[@n='DEM']/container[@n='BoundaryConditions']/condition[@n='FEMVelocity']}
+    #Velocity over walls is the name on the tree (pn)
+    set InletBCNode [customlib::AddConditionGroupOnXPath $InletBC Inlet]
+    $InletBCNode setAttribute ov surface
+    set props [list selector_component_X ByValue value_component_X 2.0 selector_component_Y ByValue value_component_Y 0.0 selector_component_Z ByValue value_component_Z 0.0 Interval Total]
+    spdAux::SetValuesOnBaseNode $InletBCNode $props
+
+    # Inlet
+    set InletVars {container[@n='DEM']/container[@n='Particle Injectors']/condition[@n='DEMInlet']}
+    set InletVarsNode [customlib::AddConditionGroupOnXPath $InletVars Inlet]
+    $InletVarsNode setAttribute ov surface
+    set props [list Material "DEM-DefaultMaterial" ParticleDiameter 0.13 InVelocityModulus 2.3 InDirectionVector "0.0,0.0,-1.0"]
+    spdAux::SetValuesOnBaseNode $InletVarsNode $props
+
+
+
+    # # ClusterInlet
+    # set DEMClusterInlet "$DEMConditions/condition\[@n='Inlet'\]"
+    # set inletNode [customlib::AddConditionGroupOnXPath $DEMClusterInlet "ClusterInlet"]
+    # $inletNode setAttribute ov surface
+    # set props [list Material "DEM-DefaultMaterial" InletElementType "Cluster3D" ClusterType "Rock1Cluster3D" ParticleDiameter 0.13 InVelocityModulus 2.3 InDirectionVector "0.0,0.0,1.0"]
+
+    # spdAux::SetValuesOnBaseNode $inletNode $props
+
+    # # DEM custom submodelpart
+    # set custom_dem "$DEMConditions/condition\[@n='DEM-CustomSmp'\]"
+    # set customNode [customlib::AddConditionGroupOnXPath $custom_dem Body]
+    # $customNode setAttribute ov volume
+
+    # # General data
+    # # Time parameters
+    # set change_list [list EndTime 5 DeltaTime 1e-5 NeighbourSearchFrequency 50]
+    # set xpath [spdAux::getRoute DEMTimeParameters]
+    # spdAux::SetValuesOnBasePath $xpath $change_list
+
+    spdAux::RequestRefresh
+}
+
+proc ::DEM::examples::SpheresDropForTest::AssignMeshSize { } {
+    GiD_Process Mescape Meshing ElemType Sphere Volumes 1 escape
+    GiD_Process Mescape Meshing AssignSizes Volumes 0.2 1:end escape escape escape
+    GiD_Process Mescape Meshing AssignSizes Surfaces 0.2 1:end escape escape escape
+    GiD_Process Mescape Meshing AssignSizes Lines 0.2 1:end escape escape escape
+}
+

kratos.gid/apps/DEM/examples/examples.xml

@@ -6,4 +6,7 @@
     <Example id="DEMDrop3D" app="DEM" logo="SpheresDrop.png" name="DEM spheres drop 3D" dim="3D" cmd="::DEM::examples::SpheresDrop::Init">
         <Description></Description>
     </Example>
+    <Example id="DEMDrop3DTest" app="DEM" logo="SpheresDrop.png" name="Test new interface" dim="3D" cmd="::DEM::examples::SpheresDropForTest::Init">
+        <Description></Description>
+    </Example>
 </Group>

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

@@ -20,8 +20,9 @@ proc ::DEM::write::Init { } {
     SetAttribute properties_location [::DEM::GetWriteProperty properties_location]
     SetAttribute parts_un [::DEM::GetUniqueName parts]
     SetAttribute materials_un [::DEM::GetUniqueName materials]
+    SetAttribute init_conditions_un [::DEM::GetUniqueName init_conditions]
     SetAttribute conditions_un [::DEM::GetUniqueName conditions]
-    SetAttribute nodal_conditions_un [::DEM::GetUniqueName nodal_conditions]
+    SetAttribute loads_un [::DEM::GetUniqueName loads]
     SetAttribute materials_file [::DEM::GetWriteProperty materials_file]
     SetAttribute main_launch_file [::DEM::GetAttribute main_launch_file]