write materials and submodelparts not repeated

Author: jginternational

kratos.gid/apps/Fluid/write/write.tcl

@@ -1,7 +1,7 @@
 namespace eval ::Fluid::write {
     namespace path ::Fluid
     Kratos::AddNamespace [namespace current]
-
+    
     # Namespace variables declaration
     variable writeCoordinatesByGroups
     variable writeAttributes
@@ -20,7 +20,7 @@ proc ::Fluid::write::Init { } {
     SetAttribute results_un [::Fluid::GetUniqueName results]
     SetAttribute drag_un [::Fluid::GetUniqueName drag]
     SetAttribute time_parameters_un [::Fluid::GetUniqueName time_parameters]
-
+    
     SetAttribute writeCoordinatesByGroups [::Fluid::GetWriteProperty coordinates]
     SetAttribute validApps [list "Fluid"]
     SetAttribute main_launch_file [::Fluid::GetAttribute main_launch_file]
@@ -29,7 +29,7 @@ proc ::Fluid::write::Init { } {
     SetAttribute model_part_name [::Fluid::GetWriteProperty model_part_name]
     SetAttribute output_model_part_name [::Fluid::GetWriteProperty output_model_part_name]
     SetAttribute write_mdpa_mode [::Fluid::GetWriteProperty write_mdpa_mode]
-
+    
     variable last_condition_iterator
     set last_condition_iterator 0
 }
@@ -39,48 +39,48 @@ proc ::Fluid::write::writeModelPartEvent { } {
     # Validation
     set err [Validate]
     if {$err ne ""} {error $err}
-
+    
     InitConditionsMap
-
+    
     # Init data
     write::initWriteConfiguration [GetAttributes]
-
+    
     # Headers
     write::writeModelPartData
     writeProperties
-
+    
     # Nodal coordinates (1: Print only Fluid nodes <inefficient> | 0: the whole mesh <efficient>)
     if {[GetAttribute writeCoordinatesByGroups] ne "all"} {write::writeNodalCoordinatesOnParts} {write::writeNodalCoordinates}
-
+    
     if {[GetAttribute write_mdpa_mode] eq "geometries"} {
         # Write geometries
         # Get the list of groups in the spd
         set lista [::Fluid::xml::GetListOfSubModelParts]
-
+        
         # Write the geometries
         set ret [::write::writeGeometryConnectivities $lista]
 
         # Write the submodelparts
         foreach group $lista {
-            write::writeGroupSubModelPartAsGeometry [$group @n] 
+            write::writeGroupSubModelPartAsGeometry [$group @n]
         }
     } else {
         # Element connectivities (Groups on FLParts)
         write::writeElementConnectivities
-
+        
         # Nodal conditions and conditions
         writeConditions
-
+        
         # Custom SubmodelParts
         variable last_condition_iterator
         write::writeBasicSubmodelPartsByUniqueId $Fluid::write::FluidConditionMap $last_condition_iterator
         # SubmodelParts
         writeMeshes
-
+        
         # Write custom blocks at the end of the file
         writeCustomBlocks
     }
-
+    
     # Clean
     unset ::Fluid::write::FluidConditionMap
 }
@@ -93,30 +93,36 @@ proc ::Fluid::write::writeCustomFilesEvent { } {
 
 # Custom files
 proc ::Fluid::write::WriteMaterialsFile { {write_const_law True} {include_modelpart_name True} } {
+    
     set model_part_name ""
     if {[write::isBooleanTrue $include_modelpart_name]} {set model_part_name [GetAttribute model_part_name]}
-    write::writePropertiesJsonFile [GetAttribute parts_un] [GetAttribute materials_file] $write_const_law $model_part_name
+    write::writePropertiesJsonFileDone [GetAttribute materials_file] [Fluid::write::GetMaterialsFile $write_const_law $include_modelpart_name]
 }
 proc Fluid::write::GetMaterialsFile { {write_const_law True} {include_modelpart_name True} } {
     set model_part_name ""
     if {[write::isBooleanTrue $include_modelpart_name]} {set model_part_name [GetAttribute model_part_name]}
-    return [write::getPropertiesJson [GetAttribute parts_un] $write_const_law $model_part_name]
+    set parts [write::getPropertiesJson [GetAttribute parts_un] $write_const_law $model_part_name]
+    set base [dict create model_part_name [GetAttribute model_part_name] properties_id 0 Material null]
+    set old_list [dict get $parts properties]
+    set new_list [concat [list $base] $old_list]
+    set result [dict create properties $new_list]
+    return $result
 }
 
 proc ::Fluid::write::Validate {} {
     set err ""
     set root [customlib::GetBaseRoot]
-
+    
     # Check only 1 part in Parts
     set xp1 "[spdAux::getRoute [GetAttribute parts_un]]/group"
     if {[llength [$root selectNodes $xp1]] ne 1} {
         set err "You must set one part in Parts.\n"
     }
-
+    
     # Check closed volume
     #if {[CheckClosedVolume] ne 1} {
-    #    append err "Check boundary conditions."
-    #}
+        #    append err "Check boundary conditions."
+        #}
     return $err
 }
 
@@ -140,7 +146,7 @@ proc ::Fluid::write::getFluidModelPartFilename { } {
 proc ::Fluid::write::writeBoundaryConditions { } {
     variable FluidConditionMap
     variable last_condition_iterator
-
+    
     # Prepare the groups to print
     set BCUN [GetAttribute conditions_un]
     set root [customlib::GetBaseRoot]
@@ -160,7 +166,7 @@ proc ::Fluid::write::writeBoundaryConditions { } {
     set skin_group_name "_HIDDEN__SKIN_"
     if {[GiD_Groups exists $skin_group_name]} {GiD_Groups delete $skin_group_name}
     spdAux::MergeGroups $skin_group_name $groups
-
+    
     # Write the conditions
     if {$::Model::SpatialDimension eq "3D"} {
         set kname SurfaceCondition3D3N
@@ -170,7 +176,7 @@ proc ::Fluid::write::writeBoundaryConditions { } {
         set nnodes 2
     }
     set last_condition_iterator [write::writeGroupConditionByUniqueId $skin_group_name $kname $nnodes 0 $::Fluid::write::FluidConditionMap]
-
+    
     # Clean
     GiD_Groups delete $skin_group_name
 }
@@ -189,7 +195,7 @@ proc ::Fluid::write::writeMeshes { } {
 }
 
 proc ::Fluid::write::writeConditionsMesh { } {
-
+    
     set root [customlib::GetBaseRoot]
     set xp1 "[spdAux::getRoute [GetAttribute conditions_un]]/condition/group"
     set grouped_conditions [list ]
@@ -213,7 +219,7 @@ proc ::Fluid::write::writeConditionsMesh { } {
             }
         }
     }
-
+    
     foreach condid $grouped_conditions {
         set xp "[spdAux::getRoute [GetAttribute conditions_un]]/condition\[@n='$condid'\]/group"
         set groups_dict [dict create ]
@@ -227,11 +233,11 @@ proc ::Fluid::write::writeConditionsMesh { } {
 
 # Overwrite this function to print something at the end of the mdpa
 proc ::Fluid::write::writeCustomBlocks { } {
-
+    
 }
 
 proc ::Fluid::write::InitConditionsMap { {map "" } } {
-
+    
     variable FluidConditionMap
     if {$map eq ""} {
         set FluidConditionMap [objarray new intarray [expr [GiD_Info Mesh MaxNumElements] +1] 0]
@@ -240,7 +246,7 @@ proc ::Fluid::write::InitConditionsMap { {map "" } } {
     }
 }
 proc ::Fluid::write::FreeConditionsMap { } {
-
+    
     variable FluidConditionMap
     unset FluidConditionMap
 }

kratos.gid/scripts/Writing/WriteSubModelPart.tcl

@@ -5,7 +5,7 @@ proc write::writeGroupSubModelPart { cid group {what "Elements"} {iniend ""} {ta
     variable formats_dict
 
     set inittime [clock seconds]
-
+    
     set id_f [dict get $formats_dict ID]
     set mid ""
     set what [split $what "&"]
@@ -24,7 +24,7 @@ proc write::writeGroupSubModelPart { cid group {what "Elements"} {iniend ""} {ta
         set f [subst $f]
         dict set gdict $group $f
         incr ::write::current_mdpa_indent_level -2
-
+        
         # Print header
         set s [mdpaIndent]
         WriteString "${s}Begin SubModelPart $mid // Group $group // Subtree $cid"
@@ -74,18 +74,19 @@ proc write::writeGroupSubModelPartAsGeometry { group } {
     variable submodelparts
     variable formats_dict
     variable geometry_cnd_name
-
+    
     set cid $geometry_cnd_name
 
     set inittime [clock seconds]
-
+    
     set id_f [dict get $formats_dict ID]
     set submodelpart_id ""
     set group [GetWriteGroupName $group]
     set submodelpart_id [write::getSubModelPartId "$cid" $group]
-    if {$submodelpart_id eq 0} {
+    if {$submodelpart_id ni $submodelparts} {
         # Add the submodelpart to the catalog
         set submodelpart_id [write::AddSubmodelpart $cid $group]
+        lappend submodelparts $submodelpart_id
         # Prepare the print formats
         incr ::write::current_mdpa_indent_level
         set s1 [mdpaIndent]
@@ -97,7 +98,7 @@ proc write::writeGroupSubModelPartAsGeometry { group } {
         set f [subst $f]
         dict set gdict $group $f
         incr ::write::current_mdpa_indent_level -2
-
+        
         # Print header
         set s [mdpaIndent]
         WriteString "${s}Begin SubModelPart $submodelpart_id // Group $group"
@@ -175,9 +176,9 @@ proc write::_writeElementsForBasicSubmodelParts {un} {
 }
 
 proc write::getSubModelPartNames { args } {
-
+    
     set root [customlib::GetBaseRoot]
-
+    
     set listOfProcessedGroups [list ]
     set groups [list ]
     foreach un $args {
@@ -197,18 +198,18 @@ proc write::getSubModelPartNames { args } {
             if {$gname ni $listOfProcessedGroups} {lappend listOfProcessedGroups $gname}
         }
     }
-
+    
     return $listOfProcessedGroups
 }
 
 
 proc write::GetSubModelPartFromCondition { base_UN condition_id } {
-
+    
     set root [customlib::GetBaseRoot]
-
+    
     set xp1 "[spdAux::getRoute $base_UN]/condition\[@n='$condition_id'\]/group"
     set groups [$root selectNodes $xp1]
-
+    
     set submodelpart_list [list ]
     foreach gNode $groups {
         set group [$gNode @n]