Merge pull request #951 from KratosMultiphysics/fluid-write-orchestrator-multistage

Fluid write with geometries

Author: jginternational

.gitignore

@@ -15,3 +15,4 @@ dist
 *.tgz
 null
 __pycache__
+*.whl

dockers/dockerfile

@@ -1,5 +1,5 @@
 # Default values. Use --build-arg on build to change
-ARG pyversion=3.10.8
+ARG pyversion=3.11
 
 # Base pyton image
 FROM python:$pyversion
@@ -8,10 +8,14 @@ FROM python:$pyversion
 # Update pip
 RUN pip install --upgrade pip
 
-ARG krversion=9.3.2
+ARG krversion=9.4.2
+
+# WORKDIR /tmp
+# COPY ./wheels/ ./wheels/
 
 # Install Kratos and dependencies
 RUN python3 -m pip install KratosMultiphysics-all==$krversion numpy
+# RUN python3 -m pip install ./wheels/*.whl
 
 # Prepare run folder
 WORKDIR "/model"

kratos.gid/apps/Buoyancy/app.json

@@ -37,7 +37,8 @@
     "write": {
         "coordinates": "all",
         "properties_location": "json",
-        "model_part_name": "ThermalModelPart"
+        "model_part_name": "ThermalModelPart",
+        "write_mdpa_mode": "entities"
     },
     "main_launch_file": "../../exec/MainKratos.py",
     "examples": "examples/examples.xml"

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

@@ -20,6 +20,8 @@ proc ::Buoyancy::write::writeModelPartEvent { } {
 
     # 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
 

kratos.gid/apps/CompressibleFluid/app.json

@@ -42,7 +42,8 @@
         "materials_file": "FluidMaterials.json",
         "properties_location": "json",
         "model_part_name": "FluidModelPart",
-        "output_model_part_name": "fluid_computational_model_part"
+        "output_model_part_name": "fluid_computational_model_part",
+        "write_mdpa_mode": "entities"
     },
     "main_launch_file": "python/MainKratos.py",
     "examples": "examples/examples.xml",

kratos.gid/apps/CompressibleFluid/write/write.tcl

@@ -10,6 +10,8 @@ namespace eval ::CompressibleFluid::write {
 proc ::CompressibleFluid::write::Init { } {
     # Namespace variables inicialization
     ::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 [::CompressibleFluid::GetWriteProperty write_mdpa_mode]
 
     SetAttribute parts_un            [::Fluid::GetUniqueName parts]
     SetAttribute nodal_conditions_un [::CompressibleFluid::GetUniqueName nodal_conditions]

kratos.gid/apps/EmbeddedFluid/app.json

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

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

@@ -8,6 +8,8 @@ namespace eval ::EmbeddedFluid::write {
 proc EmbeddedFluid::write::Init { } {
     # Namespace variables inicialization        
     variable writeAttributes
+    # Fluid has implemented the geometry mode, but we do not use it yet in inherited apps
+    ::Fluid::write::SetAttribute write_mdpa_mode [::EmbeddedFluid::GetWriteProperty write_mdpa_mode]
     set writeAttributes [::Fluid::write::GetAttributes]
 }
 

kratos.gid/apps/FSI/app.json

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

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

@@ -23,6 +23,8 @@ proc ::FSI::write::writeModelPartEvent { } {
     set filename [Kratos::GetModelName]
 
     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 [::FSI::GetWriteProperty write_mdpa_mode]
     Fluid::write::InitConditionsMap
     Fluid::write::SetCoordinatesByGroups 1
     write::writeAppMDPA Fluid