Skip to content

Commit 527156c

Browse files
try local compiled version
1 parent d0953c7 commit 527156c

5 files changed

Lines changed: 13 additions & 11 deletions

File tree

kratos.gid/exec/compiled.unix.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ else
4242
fi
4343

4444
# Run Python using the script MainKratos.py
45-
"$3/exec/Kratos/runkratos" MainKratos.py > "$2/$1.info" 2> "$2/$1.err"
45+
"$run_kratos_exe" MainKratos.py > "$2/$1.info" 2> "$2/$1.err"

kratos.gid/exec/compiled.win.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ REM ErrorFile: "%2\%1.err"
1010
DEL "%2\%1.info"
1111
DEL "%2\%1.err"
1212

13-
set PATH=%3\\exec\\kratos;%3\\exec\\kratos\\libs;%PATH%
13+
@REM set PATH=%3\\exec\\kratos;%3\\exec\\kratos\\libs;%PATH%
1414

1515
REM Run Python using the script MainKratos.py
16-
"%3\\exec\\kratos\\runkratos" MainKratos.py > "%2\\%1.info" 2> "%2\\%1.err"
16+
%run_kratos_exe% .\MainKratos.py > "%2\\%1.info" 2> "%2\\%1.err"

kratos.gid/exec/launch.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"configurations": [
3-
{
4-
"name": "Launch via pip",
5-
"script": "pip",
6-
"pip_packages": "KratosMultiphysics-all==9.3.1",
7-
"dependency_check": "Kratos::CheckDependenciesPipMode"
8-
},
93
{
104
"name": "Launch via pip on GiDs python",
115
"script": "pip_gids_python",
126
"pip_packages": "KratosMultiphysics-all==9.3.1",
137
"dependency_check": "Kratos::CheckDependenciesPipGiDsPythonMode"
148
},
9+
{
10+
"name": "Launch via pip",
11+
"script": "pip",
12+
"pip_packages": "KratosMultiphysics-all==9.3.1",
13+
"dependency_check": "Kratos::CheckDependenciesPipMode"
14+
},
1515
{
1616
"name": "Launch local compiled version",
1717
"script": "compiled",

kratos.gid/scripts/Controllers/Preferences.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@
2020
</combobox>
2121
<entrywithbutton name="debug_folder" label="Debug path" variable="debug_folder" buttonimage="folder.png" variablemanager='Kratos::ManagePreferences' buttonfunction="OpenBrowserForDirectory" help='Path to the kratos debug folder. This is placed in the launch.json file for debugging' />
2222
<comboboxframe name="launch_configuration" label="Launch configuration" variable="launch_configuration" variablemanager='Kratos::ManagePreferences' help='' >
23-
<option value='Launch via pip' label='Launch via pip' setactivate="python_path"/>
2423
<option value='Launch via pip on GiDs python' label='Launch via pip on GiDs python'/>
24+
<option value='Launch via pip' label='Launch via pip' setactivate="python_path"/>
2525
<option value='Launch local compiled version' label='Launch local compiled version' setactivate="runkratos_path"/>
2626
<option value='Docker' label='Docker' setactivate="docker_image" />
27-
2827
<entrywithbutton name="python_path" variable="python_path" label="Python path (exe)" variablemanager='Kratos::ManagePreferences' help='Path to python.exe' buttonimage="folder.png" buttonfunction="GetPythonPath"/>
2928
<entrywithbutton name="runkratos_path" variable="runkratos_path" label="Kratos path (exe)" variablemanager='Kratos::ManagePreferences' help='Path to runkratos.exe' buttonimage="folder.png" buttonfunction="GetRunKratosPath"/>
3029
<entry name="docker_image" variable="docker_image" label="Docker image" variablemanager='Kratos::ManagePreferences' help='Name of the Kratos Docker image'/>

kratos.gid/scripts/Launch.tcl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,9 @@ proc Kratos::ExecuteLaunchByMode {launch_mode} {
287287
if {[dict get $mode name] eq "Docker"} {
288288
set docker_image [Kratos::ManagePreferences GetValue docker_image]
289289
set ::env(kratos_docker_image) $docker_image
290+
} elseif {[dict get $mode name] eq {Launch local compiled version}} {
291+
set runkratos_path [Kratos::ManagePreferences GetValue runkratos_path]
292+
set ::env(runkratos_path) $runkratos_path
290293
} else {
291294
set python_exe_path [Kratos::ManagePreferences GetValue python_path]
292295
set ::env(kratos_python_exe) $python_exe_path

0 commit comments

Comments
 (0)