FEM: elmer solver writer, fix indent and some code formating

This commit is contained in:
Bernd Hahnebach
2020-05-21 18:52:25 +02:00
parent 3d89d6a407
commit e92c2bee7a
2 changed files with 21 additions and 12 deletions

View File

@@ -340,8 +340,9 @@ class Writer(object):
def _handleElectrostaticConstants(self):
self._constant(
"Permittivity Of Vacuum",
getConstant("PermittivityOfVacuum", "T^4*I^2/(L^3*M)"))
# https://forum.freecadweb.org/viewtopic.php?f=18&p=400959#p400959
getConstant("PermittivityOfVacuum", "T^4*I^2/(L^3*M)")
)
# https://forum.freecadweb.org/viewtopic.php?f=18&p=400959#p400959
def _handleElectrostaticMaterial(self, bodies):
for obj in self._getMember("App::MaterialObject"):
@@ -354,7 +355,8 @@ class Writer(object):
if "RelativePermittivity" in m:
self._material(
name, "Relative Permittivity",
float(m["RelativePermittivity"]))
float(m["RelativePermittivity"])
)
def _handleElectrostaticBndConditions(self):
for obj in self._getMember("Fem::ConstraintElectrostaticPotential"):
@@ -528,20 +530,25 @@ class Writer(object):
refs = (
obj.References[0][1]
if obj.References
else self._getAllBodies())
else self._getAllBodies()
)
for name in (n for n in refs if n in bodies):
self._material(
name, "Density",
self._getDensity(m))
self._getDensity(m)
)
self._material(
name, "Youngs Modulus",
self._getYoungsModulus(m))
self._getYoungsModulus(m)
)
self._material(
name, "Poisson ratio",
float(m["PoissonRatio"]))
float(m["PoissonRatio"])
)
self._material(
name, "Heat expansion Coefficient",
convert(m["ThermalExpansionCoefficient"], "O^-1"))
convert(m["ThermalExpansionCoefficient"], "O^-1")
)
def _getDensity(self, m):
density = convert(m["Density"], "M/L^3")
@@ -606,11 +613,13 @@ class Writer(object):
if "Density" in m:
self._material(
name, "Density",
self._getDensity(m))
self._getDensity(m)
)
if "ThermalConductivity" in m:
self._material(
name, "Heat Conductivity",
convert(m["ThermalConductivity"], "M*L/(T^3*O)"))
convert(m["ThermalConductivity"], "M*L/(T^3*O)")
)
if "KinematicViscosity" in m:
density = self._getDensity(m)
kViscosity = convert(m["KinematicViscosity"], "L^2/T")
@@ -627,7 +636,8 @@ class Writer(object):
if "SpecificHeatRatio" in m:
self._material(
name, "Specific Heat Ratio",
float(m["SpecificHeatRatio"]))
float(m["SpecificHeatRatio"])
)
if "CompressibilityModel" in m:
self._material(
name, "Compressibility Model",

View File

@@ -45,7 +45,6 @@ def permittivity_of_vakuum():
return "8.8542e-12 s^4*A^2 / (m^3*kg)"
def boltzmann_constant():
return "1.3807e-23 J/K"