Merge branch 'master' into Release-9.1

Author: jginternational

README.md

@@ -15,22 +15,26 @@ If you need the developer version, you are on the right place.
 * 3- Navigate to GiD's problemtype folder and delete any previous kratos.gid
     * Create there a link to our [kratos.gid](./kratos.gid/) downloaded in step 1
         * Windows: Simple shortcut to kratos.gid folder
-* 4- Navigate to kratos.gid/exec/
-    * Create there a symbolic link to the kratos installation folder (where runkratos is located)
-        * Unix : `ln -s ~/Kratos Kratos` or maybe `ln -s ~/Kratos/bin/Release Kratos` if that's the destination folder
-        * Windows : `mklink /J Kratos C:\kratos\bin\Release` (choose actual Kratos installation folder)
-
-### Step by step video
-https://www.youtube.com/watch?v=zZq7ypDdudo
-
-## Launch modea
+* 4- Choose your execution mode:
+    * 4.1- To execute Kratos using the standard pip packages:
+        *- Python version recommended: 3.9
+        *- Open a terminal and run `python3 -m pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==9.1.3`
+    * 4.2- To execute Kratos using your compiled binaries:
+        * Navigate to kratos.gid/exec/
+        * Create there a symbolic link to the kratos installation folder (where runkratos is located)
+            * Unix : `ln -s ~/Kratos Kratos` or maybe `ln -s ~/Kratos/bin/Release Kratos` if that's the destination folder
+            * Windows : `mklink /J Kratos C:\kratos\bin\Release` (choose actual Kratos installation folder)
+        * Step by step video: https://www.youtube.com/watch?v=zZq7ypDdudo
+    * 4.3- To execute Kratos using docker, just install docker
+
+### Launch modes
 In Kratos preferences, select the execution mode:
 * Pip packages: Kratos will be installed via `pip install`
 * local compiled: If you are a developer and build your applications, use this one
 * docker: If you do not want to install any dependency, just run via docker!
     * The default image is [fjgarate/kratos-run](https://hub.docker.com/repository/docker/fjgarate/kratos-run)
 
-## Usage
+### Usage
 * Run GiD
 * Go to: Data / Problem type / kratos
 * kratos top menu / Developer mode (recommended)

kratos.gid/exec/launch.json

@@ -3,7 +3,7 @@
         {
             "name": "Launch via pip",
             "script": "pip",
-            "pip_packages": "KratosMultiphysics-all",
+            "pip_packages": "KratosMultiphysics-all==9.1.3",
             "dependency_check": "Kratos::CheckDependenciesPipMode"
         },
         {

kratos.gid/kratos.tcl

@@ -130,7 +130,6 @@ proc Kratos::Event_InitProblemtype { dir } {
         after 500 [list spdAux::CreateWindow]
     }
 
-    Kratos::CheckDependencies
 }
 
 proc Kratos::InitGlobalVariables {dir} {
@@ -517,6 +516,7 @@ proc Kratos::Event_BeforeRunCalculation { batfilename basename dir problemtypedi
     }
     set app_run_brake [apps::ExecuteOnCurrentApp BreakRunCalculation]
     if {[write::isBooleanTrue $app_run_brake]} {return "-cancel-"}
+    if {[Kratos::CheckDependencies] ne 0} {return [list "-cancel-" "Unable to run. Missing dependencies"]}
 
 }
 

kratos.gid/scripts/Launch.tcl

@@ -45,8 +45,8 @@ proc Kratos::GetPythonExeName { } {
 proc Kratos::GetDefaultPythonPath { } {
     set pat ""
     catch {
-    set py [Kratos::GetPythonExeName]
-    set pat [exec $py -c "import sys; print(sys.executable)"  2>@1]
+        set py [Kratos::GetPythonExeName]
+        set pat [exec $py -c "import sys; print(sys.executable)"  2>@1]
     }
     return $pat
 }
@@ -97,51 +97,57 @@ proc Kratos::GetMissingPipPackages { } {
 
 proc Kratos::CheckDependencies { } {
     set curr_mode [Kratos::GetLaunchMode]
-    # W $curr_mode
+    set ret 0
+
     if {[dict exists $curr_mode dependency_check]} {
         set deps [dict get $curr_mode dependency_check]
-        $deps
+        set ret [$deps]
     }
+    ShowErrorsAndActions $ret
+    return $ret
 }
 
-proc Kratos::CheckDependenciesPipMode {} {
+proc Kratos::ShowErrorsAndActions {errs} {
     if { [GidUtils::IsTkDisabled] } {
         return 0
     }
-    set py [Kratos::GetPythonExeName]
-    set py_version [Kratos::pythonVersion $py]
-    if {$py_version <= 0} {
-        set msgBox_type yesno
-        #  -do_not_ask_again 1 -do_not_ask_again_key "kratos_install_python"
-        set reply [tk_messageBox -icon warning -type $msgBox_type -parent .gid \
-                -message "Python 3 not installed on this system. Do you want Kratos to install it?" \
-                -title [_ "Missing python"]]
-        if {[string equal $reply "yes"]} {
-            Kratos::InstallAllPythonDependencies
+    switch $errs {
+        "MISSING_PYTHON" {
+            W "Python 3 is not installed on this system. Please install it before run the case."
+        }
+        "MISSING_PIP" {
+            W "Pip is not installed on your system. Please install it."
+        }
+        "MISSING_PIP_PACKAGES" {
+            W "Run the following command on a terminal:\npip install --upgrade --force-reinstall --no-cache-dir $Kratos::pip_packages_required"
+        }
+        "DOCKER_NOT_FOUND" {
+            W "Could not start docker. Please check if the Docker service is enabled."
         }
-        if {[string equal $reply "cancel"]} {
+        "EXE_NOT_FOUND" {
 
         }
     }
-    set pip_version [Kratos::pipVersion]
-    if {$pip_version <= 0} {
-        WarnWin "pip is not installed on your system. Please install it."
-    } else {
-        set missing_packages [Kratos::GetMissingPipPackages]
-        if {[llength $missing_packages] > 0} {
-            set msgBox_type yesno
-            #  -do_not_ask_again 1 -do_not_ask_again_key "kratos_install_python"
-            set reply [tk_messageBox -icon warning -type $msgBox_type -parent .gid \
-                    -message "Python $py_version is installed, but there are some missing packages. Do you want Kratos to install them? \n\nPackages to be installed: \n$missing_packages" \
-                    -title [_ "Missing python packages"]]
-            if {[string equal $reply "yes"]} {
-                Kratos::InstallAllPythonDependencies
-            }
-            if {[string equal $reply "cancel"]} {
+}
 
+proc Kratos::CheckDependenciesPipMode {} {
+    set ret 0
+    set py [Kratos::GetPythonExeName]
+    set py_version [Kratos::pythonVersion $py]
+    if {$py_version <= 0} {
+        set ret "MISSING_PYTHON"
+    } else {
+        set pip_version [Kratos::pipVersion]
+        if {$pip_version <= 0} {
+            set ret "MISSING_PIP"
+        } else {
+            set missing_packages [Kratos::GetMissingPipPackages]
+            if {[llength $missing_packages] > 0} {
+                set ret "MISSING_PIP_PACKAGES"
             }
         }
     }
+    return $ret
 }
 proc Kratos::CheckDependenciesLocalPipMode {} {
 
@@ -150,7 +156,14 @@ proc Kratos::CheckDependenciesLocalMode {} {
 
 }
 proc Kratos::CheckDependenciesDockerMode {} {
-
+    set ret 0
+    try {
+        exec docker ps
+    } on error {msg} {
+        W $msg
+        set ret "DOCKER_NOT_FOUND"
+    }
+    return $ret
 }
 
 proc Kratos::GetLaunchConfigurationFile { } {

kratos.gid/scripts/Menus.tcl

@@ -151,7 +151,7 @@ proc Kratos::ChangeMenus { } {
     if {[GidUtils::VersionCmp "14.1.4d"] <0 } { set cmd  [list ChangeVariables kratos_preferences] } {set cmd [list PreferencesWindow kratos_preferences]}
     GiDMenu::InsertOption "Kratos" [list "Kratos preferences" ] [incr pos] PRE $cmd "" "" replace =
     GiDMenu::InsertOption "Kratos" [list "View current log" ] [incr pos] PREPOST [list Kratos::ViewLog] "" "" replace =
-    GiDMenu::InsertOption "Kratos" [list "Install python and update dependencies" ] [incr pos] PREPOST [list Kratos::InstallAllPythonDependencies] "" "" replace =
+    GiDMenu::InsertOption "Kratos" [list "Check dependencies" ] [incr pos] PREPOST [list Kratos::CheckDependencies] "" "" replace =
     GiDMenu::InsertOption "Kratos" [list "Refresh launch configurations" ] [incr pos] PREPOST [list Kratos::LoadLaunchModes 1] "" "" replace =
     GiDMenu::InsertOption "Kratos" [list "---"] [incr pos] PRE "" "" "" replace =
     GiDMenu::InsertOption "Kratos" [list "About Kratos" ] [incr pos] PREPOST [list Kratos::About] "" "" replace =