Merge branch 'master' into geo-print

Author: jginternational

kratos.gid/apps/ConjugateHeatTransfer/examples/HeatedSquare.tcl

@@ -201,7 +201,7 @@ proc ::ConjugateHeatTransfer::examples::HeatedSquare::TreeAssignation2D {args} {
     # Thermal Parts
     set parts [spdAux::getRoute "CNVDFFParts"]
     set fluidNode [customlib::AddConditionGroupOnXPath $parts Heating]
-    set props [list Element EulerianConvDiff$nd Material Gold DENSITY 19300.0 CONDUCTIVITY 310 SPECIFIC_HEAT 125.6]
+    set props [list Element EulerianConvDiff$nd Material Gold DENSITY 19300.0 CONDUCTIVITY 310.0 SPECIFIC_HEAT 125.6]
     spdAux::SetValuesOnBaseNode $fluidNode $props
 
     # Thermal Nodal Conditions

kratos.gid/apps/ConvectionDiffusion/examples/HeatedSquare.tcl

@@ -124,7 +124,7 @@ proc ::ConvectionDiffusion::examples::HeatedSquare::TreeAssignation2D {args} {
     # Fluid Parts
     set parts [spdAux::getRoute "CNVDFFParts"]
     set fluidNode [customlib::AddConditionGroupOnXPath $parts Body]
-    set props [list Element EulerianConvDiff$nd Material Gold DENSITY 19300.0 CONDUCTIVITY 310 SPECIFIC_HEAT 125.6]
+    set props [list Element EulerianConvDiff$nd Material Gold DENSITY 19300.0 CONDUCTIVITY 310.0 SPECIFIC_HEAT 125.6]
     spdAux::SetValuesOnBaseNode $fluidNode $props
 
     # Thermal Nodal Conditions

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

@@ -169,6 +169,7 @@ proc ::Structural::write::getOldParametersDict { {stage ""} } {
     if {$solutiontype eq "eigen_value"} {
         dict unset projectParametersDict output_processes
         dict unset projectParametersDict solver_settings analysis_type
+        dict set projectParametersDict solver_settings builder_and_solver_settings use_block_builder false
     }
 
     return $projectParametersDict

kratos.gid/exec/pip_gids_python.unix.bat

@@ -9,5 +9,8 @@ rm -f "$2/$1.info"
 rm -f "$2/$1.err"
 rm -f "$2/$1.flavia.dat"
 
+export PYTHONPATH=""
+export PYTHONHOME=""
+
 # Run Python using the script MainKratos.py
 $python_path MainKratos.py > "$2/$1.info" 2> "$2/$1.err"

kratos.gid/exec/pip_gids_python.win.bat

@@ -15,4 +15,6 @@ DEL "%2\%1*.post.res"
 DEL "%2\%1*.post.msh"
 
 @REM Calculate!
+set PYTHONPATH=""
+set PYTHONHOME=""
 %python_path% MainKratos.py > "%2\\%1.info" 2> "%2\\%1.err"

kratos.gid/scripts/Launch.tcl

@@ -304,6 +304,7 @@ proc Kratos::ExecuteLaunchByMode {launch_mode} {
         Default {
             set python_path [GiD_Python_GetPythonExe]
             set ::env(python_path) $python_path
+            set ::env(python_home) [file dirname $python_path]
         }
         default {}
     }