Merge pull request #815 from KratosMultiphysics/hotfix-fsi-submodelparts

Hotfix fsi submodelparts

Author: jginternational

kratos.gid/apps/FSI/examples/MokChannelWithFlexibleWall.tcl

@@ -164,7 +164,8 @@ proc FSI::examples::AssignMokChannelFlexibleWallMeshSizes3D {args} {
 
     GiD_Process Mescape Utilities Variables SizeTransitionsFactor 0.4 escape escape
     GiD_Process Mescape Meshing ElemType Tetrahedra [GiD_EntitiesGroups get Fluid volumes] escape
-    GiD_Process Mescape Meshing ElemType Hexahedra [GiD_EntitiesGroups get Structure volumes] escape
+    GiD_Process Mescape Meshing ElemType Tetrahedra [GiD_EntitiesGroups get Structure volumes] escape
+    # GiD_Process Mescape Meshing ElemType Hexahedra [GiD_EntitiesGroups get Structure volumes] escape
     GiD_Process Mescape Meshing Structured Surfaces 14 16 escape $long_side_divisions 12 14 escape $long_side_divisions 45 46 escape escape
     GiD_Process Mescape Meshing Structured Surfaces 15 escape $short_side_divisions 13 escape $long_side_divisions 45 46 escape escape
     GiD_Process Mescape Meshing Structured Volumes [GiD_EntitiesGroups get Structure volumes] escape $short_side_divisions 48 escape $long_side_divisions 15 17 52 53 escape escape
@@ -188,12 +189,13 @@ proc FSI::examples::TreeAssignationMokChannelFlexibleWall {args} {
     spdAux::SetValuesOnBaseNode $fluidNode $props
 
     set fluidConditions {container[@n='FSI']/container[@n='Fluid']/container[@n='BoundaryConditions']}
+
     # Fluid Interface
     set fluidInlet "$fluidConditions/condition\[@n='AutomaticInlet$nd'\]"
 
     # Fluid Inlet
-    set function {0.1214*(1-cos(0.1*pi*t))*y*(1-y) if t<10 else 0.2428*y*(1-y)}
-    Fluid::xml::CreateNewInlet Inlet {new false name Total} true $function
+    Fluid::xml::CreateNewInlet Inlet {new true name interval1 ini 0 end 10.0} true "0.1214*(1-cos(0.1*pi*t))*y*(1-y)"
+    Fluid::xml::CreateNewInlet Inlet {new true name interval2 ini 10.0 end End} true "0.2428*y*(1-y)"
 
     # Fluid Outlet
     set fluidOutlet "$fluidConditions/condition\[@n='Outlet$nd'\]"

kratos.gid/apps/FSI/examples/TurekBenchmark.tcl

@@ -175,12 +175,13 @@ proc FSI::examples::TreeAssignationTurekBenchmark {args} {
     spdAux::SetValuesOnBaseNode $fluidNode $props
 
     set fluidConditions {container[@n='FSI']/container[@n='Fluid']/container[@n='BoundaryConditions']}
+    
     # Fluid Interface
     set fluidInlet "$fluidConditions/condition\[@n='AutomaticInlet$nd'\]"
-
+    
     # Fluid Inlet
-    set function {1.5*(0.5*(1-cos(0.5*pi*t))*1.0)*(4.0/0.1681)*y*(0.41-y) if t<2.0 else 1.5*(1.0)*(4.0/0.1681)*y*(0.41-y)}
-    Fluid::xml::CreateNewInlet Inlet {new false name Total} true $function
+    Fluid::xml::CreateNewInlet Inlet {new true name interval1 ini 0 end 2.0} true "1.5*(0.5*(1-cos(0.5*pi*t))*1.0)*(4.0/0.1681)*y*(0.41-y)"
+    Fluid::xml::CreateNewInlet Inlet {new true name interval2 ini 2.0 end end} true "1.5*(1.0)*(4.0/0.1681)*y*(0.41-y)"
 
     # Fluid Outlet
     set fluidOutlet "$fluidConditions/condition\[@n='Outlet$nd'\]"

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

@@ -69,13 +69,21 @@ proc FSI::write::GetSolverSettingsDict { } {
 
 
     # structure interface
-    set structure_interfaces_list [write::GetSubModelPartFromCondition STLoads StructureInterface2D]
-    lappend structure_interfaces_list {*}[write::GetSubModelPartFromCondition STLoads StructureInterface3D]
+    set structure_interfaces_list [list ]
+    set structure_interfaces_list_raw [write::GetSubModelPartFromCondition STLoads StructureInterface2D]
+    lappend structure_interfaces_list_raw {*}[write::GetSubModelPartFromCondition STLoads StructureInterface3D]
+    foreach interface $structure_interfaces_list_raw {
+        lappend structure_interfaces_list [Structural::write::GetAttribute model_part_name].$interface
+    }
     dict set solver_settings_dict coupling_settings structure_interfaces_list $structure_interfaces_list
 
     # Fluid interface
     set fluid_interface_uniquename FluidNoSlipInterface$::Model::SpatialDimension
-    set fluid_interfaces_list [write::GetSubModelPartFromCondition FLBC $fluid_interface_uniquename]
+    set fluid_interfaces_list [list ]
+    set fluid_interfaces_list_raw [write::GetSubModelPartFromCondition FLBC $fluid_interface_uniquename]
+    foreach interface $structure_interfaces_list_raw {
+        lappend fluid_interfaces_list [Fluid::write::GetAttribute model_part_name].$interface
+    }
     dict set solver_settings_dict coupling_settings fluid_interfaces_list $fluid_interfaces_list
 
     # Change the input_filenames
@@ -140,12 +148,12 @@ proc FSI::write::GetMappingSettingsList { } {
     set structural_interface_name StructureInterface$::Model::SpatialDimension
     set structuralInterface [lindex [write::GetSubModelPartFromCondition STLoads $structural_interface_name] 0]
     foreach fluid_interface [[customlib::GetBaseRoot] selectNodes "[spdAux::getRoute FLBC]/condition\[@n = '$fluid_interface_name'\]/group" ] {
-	set map [dict create]
-	set mapper_face [write::getValueByNode [$fluid_interface selectNodes ".//value\[@n='mapper_face']"] ]
-	dict set map mapper_face $mapper_face
-	dict set map fluid_interface_submodelpart_name [write::getSubModelPartId $fluid_interface_name [get_domnode_attribute $fluid_interface n]]
-	dict set map structure_interface_submodelpart_name $structuralInterface
-	lappend mappingsList $map
+        set map [dict create]
+        set mapper_face [write::getValueByNode [$fluid_interface selectNodes ".//value\[@n='mapper_face']"] ]
+        dict set map mapper_face $mapper_face
+        dict set map fluid_interface_submodelpart_name [Fluid::write::GetAttribute model_part_name].[write::getSubModelPartId $fluid_interface_name [get_domnode_attribute $fluid_interface n]]
+        dict set map structure_interface_submodelpart_name [Structural::write::GetAttribute model_part_name].$structuralInterface
+        lappend mappingsList $map
     }
 
     return $mappingsList