MIGRATION - Write as geometries

kratos.gid/apps/Buoyancy/app.json

@@ -38,7 +38,7 @@
         "coordinates": "all",
         "properties_location": "json",
         "model_part_name": "ThermalModelPart",
-        "write_mdpa_mode": "entities"
+        "write_mdpa_mode": "geometries"
     },
     "main_launch_file": "../../exec/MainKratos.py",
     "examples": "examples/examples.xml"

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

@@ -10,6 +10,7 @@ proc ::Buoyancy::write::Init { } {
     # Add thermal unique names to Fluid write variables
     Fluid::write::SetAttribute thermal_bc_un [ConvectionDiffusion::write::GetAttribute conditions_un]
     Fluid::write::SetAttribute thermal_initial_cnd_un [ConvectionDiffusion::write::GetAttribute nodal_conditions_un]
+
 }
 
 # Events
@@ -18,39 +19,17 @@ proc ::Buoyancy::write::writeModelPartEvent { } {
     set err [Validate]
     if {$err ne ""} {error $err}
 
-    # Start Fluid write variables
-    Fluid::write::Init
-    # Fluid has implemented the geometry mode, but we do not use it yet in inherited apps
-    ::Fluid::write::SetAttribute write_mdpa_mode [::Buoyancy::GetWriteProperty write_mdpa_mode]
-    # Start Fluid write conditions map from scratch
-    Fluid::write::InitConditionsMap
-
-    # Init data
-    write::initWriteConfiguration [Fluid::write::GetAttributes]
-
-    # Headers
-    write::writeModelPartData
-    Fluid::write::writeProperties
-
-    # Nodal coordinates (1: Print only Fluid nodes <inefficient> | 0: the whole mesh <efficient>)
-    if {[Fluid::write::GetAttribute writeCoordinatesByGroups] ne "all"} {write::writeNodalCoordinatesOnParts} {write::writeNodalCoordinates}
+    ::Fluid::write::Init
 
-    # Element connectivities (Groups on FLParts)
-    write::writeElementConnectivities
+    set fluid_base_xpath [spdAux::getRoute Buoyancy_FL]
+    set fluid_base [[customlib::GetBaseRoot] selectNodes $fluid_base_xpath]
+    set ::Fluid::write::base_root $fluid_base
+
+    ::Fluid::write::writeModelPartEvent
 
-    # Nodal conditions and conditions
-    Fluid::write::writeConditions
+    # Write Boussinesq submodel part as nodals
+    ::Buoyancy::write::writeBoussinesqSubModelPart
 
-    # SubmodelParts
-    Fluid::write::writeMeshes
-    write::writeNodalConditions [GetAttribute thermal_initial_cnd_un]
-    Buoyancy::write::writeSubModelParts
-
-    # Boussinesq nodes
-    Buoyancy::write::writeBoussinesqSubModelPart
-
-    # Custom SubmodelParts
-    #write::writeBasicSubmodelParts [Fluid::write::getLastConditionId]
 }
 
 proc ::Buoyancy::write::writeCustomFilesEvent { } {
@@ -71,9 +50,22 @@ proc ::Buoyancy::write::WriteMaterialsFile {{write_const_law True} {include_mode
     Fluid::write::WriteMaterialsFile $write_const_law $include_modelpart_name
 
     # Write Buoyancy materials file
-    set model_part_name ""
-    if {[write::isBooleanTrue $include_modelpart_name]} {set model_part_name [GetModelPartName]}
-    write::writePropertiesJsonFile [GetAttribute parts_un] "BuoyancyMaterials.json" $write_const_law $model_part_name
+    set clear_mat [::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} {model_part_name ""} } {
+
+    if {[write::isBooleanTrue $include_modelpart_name] && $model_part_name eq ""} {set model_part_name [GetModelPartName]}
+
+    set mats [write::getPropertiesJson [GetAttribute parts_un] $write_const_law $model_part_name]
+
+    # keep only first entry
+    set clear_mat [dict get $mats properties]
+    set clear_mat [lindex $clear_mat 0]
+    dict set clear_mat model_part_name ThermalModelPart
+    set clear_mat [dict create properties [list $clear_mat]]
+    return $clear_mat
 }
 
 proc ::Buoyancy::write::writeSubModelParts { } {
@@ -100,7 +92,7 @@ proc ::Buoyancy::write::writeBoussinesqSubModelPart { } {
     set groupid "_Boussinesq_hidden_"
     GiD_Groups create $groupid
     GiD_EntitiesGroups assign $groupid nodes [GiD_Mesh list node]
-    ::write::writeGroupSubModelPart Boussinesq $groupid "Nodes"
+    ::write::writeGroupSubModelPartAsGeometry $groupid
     GiD_Groups delete $groupid
 }
 

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

@@ -1,5 +1,5 @@
 # Project Parameters
-proc ::Buoyancy::write::getParametersDict { } {
+proc ::Buoyancy::write::getParametersDict { {stage ""} } {
     set projectParametersDict [dict create]
 
     # Analysis stage field
@@ -20,6 +20,9 @@ proc ::Buoyancy::write::getParametersDict { } {
     # processes
     dict set projectParametersDict processes [Buoyancy::write::GetProcesses_Dict]
 
+    # modelers
+    set projectParametersDict [::write::GetModelersDict $projectParametersDict $stage]
+
     return $projectParametersDict
 }
 
@@ -78,18 +81,22 @@ proc ::Buoyancy::write::GetSolverSettings_Dict { } {
 
     # Fluid things
     write::SetConfigurationAttributes [Fluid::write::GetAttributes]
-    #Fluid::write::SetAttribute materials_file "BuoyancyMaterials.json"
     dict set settings fluid_solver_settings [Fluid::write::getSolverSettingsDict]
+    dict unset settings fluid_solver_settings model_import_settings
+    dict set settings fluid_solver_settings model_import_settings input_type "use_input_model_part"
 
     set nDim [expr [string range [write::getValue nDim] 0 0]]
     dict set settings fluid_solver_settings domain_size $nDim
 
     # Thermal things
     set prev [ConvectionDiffusion::write::GetAttribute materials_file]
     ConvectionDiffusion::write::SetAttribute materials_file "BuoyancyMaterials.json"
-    write::SetConfigurationAttributes [ConvectionDiffusion::write::GetAttributes]
+    # write::SetConfigurationAttributes [ConvectionDiffusion::write::GetAttributes]
     dict set settings thermal_solver_settings [ConvectionDiffusion::write::GetSolverSettingsDict]
     ConvectionDiffusion::write::SetAttribute materials_file $prev
+
+    dict unset settings thermal_solver_settings model_import_settings
+    dict set settings thermal_solver_settings model_import_settings input_type "use_input_model_part"
 
     dict set settings thermal_solver_settings problem_domain_sub_model_part_list [list [dict get $settings fluid_solver_settings volume_model_part_name]]
 
@@ -101,7 +108,7 @@ proc ::Buoyancy::write::GetProcesses_Dict { } {
     write::SetConfigurationAttributes [Fluid::write::GetAttributes]
     lappend constraints_process_list {*}[write::getConditionsParametersDict [Fluid::write::GetAttribute conditions_un] ]
     lappend constraints_process_list {*}[write::getConditionsParametersDict [Fluid::write::GetAttribute nodal_conditions_un] "Nodal"]
-    write::SetConfigurationAttributes [ConvectionDiffusion::write::GetAttributes]
+    # write::SetConfigurationAttributes [ConvectionDiffusion::write::GetAttributes]
     lappend constraints_process_list {*}[write::getConditionsParametersDict [ConvectionDiffusion::write::GetAttribute nodal_conditions_un] "Nodal"]
     lappend constraints_process_list {*}[write::getConditionsParametersDict [ConvectionDiffusion::write::GetAttribute conditions_un]]
     lappend constraints_process_list [GetBoussinesqProcess]
@@ -123,4 +130,4 @@ proc ::Buoyancy::write::GetBoussinesqProcess { } {
     dict set process Parameters $params
 
     return $process
-}
+}

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

@@ -2,7 +2,7 @@
 
 <container n="Buoyancy" pn="Buoyancy" icon="app" prefix="Buoyancy_" tree_state="open" open_window="0">
 
-    <container n="Fluid" pn="Fluid" icon="units" prefix="FL" tree_state="open" open_window="0">
+    <container n="Fluid" pn="Fluid" icon="units" prefix="FL" un="Buoyancy_FL" tree_state="open" open_window="0">
         <include n="AnalysisType" active="1" path="apps/Fluid/xml/AnalysisType.spd"/>
         <include n="Parts" active="1" path="apps/Fluid/xml/Parts.spd"/>
         <include n="InitialConditions" active="1" path="apps/Fluid/xml/InitialConditions.spd"/>
@@ -11,7 +11,7 @@
         <include n="Materials" active="1" path="apps/Fluid/xml/Materials.spd"/>
     </container>
 
-    <container n="ConvectionDiffusion" pn="Thermal" icon="app" prefix="CNVDFF" tree_state="open" open_window="0">
+    <container n="ConvectionDiffusion" pn="Thermal" icon="app" prefix="CNVDFF" un="Buoyancy_CNVDFF" tree_state="open" open_window="0">
         <include n="StageInfo" active="1" path="apps/ConvectionDiffusion/xml/StageInfo.spd"/>
         <!-- <include n="Parts" active="1" state="hidden" path="apps/ConvectionDiffusion/xml/Parts.spd"/> -->
         <include n="InitialConditions" active="1" path="apps/ConvectionDiffusion/xml/InitialConditions.spd"/>

kratos.gid/apps/CompressibleFluid/app.json

@@ -43,7 +43,7 @@
         "properties_location": "json",
         "model_part_name": "FluidModelPart",
         "output_model_part_name": "fluid_computational_model_part",
-        "write_mdpa_mode": "entities"
+        "write_mdpa_mode": "geometries"
     },
     "main_launch_file": "python/MainKratos.py",
     "examples": "examples/examples.xml",

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

@@ -1,5 +1,6 @@
 proc ::CompressibleFluid::write::writeParametersEvent { } {
     set projectParametersDict [Fluid::write::getParametersDict]
+    set projectParametersDict [::write::GetModelersDict $projectParametersDict]
 
     set shock_capturing_type [dict get $projectParametersDict solver_settings shock_capturing_type]
     dict set projectParametersDict solver_settings shock_capturing_settings type $shock_capturing_type

kratos.gid/apps/CompressibleFluid/xml/Conditions.xml

@@ -113,7 +113,7 @@
                  unit_magnitude="M/T/L^2">
     <TopologyFeatures>
       <item GeometryType="Line" nodes="2" KratosName="WallCondition2D2N"/>
-      <item GeometryType="Point" nodes="1" KratosName="WallCondition2D1N"/>
+      <item GeometryType="Point" nodes="1" KratosName="PointCondition3D1N"/>
     </TopologyFeatures>
     <DegreesOfFreedom></DegreesOfFreedom>
     <inputs></inputs>

kratos.gid/apps/ConjugateHeatTransfer/app.json

@@ -38,7 +38,8 @@
     "write": {
         "coordinates": "groups",
         "properties_location": "json",
-        "model_part_name": "ThermalModelPart"
+        "model_part_name": "ThermalModelPart",
+        "write_mdpa_mode": "geometries"
     },
     "main_launch_file": "../../exec/MainKratos.py",
     "examples": "examples/examples.xml"

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

@@ -7,6 +7,8 @@ namespace eval ::ConjugateHeatTransfer::write {
     variable writeAttributes
     variable fluid_domain_solver_settings
     variable solid_domain_solver_settings
+
+    variable mdpa_files
 }
 
 proc ::ConjugateHeatTransfer::write::Init { } {
@@ -20,6 +22,7 @@ proc ::ConjugateHeatTransfer::write::Init { } {
     SetAttribute model_part_name [::ConjugateHeatTransfer::GetWriteProperty model_part_name]
 
     SetAttribute coordinates [::ConjugateHeatTransfer::GetWriteProperty coordinates]
+    SetAttribute write_mdpa_mode [::ConvectionDiffusion::GetWriteProperty write_mdpa_mode]
 
     SetAttribute fluid_mdpa_suffix Fluid
     SetAttribute solid_mdpa_suffix Solid
@@ -28,10 +31,14 @@ proc ::ConjugateHeatTransfer::write::Init { } {
     variable solid_domain_solver_settings
     set fluid_domain_solver_settings [dict create]
     set solid_domain_solver_settings [dict create]
+
+    variable mdpa_files
+    set mdpa_files []
 }
 
 # Events
 proc ::ConjugateHeatTransfer::write::writeModelPartEvent { } {
+    variable mdpa_files
     # Validation
     set err [Validate]
     if {$err ne ""} {error $err}
@@ -41,13 +48,22 @@ proc ::ConjugateHeatTransfer::write::writeModelPartEvent { } {
     # Buoyancy mdpa
     ::ConjugateHeatTransfer::write::PrepareBuoyancy
     write::writeAppMDPA Buoyancy
-    write::RenameFileInModel "$filename.mdpa" "${filename}_[GetAttribute fluid_mdpa_suffix].mdpa"
+    set buoyancy_mdpa "${filename}_[GetAttribute fluid_mdpa_suffix]"
+    write::RenameFileInModel "$filename.mdpa" ${buoyancy_mdpa}.mdpa
+    lappend mdpa_files $buoyancy_mdpa
 
     # Convection diffusion mdpa
     ConvectionDiffusion::write::Init
     ConvectionDiffusion::write::SetAttribute writeCoordinatesByGroups [GetAttribute coordinates]
+
+    set base_root_xpath [spdAux::getRoute CHTCNVDFF]
+    set base_root [[customlib::GetBaseRoot] selectNodes $base_root_xpath]
+    set ::ConvectionDiffusion::write::base_root $base_root
+
     write::writeAppMDPA ConvectionDiffusion
-    write::RenameFileInModel "$filename.mdpa" "${filename}_[GetAttribute solid_mdpa_suffix].mdpa"
+    set convdif_mdpa "${filename}_[GetAttribute solid_mdpa_suffix]"
+    write::RenameFileInModel "$filename.mdpa" ${convdif_mdpa}.mdpa
+    lappend mdpa_files $convdif_mdpa
 }
 
 proc ::ConjugateHeatTransfer::write::writeCustomFilesEvent { } {
@@ -69,16 +85,37 @@ proc ::ConjugateHeatTransfer::write::PrepareBuoyancy { } {
     Fluid::write::SetAttribute thermal_bc_un Buoyancy_CNVDFFBC
     Fluid::write::SetAttribute thermal_initial_cnd_un Buoyancy_CNVDFFNodalConditions
     Fluid::write::SetCoordinatesByGroups [GetAttribute coordinates]
+    set base_root_xpath [spdAux::getRoute CHTBuoyancy]
+    set base_root [[customlib::GetBaseRoot] selectNodes $base_root_xpath]
+    set ::Fluid::write::base_root $base_root
 }
 
 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_const_law $include_modelpart_name FluidThermalModelPart]
+    set clear_mat [dict get $buoyancy_material properties]
+    set clear_mat [lindex $clear_mat 0]
+    dict set clear_mat model_part_name FluidThermalModelPart
+    set clear_mat [dict create properties [list $clear_mat]]
+    write::writePropertiesJsonFileDone "BuoyancyMaterials.json" $clear_mat
+}
 
 proc ::ConjugateHeatTransfer::write::GetAttribute {att} {
     variable writeAttributes
+    if {![dict exists $writeAttributes $att]} {
+        return ""
+    }
     return [dict get $writeAttributes $att]
 }