Merge branch 'master' of https://github.com/KratosMultiphysics/GiDInterface

Author: AFranci

.gitignore

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

README.md

@@ -25,8 +25,8 @@ If you need the developer version, you are on the right place.
     * 4.1- To execute Kratos using the standard pip packages:
         * Python version recommended: 3.8, 3.9, 3.10, 3.11
         * Open a terminal and run
-            - Linux: `python3 -m pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==9.3.2`
-            - Windows: `python -m pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==9.3.2`
+            - Linux: `python3 -m pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==9.4.2`
+            - Windows: `python -m pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==9.4.2`
     * 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.3.2/
+cd /tmp/dist/kratos-9.4.2/
 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.3.2-linux-64.tgz *
+tar -czf ../kratos-9.4.2-linux-64.tgz *
 

dockers/deploy.bat

@@ -1,4 +1,4 @@
-set krversion=9.3.2
+set krversion=9.4.2
 set pyversion=3.10.5
 @REM 3.10.10-alpine3.17
 echo "Building kratos %krversion% on python %pyversion%"

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/Common/xml/GenericSubModelPart.spd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <condition n="GenericModelParts" pn="Add SubModelPart" un="GenericSubmodelPart" ov="point,line,surface,volume" icon="generic" >
       <value n="WriteNodes" pn="Write nodes" v="True" values="True,False" state="disabled" />
-      <value n="WriteElements" pn="Write elements" v="False" values="True,False" state="[checkStateByUniqueName SMP_write_mode elements_and_conditions]"/>
-      <value n="WriteConditions" pn="Write conditions" v="True" values="True,False" state="[checkStateByUniqueName SMP_write_mode elements_and_conditions]"/>
+      <value n="WriteElements" pn="Write elements" v="False" values="True,False" state="[ShowInWriteMode Entitites]"/>
+      <value n="WriteConditions" pn="Write conditions" v="True" values="True,False" state="[ShowInWriteMode Entitites]"/>
 </condition>

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]