kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: elmer solver, improve binary handling on Linux

Browse Source
This commit is contained in:
Bernd Hahnebach
2020-07-15 23:54:10 +02:00
parent 1017eab8de
commit ece663444c
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mod/Fem/femsolver/elmer/tasks.py
View File

@@ -28,9 +28,11 @@ __url__ = "http://www.freecadweb.org"
## \addtogroup FEM ## \addtogroup FEM
# @{ # @{
import os
import os.path import os.path
import subprocess import subprocess
import sys import sys
from platform import system
import FreeCAD import FreeCAD
@@ -103,6 +105,15 @@ class Solve(run.Solve):
self.pushStatus("Executing solver...\n") self.pushStatus("Executing solver...\n")
binary = settings.get_binary("ElmerSolver") binary = settings.get_binary("ElmerSolver")
if binary is not None: if binary is not None:
# if ELMER_HOME is not set, set it.
# Needed if elmer is compiled but not installed on Linux
# http://www.elmerfem.org/forum/viewtopic.php?f=2&t=7119
# https://stackoverflow.com/questions/1506010/how-to-use-export-with-python-on-linux
if system() == "Linux" and "ELMER_HOME" not in os.environ:
solvpath = os.path.split(binary)[0]
if os.path.isdir(solvpath):
os.environ["ELMER_HOME"] = solvpath
os.environ["LD_LIBRARY_PATH"] = "$LD_LIBRARY_PATH:{}/modules".format(solvpath)
self._process = subprocess.Popen( self._process = subprocess.Popen(
[binary], cwd=self.directory, [binary], cwd=self.directory,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,