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,13 @@ 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}
-
-    # Element connectivities (Groups on FLParts)
-    write::writeElementConnectivities
-
-    # Nodal conditions and conditions
-    Fluid::write::writeConditions
-
-    # SubmodelParts
-    Fluid::write::writeMeshes
-    write::writeNodalConditions [GetAttribute thermal_initial_cnd_un]
-    Buoyancy::write::writeSubModelParts
+    ::Fluid::write::Init
+
+    ::Fluid::write::writeModelPartEvent
 
-    # Boussinesq nodes
-    Buoyancy::write::writeBoussinesqSubModelPart
+    # Write Boussinesq submodel part as nodals
+    ::Buoyancy::write::writeBoussinesqSubModelPart
 
-    # Custom SubmodelParts
-    #write::writeBasicSubmodelParts [Fluid::write::getLastConditionId]
 }
 
 proc ::Buoyancy::write::writeCustomFilesEvent { } {
@@ -73,7 +48,14 @@ proc ::Buoyancy::write::WriteMaterialsFile {{write_const_law True} {include_mode
     # 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 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]]
+    write::writePropertiesJsonFileDone "BuoyancyMaterials.json" $clear_mat
 }
 
 proc ::Buoyancy::write::writeSubModelParts { } {
@@ -100,7 +82,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

@@ -20,6 +20,9 @@ proc ::Buoyancy::write::getParametersDict { } {
     # processes
     dict set projectParametersDict processes [Buoyancy::write::GetProcesses_Dict]
 
+    # modelers
+    set projectParametersDict [::write::GetModelersDict $projectParametersDict]
+
     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/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/ConvectionDiffusion/app.json

@@ -41,7 +41,8 @@
         "materials_file": "ConvectionDiffusionMaterials.json",
         "properties_location": "json",
         "model_part_name": "ThermalModelPart",
-        "output_model_part_name": ""
+        "output_model_part_name": "",
+        "write_mdpa_mode": "geometries"
     },
     "main_launch_file": "../../exec/MainKratos.py",
     "examples": "examples/examples.xml"

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

@@ -25,6 +25,8 @@ proc ::ConvectionDiffusion::write::Init { } {
     SetAttribute properties_location [::ConvectionDiffusion::GetWriteProperty properties_location]
     SetAttribute model_part_name [::ConvectionDiffusion::GetWriteProperty model_part_name]
     SetAttribute output_model_part_name [::ConvectionDiffusion::GetWriteProperty output_model_part_name]
+    SetAttribute write_mdpa_mode [::ConvectionDiffusion::GetWriteProperty write_mdpa_mode]
+
 }
 
 # Events
@@ -42,19 +44,33 @@ proc ::ConvectionDiffusion::write::writeModelPartEvent { } {
 
     # 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"} {
+
+        # Get the list of groups in the spd
+        set lista [::spdAux::GetListOfSubModelParts]
+
+        # Write the geometries
+        set ret [::write::writeGeometryConnectivities $lista]
+
+        foreach group $lista {
+            write::writeGroupSubModelPartAsGeometry [$group @n]
+        }
 
-    # Element connectivities (Groups on CNVDFFParts)
-    write::writeElementConnectivities
+    } else {
 
-    # Nodal conditions and conditions
-    writeConditions
+        # Element connectivities (Groups on CNVDFFParts)
+        write::writeElementConnectivities
 
-    # Custom SubmodelParts
-    write::writeBasicSubmodelParts [getLastConditionId]
+        # Nodal conditions and conditions
+        writeConditions
 
-    # SubmodelParts
-    writeMeshes
+        # Custom SubmodelParts
+        write::writeBasicSubmodelParts [getLastConditionId]
 
+        # SubmodelParts
+        writeMeshes
+    }
 }
 
 proc ::ConvectionDiffusion::write::writeCustomFilesEvent { } {

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

@@ -31,6 +31,8 @@ proc ::ConvectionDiffusion::write::getParametersDict { } {
     dict set restartDict Restart_Step 0
     dict set projectParametersDict restart_options $restartDict
 
+    # Get the modelers
+    set projectParametersDict [write::GetModelersDict $projectParametersDict]
 
     return $projectParametersDict
 }

kratos.gid/apps/EmbeddedFluid/app.json

@@ -41,7 +41,7 @@
         "coordinates": "all",
         "materials_file": "FluidMaterials.json",
         "properties_location": "json",
-        "write_mdpa_mode": "entities"
+        "write_mdpa_mode": "geometries"
     },
     "main_launch_file": "../../exec/MainKratos.py",
     "examples": "examples/examples.xml"

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

@@ -59,6 +59,8 @@ proc ::EmbeddedFluid::write::getParametersDict { } {
     dict set solverSettingsDict distance_reading_settings $dist_settings_dict
 
     dict set param_dict solver_settings $solverSettingsDict
+
+    set param_dict [::write::GetModelersDict $param_dict]
     return $param_dict
 }
 

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

@@ -29,14 +29,6 @@ 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]
-    # Only write as geometries if the app says it AND the user allows it
-    # Note: Fluid will enable it but most of the apps that derive from Fluid are not ready for it
-    # Also user can disable it by setting the variable experimental_write_geometries to 0 in the preferences window
-    set write_geometries_enabled 0
-    if {[info exists Kratos::kratos_private(experimental_write_geometries)] && $Kratos::kratos_private(experimental_write_geometries)>0} {set write_geometries_enabled 1}
-    if {[GetAttribute write_mdpa_mode] eq "geometries" && $write_geometries_enabled ne 1} {
-        SetAttribute write_mdpa_mode "entities"
-    }
 
     variable last_condition_iterator
     set last_condition_iterator 0
@@ -133,11 +125,12 @@ 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
+    # 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
 }
 
 proc ::Fluid::write::Validate {} {

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

@@ -92,36 +92,11 @@ proc ::Fluid::write::getParametersMultistageDict { } {
     return $project_parameters_dict
 }
 
-# Update the modelers information
-proc ::Fluid::write::UpdateModelers { projectParametersDict {stage ""} } {
-    set modelerts_list [list ]
-    # Move the import to the modelers
-    # set modelers [dict get $projectParametersDict solver_settings model_import_settings]
-    dict unset projectParametersDict solver_settings model_import_settings 
-    dict set projectParametersDict solver_settings model_import_settings input_type use_input_model_part
-    set importer_modeler [dict create name "Modelers.KratosMultiphysics.ImportMDPAModeler"]  
-    dict set importer_modeler "parameters" [dict create input_filename [Kratos::GetModelName] model_part_name [write::GetConfigurationAttribute model_part_name]]  
-    lappend modelerts_list $importer_modeler
-
-    if {[GetAttribute write_mdpa_mode] eq "geometries"} {
-        # Add the entities creation modeler
-        set entities_modeler [dict create name "Modelers.KratosMultiphysics.CreateEntitiesFromGeometriesModeler"]
-        dict set entities_modeler "parameters" elements_list [::write::GetMatchSubModelPart element $stage]
-        dict set entities_modeler "parameters" conditions_list [::write::GetMatchSubModelPart condition $stage]
-        lappend modelerts_list $entities_modeler
-    }
-
-    dict set projectParametersDict "modelers" $modelerts_list
-
-    return $projectParametersDict
-}
-
-
 proc ::Fluid::write::writeParametersEvent { } {
     set write_parameters_mode 0
     if {$write_parameters_mode == 0} {
         set projectParametersDict [getParametersDict]
-        set projectParametersDict [Fluid::write::UpdateModelers $projectParametersDict]
+        set projectParametersDict [::write::GetModelersDict $projectParametersDict]
     } else {
         set projectParametersDict [getParametersMultistageDict]
     }

kratos.gid/apps/FreeSurface/app.json

@@ -38,7 +38,7 @@
         "properties_location": "json",
         "model_part_name": "FluidModelPart",
         "output_model_part_name": "",
-        "write_mdpa_mode": "entities"
+        "write_mdpa_mode": "geometries"
     },
     "main_launch_file": "../../exec/MainKratos.py"
 }