Skip to content

Commit 1ca9b95

Browse files
working on ubuntu
1 parent 9c50e6d commit 1ca9b95

4 files changed

Lines changed: 12 additions & 4 deletions

File tree

kratos.gid/apps/FSI/app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"themed": false,
66
"kratos_name": "FSIApplication",
77
"python_packages": [
8-
"KratosStructuralApplication",
8+
"KratosStructuralMechanicsApplication",
99
"KratosFluidDynamicsApplication",
1010
"KratosFSIApplication",
1111
"KratosMeshMovingApplication",
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/sh
2+
apt install -qq -y python3 python3-distutils python3-apt 2>1 > /dev/null

kratos.gid/exec/pip.unix.bat

100644100755
File mode changed.

kratos.gid/scripts/Launch.tcl

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,20 @@ proc Kratos::InstallAllPythonDependencies { } {
77
# Check if python is installed. minimum 3.5, best 3.9
88
set python_version [pythonVersion $py]
99
if { $python_version <= 0 || [GidUtils::TwoVersionsCmp $python_version "3.9.0"] <0 } {
10+
::GidUtils::SetWarnLine "Installing python"
11+
package require gid_cross_platform
1012
if {$os eq "win"} {
11-
package require gid_cross_platform
1213
gid_cross_platform::run_as_administrator [file join $::Kratos::kratos_private(Path) exec install_python_and_dependencies.win.bat ] $dir
1314
} {
14-
exec "sudo apt-get install python3.9"
15+
gid_cross_platform::run_as_administrator [file join $::Kratos::kratos_private(Path) exec install_python_and_dependencies.unix.sh ]
1516
}
1617
}
1718

19+
if {$os ne "win"} {
20+
::GidUtils::SetWarnLine "Installing python dependencies"
21+
gid_cross_platform::run_as_administrator [file join $::Kratos::kratos_private(Path) exec install_python_and_dependencies.unix.sh ]
22+
}
23+
1824
if {$os eq "win"} {set pip "pyw"} {set pip "python3"}
1925
set missing_packages [Kratos::GetMissingPipPackages]
2026
::GidUtils::SetWarnLine "Installing pip packages $missing_packages"
@@ -56,7 +62,7 @@ proc Kratos::pipVersion { } {
5662
proc Kratos::GetMissingPipPackages { } {
5763
set missing_packages [list ]
5864
set pip_packages_required [list KratosMultiphysics KratosFluidDynamicsApplication KratosConvectionDiffusionApplication \
59-
KratosDEMApplication numpy KratosDamApplication KratosSwimmingDEMApplication KratosStructuralApplication KratosMeshMovingApplication \
65+
KratosDEMApplication numpy KratosDamApplication KratosSwimmingDEMApplication KratosStructuralMechanicsApplication KratosMeshMovingApplication \
6066
KratosMappingApplication KratosParticleMechanicsApplication KratosLinearSolversApplication KratosContactStructuralMechanicsApplication]
6167

6268
if { $::tcl_platform(platform) == "windows" } { set os win } {set os unix}

0 commit comments

Comments
 (0)