Merge pull request #985 from KratosMultiphysics/write-geoms-migration

MIGRATION - Write as geometries

Author: jginternational

.github/workflows/tester.yml

@@ -32,7 +32,7 @@ jobs:
 
       - name: Install bins
         run: |
-          pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==9.3.2
+          pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==10.3.0
 
       # Copy problemtype to gid and copy exec
       - name: Move kratos where it should be

README.md

@@ -21,12 +21,12 @@ If you need the developer version, you are on the right place.
         * You don't need to install python. The program will detect if you have any pending package to install.
         * If there's any missing package, use the GiD command line and execute:
 
-            `-np- W [GiD_Python_PipInstallMissingPackages [list $Kratos::pip_packages_required ] ]`
+            `-np- W [GiD_Python_PipInstall [list $Kratos::pip_packages_required ] 1 ]`
     * 4.1- To execute Kratos using the standard pip packages:
-        * Python version recommended: 3.8, 3.9, 3.10, 3.11
+        * Python version recommended: 3.8, 3.9, 3.10, 3.11, 3.12
         * Open a terminal and run
-            - Linux: `python3 -m pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==9.5.1`
-            - Windows: `python -m pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==9.5.1`
+            - Linux: `python3 -m pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==10.3.0`
+            - Windows: `python -m pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==10.3.0`
     * 4.2- To execute Kratos using your compiled binaries:
         * Fill the Kratos preferences windows with
             - Path to the python folder

dockers/create-release.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
 # Change directory to the specified directory
-cd /tmp/dist/kratos-9.5.1/
+cd /tmp/dist/kratos-10.3.0/
 find . -type f -name "*.unix.bat" -print0 | xargs -0 dos2unix
 
 # Add execute permission to all .bat files in the directory
 # chmod 755 *.bat
 
 # Create a tgz file from the directory
-tar -czf ../kratos-9.5.1-linux-64.tgz *
+tar -czf ../kratos-10.3.0-linux-64.tgz *
 

dockers/deploy.bat

@@ -1,4 +1,4 @@
-set krversion=9.5.1
+set krversion=10.3.0
 set pyversion=3.11
 @REM 3.10.10-alpine3.17
 echo "Building kratos %krversion% on python %pyversion%"

dockers/dockerfile

@@ -8,7 +8,7 @@ FROM python:$pyversion
 # Update pip
 RUN pip install --upgrade pip
 
-ARG krversion=9.5.1
+ARG krversion=10.3.0
 
 # WORKDIR /tmp
 # COPY ./wheels/ ./wheels/

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