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

FEM: solver, move observer def into base class and use decode for Py3 bytestrings

Browse Source
This commit is contained in:
Bernd Hahnebach
2018-12-19 19:32:24 +01:00
committed by wmayer
parent b73849bc33
commit 8324b2ee1b
4 changed files with 13 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Mod/Fem/femsolver/calculix/tasks.py
View File

@@ -95,19 +95,6 @@ class Solve(run.Solve):
# self._updateOutput(output)
del output # get flake8 quiet
def _observeSolver(self, process):
output = ""
line = process.stdout.readline()
self.pushStatus(line)
output += line
line = process.stdout.readline()
while line:
line = "\n%s" % line.rstrip()
self.pushStatus(line)
output += line
line = process.stdout.readline()
return output
class Results(run.Results):

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

@@ -109,19 +109,6 @@ class Solve(run.Solve):
self.report.error("ElmerSolver executable not found.")
self.fail()
def _observeSolver(self, process):
output = b""
line = process.stdout.readline()
self.pushStatus(line)
output += line
line = process.stdout.readline()
while line:
line = b"\n%s" % line.rstrip()
self.pushStatus(line)
output += line
line = process.stdout.readline()
return output
def _updateOutput(self, output):
if self.solver.ElmerOutput is None:
self._createOutput()

14
src/Mod/Fem/femsolver/run.py
View File

@@ -296,7 +296,19 @@ class Check(BaseTask):
class Solve(BaseTask):
pass
def _observeSolver(self, process):
output = ""
line = FemUtils.pydecode(process.stdout.readline())
self.pushStatus(line)
output += line
line = FemUtils.pydecode(process.stdout.readline())
while line:
line = "\n%s" % line.rstrip()
self.pushStatus(line)
output += line
line = FemUtils.pydecode(process.stdout.readline())
return output
class Prepare(BaseTask):

13
src/Mod/Fem/femsolver/z88/tasks.py
View File

@@ -110,19 +110,6 @@ class Solve(run.Solve):
# self._updateOutput(output)
del output # get flake8 quiet
def _observeSolver(self, process):
output = ""
line = process.stdout.readline()
self.pushStatus(line)
output += line
line = process.stdout.readline()
while line:
line = "\n%s" % line.rstrip()
self.pushStatus(line)
output += line
line = process.stdout.readline()
return output
class Results(run.Results):