Merge pull request #996 from KratosMultiphysics/fsi-geoms-migration

Fsi geoms migration

Author: jginternational

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

@@ -23,7 +23,7 @@ proc ::Buoyancy::write::writeModelPartEvent { } {
 
     set fluid_base_xpath [spdAux::getRoute Buoyancy_FL]
     set fluid_base [[customlib::GetBaseRoot] selectNodes $fluid_base_xpath]
-    set ::Fluid::write::fluid_base $fluid_base
+    set ::Fluid::write::base_root $fluid_base
 
     ::Fluid::write::writeModelPartEvent
 

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

@@ -85,6 +85,9 @@ 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}  } {

kratos.gid/apps/FSI/app.json

@@ -54,7 +54,7 @@
         "properties_location": "json",
         "model_part_name": "Structure",
         "enable_dynamic_substepping": false,
-        "write_mdpa_mode": "entities"
+        "write_mdpa_mode": "geometries"
     },
     "main_launch_file": "../../exec/MainKratos.py",
     "examples": "examples/examples.xml"

kratos.gid/apps/FSI/write/write.tcl

@@ -27,12 +27,18 @@ proc ::FSI::write::writeModelPartEvent { } {
     ::Fluid::write::SetAttribute write_mdpa_mode [::FSI::GetWriteProperty write_mdpa_mode]
     Fluid::write::InitConditionsMap
     Fluid::write::SetCoordinatesByGroups 1
+    set base_root_xpath [spdAux::getRoute FSIFluid]
+    set base_root [[customlib::GetBaseRoot] selectNodes $base_root_xpath]
+    set ::Fluid::write::base_root $base_root
     write::writeAppMDPA Fluid
     dict set mdpa_names Fluid "${filename}_Fluid"
     write::RenameFileInModel "$filename.mdpa" "[dict get $mdpa_names Fluid].mdpa"
 
     Structural::write::Init
     Structural::write::SetCoordinatesByGroups 1
+    set base_root_xpath [spdAux::getRoute FSIStructural]
+    set base_root [[customlib::GetBaseRoot] selectNodes $base_root_xpath]
+    set ::Structural::write::base_root $base_root
     write::writeAppMDPA Structural
     dict set mdpa_names Structural "${filename}_Structural"
     write::RenameFileInModel "$filename.mdpa" "[dict get $mdpa_names Structural].mdpa"

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

@@ -24,6 +24,10 @@ proc ::FSI::write::getParametersDict { } {
     set output_processes [GetOutputProcessesDict]
     dict set projectParametersDict output_processes $output_processes
 
+    set projectParametersDict [::write::GetModelersDict $projectParametersDict]
+    set projectParametersDict [PlaceMDPAImports $projectParametersDict]
+    set projectParametersDict [ModelersPrefix $projectParametersDict]
+
     return $projectParametersDict
 }
 
@@ -90,8 +94,10 @@ proc ::FSI::write::GetSolverSettingsDict { } {
     dict set solver_settings_dict coupling_settings fluid_interfaces_list $fluid_interfaces_list
 
     # Change the input_filenames
-    dict set solver_settings_dict structure_solver_settings model_import_settings input_filename [dict get $mdpa_names Structural]
-    dict set solver_settings_dict fluid_solver_settings model_import_settings input_filename [dict get $mdpa_names Fluid]
+    dict unset solver_settings_dict structure_solver_settings model_import_settings
+    dict set solver_settings_dict structure_solver_settings model_import_settings input_type use_input_model_part
+    dict unset solver_settings_dict fluid_solver_settings model_import_settings
+    dict set solver_settings_dict fluid_solver_settings model_import_settings input_type use_input_model_part
 
     # Overwrite structural timestep with fluid timestep
     dict set solver_settings_dict structure_solver_settings time_stepping [dict get $solver_settings_dict fluid_solver_settings time_stepping]
@@ -188,4 +194,69 @@ proc ::FSI::write::InitExternalProjectParameters { } {
     set FSI::write::structure_project_parameters [Structural::write::getParametersDict]
 
     apps::setActiveAppSoft FSI
+}
+
+
+proc ::FSI::write::PlaceMDPAImports { projectParametersDict } {
+    variable mdpa_names
+
+    set new_modelers [list]
+
+    set modelers [dict get $projectParametersDict modelers]
+    # remove the modelers that import the mdpa files (name = Modelers.KratosMultiphysics.ImportMDPAModeler)
+    set modelers [lsearch -all -inline -not -glob $modelers *ImportMDPAModeler*]
+    lappend new_modelers [dict create name "Modelers.KratosMultiphysics.ImportMDPAModeler" parameters [dict create input_filename [dict get $mdpa_names Fluid] model_part_name "FluidModelPart"]]
+    lappend new_modelers [dict create name "Modelers.KratosMultiphysics.ImportMDPAModeler" parameters [dict create input_filename [dict get $mdpa_names Structural] model_part_name "Structure"]]
+    set modelers [concat $new_modelers $modelers]
+    dict set projectParametersDict modelers $modelers
+    return $projectParametersDict
+}
+
+proc ::FSI::write::ModelersPrefix { projectParametersDict } {
+
+    set modelers [dict get $projectParametersDict modelers]
+    set new_modelers [list]
+    set fluid_modelparts [dict get $projectParametersDict solver_settings fluid_solver_settings skin_parts]
+    set more_fluid_modelparts [dict get $projectParametersDict solver_settings fluid_solver_settings no_skin_parts]
+    set fluid_volume [dict get $projectParametersDict solver_settings fluid_solver_settings volume_model_part_name]
+    set fluid_modelparts [concat $fluid_modelparts $more_fluid_modelparts]
+    lappend fluid_modelparts $fluid_volume
+    # W "Thermal modelparts: $thermal_modelparts"
+    foreach modeler $modelers {
+        set name [dict get $modeler name]
+        if {[string match "Modelers.KratosMultiphysics.CreateEntitiesFromGeometriesModeler" $name]} {
+            set new_parameters [dict create]
+            set new_modeler [dict create name $name parameters [dict create elements_list [dict create] conditions_list [dict create]]]
+            set new_element_list [list ]
+            foreach element [dict get $modeler parameters elements_list] {
+                set model_part_name [dict get $element model_part_name]
+                set raw_name [lindex [split $model_part_name "."] 1]
+
+                if {$raw_name in $fluid_modelparts} {
+                    set new_element [dict create model_part_name "FluidModelPart.$raw_name" element_name [dict get $element element_name]]
+                } else {
+                    set new_element $element
+                }
+                lappend new_element_list $new_element
+                dict set new_parameters elements_list $new_element_list
+            }
+            set new_conditions_list [list ]
+            foreach condition [dict get $modeler parameters conditions_list] {
+                set model_part_name [dict get $condition model_part_name]
+                set raw_name [lindex [split $model_part_name "."] 1]
+                if {$raw_name in $fluid_modelparts} {
+                    set new_condition [dict create model_part_name "FluidModelPart.$raw_name" condition_name [dict get $condition condition_name]]
+                } else {
+                    set new_condition $condition
+                }
+                lappend new_conditions_list $new_condition
+                dict set new_parameters conditions_list $new_conditions_list
+            }
+            dict set new_modeler parameters $new_parameters
+            set modeler $new_modeler
+        }
+        lappend new_modelers $modeler
+    }
+    dict set projectParametersDict modelers $new_modelers
+    return $projectParametersDict
 }

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

@@ -2,7 +2,7 @@
 
 <container n="FSI" pn="FSI" icon="app" prefix="FSI" 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" un="FSIFluid" prefix="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"/>
@@ -12,7 +12,7 @@
         <include n="Materials" active="1" path="apps/Fluid/xml/Materials.spd"/>
     </container>
 
-    <container n="Structural" pn="Structure" icon="app" prefix="ST" tree_state="open" open_window="0">
+    <container n="Structural" pn="Structure" icon="app" un="FSIStructural" prefix="ST" tree_state="open" open_window="0">
         <include n="StageInfo" active="1" path="apps/Structural/xml/StageInfo.spd"/>
         <include n="Parts" active="1" path="apps/Structural/xml/Parts.spd"/>
         <include n="BoundaryConditions" active="1" path="apps/Structural/xml/BoundaryConditions.spd"/>

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

@@ -9,7 +9,7 @@ namespace eval ::Fluid::write {
     # after regular conditions are written, we need this number in order to print the custom submodelpart conditions
     # only if are applied over things that are not in the skin
     variable last_condition_iterator
-    variable fluid_base
+    variable base_root
 }
 
 proc ::Fluid::write::Init { } {
@@ -34,13 +34,13 @@ proc ::Fluid::write::Init { } {
     variable last_condition_iterator
     set last_condition_iterator 0
 
-    variable fluid_base 
-    set fluid_base ""
+    variable base_root 
+    set base_root ""
 }
 
 # MDPA write event
 proc ::Fluid::write::writeModelPartEvent { } {
-    variable fluid_base
+    variable base_root
 
     # Validation
     set err [Validate]
@@ -61,7 +61,7 @@ proc ::Fluid::write::writeModelPartEvent { } {
     if {[GetAttribute write_mdpa_mode] eq "geometries"} {
         # Write geometries
         # Get the list of groups in the spd
-        set lista [::Fluid::xml::GetListOfSubModelParts $fluid_base]
+        set lista [::Fluid::xml::GetListOfSubModelParts $base_root]
 
         # Write the geometries
         set ret [::write::writeGeometryConnectivities $lista]

kratos.gid/apps/Structural/write/write.tcl

@@ -6,6 +6,8 @@ namespace eval ::Structural::write {
     variable NodalConditionsGroup
     variable writeAttributes
     variable ContactsDict
+    variable base_root 
+    set base_root ""
 }
 
 proc ::Structural::write::Init { } {
@@ -38,6 +40,10 @@ proc ::Structural::write::Init { } {
     SetAttribute model_part_name [::Structural::GetWriteProperty model_part_name]
     SetAttribute output_model_part_name [::Structural::GetWriteProperty output_model_part_name]
     SetAttribute write_mdpa_mode [::Structural::GetWriteProperty write_mdpa_mode]
+
+    
+    variable base_root 
+    set base_root ""
 }
 
 # MDPA Blocks
@@ -56,9 +62,10 @@ proc ::Structural::write::writeModelPartEvent { } {
 
 
     if {[GetAttribute write_mdpa_mode] eq "geometries"} {
+        variable base_root
         # Write geometries
         # Get the list of groups in the spd
-        set lista [spdAux::GetListOfSubModelParts]
+        set lista [spdAux::GetListOfSubModelParts $base_root]
 
         # Write the geometries
         set ret [::write::writeGeometryConnectivities $lista]