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

FEM: code formating, Python flake8: W503

Browse Source
This commit is contained in:
Bernd Hahnebach
2018-01-01 21:03:43 +01:00
committed by wmayer
parent 0e65035ed4
commit fdc2086d11
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Fem/FemUtils.py
View File

@@ -80,7 +80,7 @@ def isOfType(obj, t):
def isDerivedFrom(obj, t):
if (hasattr(obj, "Proxy") and hasattr(obj.Proxy, "Type")
and obj.Proxy.Type == t):
if (hasattr(obj, "Proxy") and hasattr(obj.Proxy, "Type") and
obj.Proxy.Type == t):
return True
return obj.isDerivedFrom(t)

4
src/Mod/Fem/PyGui/_TaskPanelFemSolverControl.py
View File

@@ -332,5 +332,5 @@ class ControlWidget(QtGui.QWidget):
self._directoryGrp.setDisabled(False)
self._writeBtt.setDisabled(False)
self._editBtt.setDisabled(
not machine.solver.Proxy.editSupported()
or machine.state < femsolver.run.PREPARE)
not machine.solver.Proxy.editSupported() or
machine.state < femsolver.run.PREPARE)

12
src/Mod/Fem/femsolver/elmer/sifio.py
View File

@@ -178,11 +178,11 @@ class Builder(object):
for solverSection in eqSection[self._ACTIVE_SOLVERS]:
if solverSection not in allSections:
allSections.append(solverSection)
if (BODY_FORCE in section
and section[BODY_FORCE] not in allSections):
if (BODY_FORCE in section and
section[BODY_FORCE] not in allSections):
allSections.append(section[BODY_FORCE])
if (INITIAL_CONDITION in section
and section[INITIAL_CONDITION] not in allSections):
if (INITIAL_CONDITION in section and
section[INITIAL_CONDITION] not in allSections):
allSections.append(section[INITIAL_CONDITION])
for name, section in self._boundaries.items():
section["Name"] = name
@@ -331,8 +331,8 @@ class _Writer(object):
return it.next()
def _isCollection(self, data):
return (not isinstance(data, str)
and isinstance(data, collections.Iterable))
return (not isinstance(data, str) and
isinstance(data, collections.Iterable))
def _checkScalar(self, dataType):
if issubclass(dataType, int):

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

@@ -187,8 +187,8 @@ class Machine(BaseTask):
self._confTasks()
self._isReset = False
self._pendingState = self.state
while (not self.aborted and not self.failed
and self._pendingState <= self.target):
while (not self.aborted and not self.failed and
self._pendingState <= self.target):
task = self._getTask(self._pendingState)
self._runTask(task)
self.report.extend(task.report)
@@ -368,8 +368,8 @@ class _DocObserver(object):
def _checkEquation(self, obj):
for o in obj.Document.Objects:
if (FemUtils.isDerivedFrom(o, "Fem::FemSolverObject")
and hasattr(o, "Group") and obj in o.Group):
if (FemUtils.isDerivedFrom(o, "Fem::FemSolverObject") and
hasattr(o, "Group") and obj in o.Group):
if o in _machines:
_machines[o].reset()