Fluid materials in cht

Author: jginternational

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

@@ -50,6 +50,11 @@ proc ::Buoyancy::write::WriteMaterialsFile {{write_const_law True} {include_mode
     Fluid::write::WriteMaterialsFile $write_const_law $include_modelpart_name
 
     # Write Buoyancy materials file
+    set mat_clear [::Buoyancy::write::GetBuoyancyMaterialsFile $write_const_law $include_modelpart_name]
+    write::writePropertiesJsonFileDone "BuoyancyMaterials.json" $clear_mat
+}
+
+proc ::Buoyancy::write::GetBuoyancyMaterialsFile { {write_const_law True} {include_modelpart_name True}  } {
     set model_part_name ""
     if {[write::isBooleanTrue $include_modelpart_name]} {set model_part_name [GetModelPartName]}
 
@@ -59,7 +64,7 @@ proc ::Buoyancy::write::WriteMaterialsFile {{write_const_law True} {include_mode
     set clear_mat [lindex $clear_mat 0]
     dict set clear_mat model_part_name ThermalModelPart
     set clear_mat [dict create properties [list $clear_mat]]
-    write::writePropertiesJsonFileDone "BuoyancyMaterials.json" $clear_mat
+    return $clear_mat
 }
 
 proc ::Buoyancy::write::writeSubModelParts { } {

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

@@ -88,10 +88,21 @@ proc ::ConjugateHeatTransfer::write::PrepareBuoyancy { } {
 }
 
 proc ::ConjugateHeatTransfer::write::WriteMaterialsFile { {write_const_law True} {include_modelpart_name True}  } {
-    Buoyancy::write::WriteMaterialsFile $write_const_law $include_modelpart_name
+    ConjugateHeatTransfer::write::WriteBuoyancyMaterialsFile $write_const_law $include_modelpart_name
     ConvectionDiffusion::write::WriteMaterialsFile False $include_modelpart_name
 }
 
+proc ::ConjugateHeatTransfer::write::WriteBuoyancyMaterialsFile { {write_const_law True} {include_modelpart_name True}  } {
+    ## Write fluid material file
+    set model_part_name ""
+    if {[write::isBooleanTrue $include_modelpart_name]} {set model_part_name [GetAttribute model_part_name]}
+    set fluid_materials [Fluid::write::GetMaterialsFile $write_const_law $include_modelpart_name]
+    write::writePropertiesJsonFileDone [::Fluid::write::GetAttribute materials_file] $fluid_materials
+
+    # Write Buoyancy materials file
+    set buoyancy_material [::Buoyancy::write::GetBuoyancyMaterialsFile]
+    write::writePropertiesJsonFileDone "BuoyancyMaterials.json" $buoyancy_material
+}
 
 proc ::ConjugateHeatTransfer::write::GetAttribute {att} {
     variable writeAttributes

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

@@ -131,11 +131,7 @@ proc Fluid::write::GetMaterialsFile { {write_const_law True} {include_modelpart_
     set model_part_name ""
     if {[write::isBooleanTrue $include_modelpart_name]} {set model_part_name [GetAttribute 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
+
     return $parts
 }