[MPM] Updates by Laura

kratos.gid/apps/MPM/app.json

@@ -42,7 +42,8 @@
     "unique_names": {
         "parts": "MPMParts",
         "nodal_conditions": "MPMNodalConditions",
-        "conditions": "MPMLoads"
+        "conditions": "MPMLoads",
+        "initial_conditions": "MPMInitialConditions"
     },
     "write": {
         "coordinates": "all",

kratos.gid/apps/MPM/examples/CantileverBeam.tcl

@@ -153,8 +153,8 @@ proc ::MPM::examples::CantileverBeam::TreeAssignation2D {args} {
     # Solution strategy parameters
     spdAux::SetValueOnTreeItem v "0.01" MPTimeParameters DeltaTime
     spdAux::SetValueOnTreeItem v "10" MPTimeParameters EndTime
-    spdAux::SetValueOnTreeItem v "wtep" GiDOptions OutputControlType
-    spdAux::SetValueOnTreeItem v "0.1" GiDOptions OutputDeltaTime
-    spdAux::SetValueOnTreeItem v "time" VtkOptions OutputControlType
-    spdAux::SetValueOnTreeItem v "0.1" VtkOptions OutputDeltaTime
+    spdAux::SetValueOnTreeItem v "step" GiDOptions OutputControlType
+    spdAux::SetValueOnTreeItem v "1" GiDOptions OutputDeltaTime
+    spdAux::SetValueOnTreeItem v "step" VtkOptions OutputControlType
+    spdAux::SetValueOnTreeItem v "1" VtkOptions OutputDeltaTime
 }

kratos.gid/apps/MPM/examples/FallingSandBall.tcl

@@ -149,8 +149,8 @@ proc ::MPM::examples::FallingSandBall::TreeAssignation2D {args} {
     # Solution strategy parameters
     spdAux::SetValueOnTreeItem v "0.005" MPTimeParameters DeltaTime
     spdAux::SetValueOnTreeItem v "2" MPTimeParameters EndTime
-    spdAux::SetValueOnTreeItem v "time" GiDOptions OutputControlType
-    spdAux::SetValueOnTreeItem v "0.02" GiDOptions OutputDeltaTime
-    spdAux::SetValueOnTreeItem v "time" VtkOptions OutputControlType
-    spdAux::SetValueOnTreeItem v "0.02" VtkOptions OutputDeltaTime
+    spdAux::SetValueOnTreeItem v "step" GiDOptions OutputControlType
+    spdAux::SetValueOnTreeItem v "4" GiDOptions OutputDeltaTime
+    spdAux::SetValueOnTreeItem v "step" VtkOptions OutputControlType
+    spdAux::SetValueOnTreeItem v "4" VtkOptions OutputDeltaTime
 }

kratos.gid/apps/MPM/examples/GranularFlow.tcl

@@ -152,8 +152,8 @@ proc ::MPM::examples::GranularFlow::TreeAssignation2D {args} {
     # Solution strategy parameters
     spdAux::SetValueOnTreeItem v "0.00005" MPTimeParameters DeltaTime
     spdAux::SetValueOnTreeItem v "2" MPTimeParameters EndTime
-    spdAux::SetValueOnTreeItem v "time" GiDOptions OutputControlType
-    spdAux::SetValueOnTreeItem v "0.01" GiDOptions OutputDeltaTime
-    spdAux::SetValueOnTreeItem v "time" VtkOptions OutputControlType
-    spdAux::SetValueOnTreeItem v "0.01" VtkOptions OutputDeltaTime
+    spdAux::SetValueOnTreeItem v "step" GiDOptions OutputControlType
+    spdAux::SetValueOnTreeItem v "200" GiDOptions OutputDeltaTime
+    spdAux::SetValueOnTreeItem v "step" VtkOptions OutputControlType
+    spdAux::SetValueOnTreeItem v "200" VtkOptions OutputDeltaTime
 }

kratos.gid/apps/MPM/examples/examples.tcl

@@ -10,4 +10,4 @@ proc ::MPM::examples::ErasePreviousIntervals { } {
     foreach int [$root selectNodes "$interval_base/blockdata\[@n='Interval'\]"] {
         if {[$int @name] ni [list Initial Total Custom1]} {$int delete}
     }
-}
+}

kratos.gid/apps/MPM/write/write.tcl

@@ -13,6 +13,7 @@ proc MPM::write::Init { } {
     SetAttribute parts_un [::MPM::GetUniqueName parts]
     SetAttribute nodal_conditions_un [::MPM:::GetUniqueName nodal_conditions]
     SetAttribute conditions_un [::MPM::GetUniqueName conditions]
+    SetAttribute initial_conditions_un [::MPM::GetUniqueName initial_conditions]
 
     SetAttribute writeCoordinatesByGroups [::MPM::GetWriteProperty coordinates]
     SetAttribute main_launch_file [::MPM::GetAttribute main_launch_file]

kratos.gid/apps/MPM/write/writeGrid.tcl

@@ -13,6 +13,8 @@ proc MPM::write::WriteGridMDPA { } {
 
     # Write conditions
     ::write::writeGeometryConnectivities [::write::GetGroupsAssignedIn [GetAttribute conditions_un]]
+    MPM::write::ResetNonConformingPointGeometryIds
+    MPM::write::writePointGeometriesFromNodes [MPM::write::GetNonConformingPointLoadGeometryGroups]
 
     # Write Submodelparts
     writeSubmodelparts grid
@@ -21,19 +23,171 @@ proc MPM::write::WriteGridMDPA { } {
 }
 
 proc MPM::write::writeConditionsSubmodelparts { } {
+    set processed_groups [list ]
+
+    foreach gNode [MPM::write::GetNonConformingPointLoadGeometryGroups] {
+        set group [get_domnode_attribute $gNode n]
+        set group [write::GetWriteGroupName $group]
+        if {$group in $processed_groups} {
+            continue
+        }
+        lappend processed_groups $group
+        write::writeGroupSubModelPartAsGeometry $group 1 1 [MPM::write::GetNonConformingPointGeometryIdsForGroup $group]
+    }
+
     foreach group [MPM::write::GetConditionsGroups] {
+        if {$group in $processed_groups} {
+            continue
+        }
+        lappend processed_groups $group
         write::writeGroupSubModelPartAsGeometry $group
     }
-    foreach group [MPM::write::GetNodalConditionsGroups] {
-        write::writeGroupSubModelPartAsGeometry $group 0
+
+    foreach gNode [::write::GetGroupsAssignedIn [GetAttribute nodal_conditions_un]] {
+        set group [get_domnode_attribute $gNode n]
+        set group [write::GetWriteGroupName $group]
+        if {$group in $processed_groups} {
+            continue
+        }
+        lappend processed_groups $group
+        if {[MPM::write::IsNonConformingPointLoadGroup $gNode]} {
+            write::writeGroupSubModelPartAsGeometry $group 1 1 [MPM::write::GetNonConformingPointGeometryIdsForGroup $group]
+        } else {
+            write::writeGroupSubModelPartAsGeometry $group 0
+        }
     }
 }
 
 proc MPM::write::GetNodalConditionsGroups { } {
     set groups [::write::GetGroupsNamesAssignedIn [GetAttribute nodal_conditions_un]]
     return $groups
 }
+
+proc MPM::write::GetNonConformingPointLoadGeometryGroups { } {
+    set non_conforming_point_load_groups [list ]
+    foreach un [list [GetAttribute conditions_un] [GetAttribute nodal_conditions_un]] {
+        foreach gNode [::write::GetGroupsAssignedIn $un] {
+            if {[MPM::write::IsNonConformingPointLoadGroup $gNode]} {
+                lappend non_conforming_point_load_groups $gNode
+            }
+        }
+    }
+    return $non_conforming_point_load_groups
+}
+
+proc MPM::write::GetNonConformingPointLoadGeometryGroupNames { } {
+    set groups [list ]
+    foreach gNode [MPM::write::GetNonConformingPointLoadGeometryGroups] {
+        set group_name [get_domnode_attribute $gNode n]
+        set group_name [write::GetWriteGroupName $group_name]
+        if {$group_name ni $groups} {
+            lappend groups $group_name
+        }
+    }
+    return $groups
+}
+
+proc MPM::write::writePointGeometriesFromNodes { group_list } {
+    set processed_groups [list ]
+    foreach gNode $group_list {
+        set group [get_domnode_attribute $gNode n]
+        set group [write::GetWriteGroupName $group]
+        if {$group in $processed_groups} {
+            continue
+        }
+        lappend processed_groups $group
+        MPM::write::writePointGeometryFromGroupNodes $group
+    }
+}
+
+proc MPM::write::writePointGeometryFromGroupNodes { group } {
+    set geometry_ids_by_node [MPM::write::EnsureNonConformingPointGeometryIdsForGroup $group]
+    if {[dict size $geometry_ids_by_node] < 1} {
+        return
+    }
+
+    set nDim $::Model::SpatialDimension
+    if {$nDim eq "2Da"} {
+        set nDim "2D"
+    }
+
+    set s [::write::mdpaIndent]
+    ::write::WriteString "${s}Begin Geometries Point${nDim} // GUI group identifier: $group"
+    incr ::write::current_mdpa_indent_level
+    set s1 [::write::mdpaIndent]
+    foreach node_id [lsort -integer [dict keys $geometry_ids_by_node]] {
+        set geometry_id [dict get $geometry_ids_by_node $node_id]
+        ::write::WriteString "${s1}$geometry_id $node_id"
+    }
+    incr ::write::current_mdpa_indent_level -1
+    ::write::WriteString "${s}End Geometries"
+    ::write::WriteString ""
+}
+
+proc MPM::write::ResetNonConformingPointGeometryIds { } {
+    variable non_conforming_point_geometry_ids_by_group
+    variable next_non_conforming_point_geometry_id
+
+    set non_conforming_point_geometry_ids_by_group [dict create]
+    set next_non_conforming_point_geometry_id [expr {[GiD_Info Mesh MaxNumElements] + 1}]
+}
+
+proc MPM::write::EnsureNonConformingPointGeometryIdsForGroup { group } {
+    variable non_conforming_point_geometry_ids_by_group
+    variable next_non_conforming_point_geometry_id
+
+    if {![info exists non_conforming_point_geometry_ids_by_group] || ![info exists next_non_conforming_point_geometry_id]} {
+        MPM::write::ResetNonConformingPointGeometryIds
+    }
+
+    set group [write::GetWriteGroupName $group]
+    if {[dict exists $non_conforming_point_geometry_ids_by_group $group]} {
+        return [dict get $non_conforming_point_geometry_ids_by_group $group]
+    }
+
+    set geometry_ids_by_node [dict create]
+    foreach node_id [lsort -integer [GiD_EntitiesGroups get $group nodes]] {
+        dict set geometry_ids_by_node $node_id $next_non_conforming_point_geometry_id
+        incr next_non_conforming_point_geometry_id
+    }
+    dict set non_conforming_point_geometry_ids_by_group $group $geometry_ids_by_node
+    return $geometry_ids_by_node
+}
+
+proc MPM::write::GetNonConformingPointGeometryIdsForGroup { group } {
+    set geometry_ids_by_node [MPM::write::EnsureNonConformingPointGeometryIdsForGroup $group]
+    set geometry_ids [list ]
+    foreach node_id [lsort -integer [dict keys $geometry_ids_by_node]] {
+        lappend geometry_ids [dict get $geometry_ids_by_node $node_id]
+    }
+    return $geometry_ids
+}
+
+proc MPM::write::IsNonConformingPointLoadGroup { gNode } {
+    set cond_id [get_domnode_attribute [$gNode parent] n]
+    if {$cond_id in [list PointLoad2DMPM PointLoad3DMPM]} {
+        return 1
+    }
+
+    set group_name [get_domnode_attribute $gNode n]
+    if {[string match "Nonconforming Point Load*" $group_name] || [string match "Non-Conforming Load on points*" $group_name]} {
+        return 1
+    }
+
+    set condition [Model::getCondition $cond_id]
+    if {$condition eq ""} {
+        set condition [Model::getNodalConditionbyId $cond_id]
+    }
+    if {$condition eq "" || ![$condition hasAttribute ElementType] || ![$condition hasAttribute ProcessName]} {
+        return 0
+    }
+    return [expr {
+        "Point" in [$condition getAttribute ElementType]
+        && "ApplyMPMParticleNeumannConditionProcess" in [$condition getAttribute ProcessName]
+    }]
+}
+
 proc MPM::write::GetConditionsGroups { } {
     set groups [::write::GetGroupsNamesAssignedIn [GetAttribute conditions_un]]
     return $groups
-}
+}