Merge pull request #990 from KratosMultiphysics/freesurface-migration-geoms

Free surface writes geometries

Author: jginternational

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"
 }

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

@@ -23,6 +23,11 @@ proc ::FreeSurface::write::getParametersDict { } {
     # # processes
     dict set projectParametersDict processes [::Fluid::write::GetProcesses_Dict]
 
+    set projectParametersDict [::write::GetModelersDict $projectParametersDict]
+
+    set projectParametersDict [::FreeSurface::write::ReplaceConditionsName $projectParametersDict "WallCondition2D2N" "LineCondition2D2N"]
+    set projectParametersDict [::FreeSurface::write::ReplaceConditionsName $projectParametersDict "WallCondition3D3N" "LineCondition3D3N"]
+
     return $projectParametersDict
 }
 
@@ -60,3 +65,67 @@ proc ::FreeSurface::write::writeParametersEvent { } {
     write::SetParallelismConfiguration
     write::WriteJSON $projectParametersDict
 }
+
+proc ::FreeSurface::write::ReplaceConditionsName { projectParametersDict old_cond_name new_cond_name } {
+
+    # in the section 'modelers' we have this structure
+    # [
+        # {
+            # "name": "Modelers.KratosMultiphysics.ImportMDPAModeler",
+            # "parameters": {
+                # "input_filename": "free",
+                # "model_part_name": "free"
+            # }
+        # },
+        # {
+            # "name": "Modelers.KratosMultiphysics.CreateEntitiesFromGeometriesModeler",
+            # "parameters": {
+                # "elements_list": [
+                    # {
+                        # "model_part_name": "free.Fluid",
+                        # "element_name": "Element2D3N"
+                    # }
+                # ],
+                # "conditions_list": [
+                    # {
+                        # "model_part_name": "free.Outlet",
+                        # "condition_name": "WallCondition2D2N"
+                    # },
+                    # {
+                        # "model_part_name": "free._HIDDEN_Slip2D",
+                        # "condition_name": "WallCondition2D2N"
+                    # }
+                # ]
+            # }
+        # }
+    # ]
+    # we need to replace all the occurrences of old_cond_name with new_cond_name
+
+    set modelers [dict get $projectParametersDict modelers]
+    set modelers_new [list]
+    foreach modeler $modelers {
+        set modeler_new [dict create]
+        dict set modeler_new name [dict get $modeler name]
+        set parameters [dict get $modeler parameters]
+        set parameters_new [dict create]
+        foreach {key value} $parameters {
+            if { $key == "conditions_list" } {
+                set conditions_list_new [list]
+                foreach {condition} $value {
+                    set condition_new [dict create]
+                    dict set condition_new model_part_name [dict get $condition model_part_name]
+                    dict set condition_new condition_name [expr {[dict get $condition condition_name] == $old_cond_name ? $new_cond_name : [dict get $condition condition_name]}]
+                    lappend conditions_list_new $condition_new
+                }
+                dict set parameters_new $key $conditions_list_new
+            } else {
+                dict set parameters_new $key $value
+            }
+        }
+        dict set modeler_new parameters $parameters_new
+        lappend modelers_new $modeler_new
+    }
+    dict set projectParametersDict modelers $modelers_new
+
+    return $projectParametersDict
+}

kratos.gid/scripts/Writing/WriteProjectParameters.tcl

@@ -663,15 +663,19 @@ proc write::GetMatchSubModelPart { what {stage ""} } {
         set group_name [$group @n]
 
         set group_name [write::GetWriteGroupName $group_name]
-        if {$group_name ni $processed_groups_list} {lappend processed_groups_list $group_name} {continue}
-        if {$what == "condition"} {set cid [[$group parent] @n]} {
+        #if {$group_name ni $processed_groups_list} {lappend processed_groups_list $group_name} {continue}
+        if {$what == "condition"} {
+            set cid [[$group parent] @n]
+        } else {
             set element_node [$group selectNodes "./value\[@n='Element']"]
             if {[llength $element_node] == 0} {continue}
             set cid [write::getValueByNode $element_node]
         }
         if {$cid eq ""} {continue}
         if {$what == "condition"} {set entity [::Model::getCondition $cid]} {set entity [::Model::getElement $cid]}
         if {$entity eq ""} {continue}
+        
+        if {$group_name ni $processed_groups_list} {lappend processed_groups_list $group_name} {continue}
         if {$what == "condition"} {
             if {[$entity getGroupBy] eq "Condition"} {
                 set good_name "_HIDDEN_$cid"