Merge branch 'master' into mpm/fix-number-material-points-per-element

Author: ncrescenzio

README.md

@@ -21,7 +21,7 @@ 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_PipInstall [list $Kratos::pip_packages_required ] 1 ]`
+            `-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, 3.12
         * Open a terminal and run

dockers/deploy.bat

@@ -1,8 +1,11 @@
 set krversion=10.3.0
-set pyversion=3.11
+set pyversion=3.12
 @REM 3.10.10-alpine3.17
 echo "Building kratos %krversion% on python %pyversion%"
-docker build --build-arg krversion=%krversion% --build-arg pyversion=%pyversion% -t kratos-run:%krversion% -t kratos-run:latest .
+set SCRIPT_DIR=%~dp0
+set ROOT_DIR=%SCRIPT_DIR%..
+
+docker build --build-arg pyversion=%pyversion% -f "%ROOT_DIR%\dockers\dockerfile" -t kratos-run:%krversion% -t kratos-run:latest "%ROOT_DIR%"
 
 docker tag kratos-run:%krversion% fjgarate/kratos-run:%krversion%
 docker push fjgarate/kratos-run:%krversion%

dockers/dockerfile

@@ -1,20 +1,22 @@
 # Default values. Use --build-arg on build to change
-ARG pyversion=3.11
+ARG pyversion=3.12
 
 # Base pyton image
 FROM python:$pyversion
-# FROM python:3.10.10-alpine3.17
 
 # Update pip
 RUN pip install --upgrade pip
 
-ARG krversion=10.3.0
-
 # WORKDIR /tmp
 # COPY ./wheels/ ./wheels/
 
-# Install Kratos and dependencies
-RUN python3 -m pip install KratosMultiphysics-all==$krversion numpy
+# Copy dependency manifest from Kratos GiD
+COPY kratos.gid/kratos.xml /tmp/kratos.xml
+COPY dockers/generate_requirements_from_xml.py /tmp/generate_requirements_from_xml.py
+
+# Install Kratos packages listed in kratos.xml
+RUN python3 /tmp/generate_requirements_from_xml.py --xml /tmp/kratos.xml --out /tmp/requirements.txt \
+    && python3 -m pip install --no-cache-dir -r /tmp/requirements.txt
 # RUN python3 -m pip install ./wheels/*.whl
 
 # Prepare run folder
@@ -24,5 +26,5 @@ RUN chmod 777 /model
 # Kratos will start on docker run
 CMD [ "python3", "MainKratos.py" ]
 
-# docker build -t kratos-run .
+# docker build -t kratos-run -f dockers/dockerfile .
 # docker run -rm -it  --entrypoint bash kratos-run

dockers/generate_requirements_from_xml.py

@@ -0,0 +1,42 @@
+import argparse
+import xml.etree.ElementTree as ET
+from pathlib import Path
+
+
+def build_requirements(xml_path: Path) -> list[str]:
+    root = ET.parse(xml_path).getroot()
+    requirements: list[str] = []
+    seen: set[str] = set()
+
+    for package in root.findall("./Program/PythonPackages/Package"):
+        name = (package.get("Name") or "").strip()
+        version = (package.get("Version") or "").strip()
+        if not name:
+            continue
+
+        requirement = f"{name}=={version}" if version else name
+        if requirement in seen:
+            continue
+
+        requirements.append(requirement)
+        seen.add(requirement)
+
+    return requirements
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--xml", required=True)
+    parser.add_argument("--out", required=True)
+    args = parser.parse_args()
+
+    xml_path = Path(args.xml)
+    out_path = Path(args.out)
+    requirements = build_requirements(xml_path)
+    requirements.append("numpy")
+
+    out_path.write_text("\n".join(requirements) + "\n", encoding="utf-8")
+
+
+if __name__ == "__main__":
+    main()

kratos.gid/apps/DEM/xml/XmlController.tcl

@@ -29,7 +29,7 @@ proc ::DEM::xml::CustomTree { args } {
     spdAux::SetValueOnTreeItem state hidden DEMTimeParameters StartTime
 
     # 3D gravity
-    if {$Model::SpatialDimension eq "3D"} {
+    if {$::Model::SpatialDimension eq "3D"} {
         catch {
             spdAux::SetValueOnTreeItem v 0.0 DEMGravity Cy
             spdAux::SetValueOnTreeItem v -1.0 DEMGravity Cz

kratos.gid/apps/Dam/write/write.tcl

@@ -265,7 +265,7 @@ proc ::Dam::write::writeTables_dev { } {
 proc ::Dam::write::GetPrinTables {} {
 
     set root [customlib::GetBaseRoot]
-    if {$Kratos::kratos_private(UseFiles) eq 1} {FileSelector::CopyFilesIntoModel [file join [GiD_Info project ModelName] ".gid"]}
+    if {$::Kratos::kratos_private(UseFiles) eq 1} {FileSelector::CopyFilesIntoModel [file join [GiD_Info project ModelName] ".gid"]}
     set tableid_list [list ]
     set files_list [list ]
     set num 0
@@ -301,7 +301,7 @@ proc ::Dam::write::GetPrinTables {} {
 proc ::Dam::write::GetPrinTables_dev { } {
 
     set root [customlib::GetBaseRoot]
-    if {$Kratos::kratos_private(UseFiles) eq 1} {FileSelector::CopyFilesIntoModel [file join [GiD_Info project ModelName] ".gid"]}
+    if {$::Kratos::kratos_private(UseFiles) eq 1} {FileSelector::CopyFilesIntoModel [file join [GiD_Info project ModelName] ".gid"]}
     set tableid_list2 [list ]
     set files_list2 [list ]
     set num [llength [GetPrinTables]]

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

@@ -31,14 +31,14 @@ proc EmbeddedFluid::write::writeDistances { } {
         set length [objarray length $nodes_list]
         if {$length eq "0"} {W "Warning: No distances detected! Check Preferences > Meshing > General > Mesh type > Embedded"}
         write::WriteString "Begin NodalData DISTANCE"
-        incr write::current_mdpa_indent_level
+        incr ::write::current_mdpa_indent_level
         set s [write::mdpaIndent]
         for {set i 0} {$i < $length} {incr i } {
             set node_id [objarray get $nodes_list $i]
             set distance [objarray get $distances_list $i]
             write::WriteString "$s$node_id 0 $distance"
         }
-        incr write::current_mdpa_indent_level -1
+        incr ::write::current_mdpa_indent_level -1
         write::WriteString "End NodalData"
     }
 }

kratos.gid/apps/GeoMechanics/xml/XmlController.tcl

@@ -129,7 +129,7 @@ proc ::GeoMechanics::xml::ProcCheckNodalConditionStateGeoMechanics {domNode args
         set condition [Model::getNodalConditionbyId $conditionId]
         set cnd_dim [$condition getAttribute WorkingSpaceDimension]
         if {$cnd_dim ne ""} {
-            if {$cnd_dim ne $Model::SpatialDimension} {return "hidden"}
+            if {$cnd_dim ne $::Model::SpatialDimension} {return "hidden"}
         }
         set elems [$domNode selectNodes "[spdAux::getRoute $parts_un]/condition/group/value\[@n='Element'\]"]
         set elemnames [list ]

kratos.gid/apps/PfemFluid/start.tcl

@@ -24,7 +24,7 @@ proc ::PfemFluid::Init { app } {
 proc ::PfemFluid::CustomToolbarItems { } {
     variable dir
     # Reset the left toolbar
-    set Kratos::kratos_private(MenuItems) [dict create]
+    set ::Kratos::kratos_private(MenuItems) [dict create]
     set img_dir [file join $dir images]
     if {[gid_themes::GetCurrentTheme] eq "GiD_black"} {
         set img_dir [file join $img_dir Black]

kratos.gid/apps/PfemFluid/write/write.tcl

@@ -1,7 +1,7 @@
 namespace eval ::PfemFluid::write {
     namespace path ::PfemFluid
     Kratos::AddNamespace [namespace current]
-
+    
     variable writeAttributes
     variable remesh_domains_dict
     variable bodies_list
@@ -16,11 +16,11 @@ proc PfemFluid::write::Init { } {
     set bodies_list [list ]
     variable Names
     set Names [dict create DeltaTime DeltaTime]
-
-
+    
+    
     SetAttribute materials_un [::PfemFluid::GetUniqueName materials]
     SetAttribute nodal_conditions_un [::PfemFluid::GetUniqueName nodal_conditions]
-
+    
     SetAttribute main_launch_file [::PfemFluid::GetAttribute main_launch_file]
     SetAttribute materials_file [::PfemFluid::GetWriteProperty materials_file]
     SetAttribute properties_location [::PfemFluid::GetWriteProperty properties_location]
@@ -33,20 +33,20 @@ proc PfemFluid::write::writeModelPartEvent { } {
     # Validation
     set err [Validate]
     if {$err ne ""} {error $err}
-
+    
     # Init data
     write::initWriteConfiguration [GetAttributes]
-
+    
     set parts_un_list [GetPartsUN]
     foreach part_un $parts_un_list {
         write::initWriteData $part_un [GetAttribute materials_un]
     }
-
+    
     write::writeModelPartData
     write::WriteString "Begin Properties 0"
     write::WriteString "End Properties"
     # write::writeMaterials "PfemFluid"
-
+    
     write::writeNodalCoordinates
     foreach part_un $parts_un_list {
         write::initWriteData $part_un [GetAttribute materials_un]
@@ -56,16 +56,16 @@ proc PfemFluid::write::writeModelPartEvent { } {
 }
 
 proc PfemFluid::write::writeMeshes { } {
-
+    
     foreach part_un [GetPartsUN] {
         write::initWriteData $part_un [GetAttribute materials_un]
         write::writePartSubModelPart
     }
     # Solo Malla , no en conditions
     writeNodalConditions [GetAttribute nodal_conditions_un]
     #writeWaveMonitorMesh
-
-
+    
+    
 }
 
 
@@ -97,7 +97,7 @@ proc PfemFluid::write::GetPartsUN { } {
 
 
 proc PfemFluid::write::writeWaveMonitorMesh {  } {
-
+    
     set xp1 "[spdAux::getRoute "WaveMonitor"]/group"
     set groups_wave_height [[customlib::GetBaseRoot] selectNodes $xp1]
     foreach group $groups_wave_height {
@@ -111,7 +111,7 @@ proc PfemFluid::write::writeWaveMonitorMesh {  } {
 proc ::PfemFluid::write::Validate {} {
     set err ""
     set root [customlib::GetBaseRoot]
-
+    
 
     return $err
 }
@@ -132,10 +132,18 @@ proc PfemFluid::write::WriteMaterialsFile { {write_const_law True} {include_mode
 
 proc PfemFluid::write::writePropertiesJsonFile { {fname "materials.json"} {write_claw_name "True"} {model_part_name ""}} {
     set mats_json [dict create properties [list ] ]
-    foreach parts_un [PfemFluid::write::GetPartsUN] {
-        foreach property [dict get [write::getPropertiesList $parts_un $write_claw_name $model_part_name] properties ] {
+    set parts_uns [PfemFluid::write::GetPartsUN]
+    set ids [list ]
+    foreach parts_un $parts_uns {
+        set properties_dict [write::getPropertiesList $parts_un $write_claw_name $model_part_name]
+        set properties [dict get $properties_dict properties ]
+        foreach property $properties {
             if {$property ne "\[\]"} {
-                dict lappend mats_json properties $property
+                set property_id [dict get $property properties_id]
+                if {$property_id ni $ids} {
+                    lappend ids $property_id
+                    dict lappend mats_json properties $property
+                }
             }
         }
     }