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

FEM: Python pep8 code formatting

Browse Source
This commit is contained in:
Bernd Hahnebach
2022-10-22 23:01:43 +02:00
parent 42b8c7ad5a
commit f46ed721c6
7 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/Fem/femobjects/constraint_initialpressure.py
View File

@@ -52,5 +52,4 @@ class ConstraintInitialPressure(base_fempythonobject.BaseFemPythonObject):
"Initial Pressure"
)
# App::PropertyPressure is in kPa and we initialize 1 bar
obj.Pressure = 100
obj.Pressure = 100

43
src/Mod/Fem/femresult/resulttools.py
View File

@@ -399,7 +399,9 @@ def add_principal_stress_std(res_obj):
res_obj.NodeStressYZ
)
for Sxx, Syy, Szz, Sxy, Sxz, Syz in iterator:
prin1, prin2, prin3, shear = calculate_principal_stress_std((Sxx, Syy, Szz, Sxy, Sxz, Syz))
prin1, prin2, prin3, shear = calculate_principal_stress_std(
(Sxx, Syy, Szz, Sxy, Sxz, Syz)
)
prinstress1.append(prin1)
prinstress2.append(prin2)
prinstress3.append(prin3)
@@ -418,8 +420,10 @@ def add_principal_stress_std(res_obj):
# critical strain ratio = peeq / critical_strain (>1.0 indicates ductile rupture)
# peeq = equivalent plastic strain
# critical strain = alpha * np.exp(-beta * T)
# alpha and beta are material parameters, where alpha can be related to unixial test data (user input) and
# beta is normally kept fixed at 1.5, unless available from extensive research experiments
# alpha and beta are material parameters,
# where alpha can be related to unixial test data (user input) and
# beta is normally kept fixed at 1.5,
# unless available from extensive research experiments
# T = pressure / von Mises stress (stress triaxiality)
#
@@ -428,13 +432,21 @@ def add_principal_stress_std(res_obj):
stress_strain = MatMechNon.YieldPoints
if stress_strain:
i = -1
while stress_strain[i] == "": i -= 1
while stress_strain[i] == "":
i -= 1
critical_uniaxial_strain = float(stress_strain[i].split(",")[1])
alpha = np.sqrt(np.e) * critical_uniaxial_strain # stress triaxiality T = 1/3 for uniaxial test
# stress triaxiality T = 1/3 for uniaxial test
alpha = np.sqrt(np.e) * critical_uniaxial_strain
beta = 1.5
if res_obj.Peeq:
res_obj.CriticalStrainRatio = calculate_csr(prinstress1, prinstress2, prinstress3, alpha, beta,
res_obj)
res_obj.CriticalStrainRatio = calculate_csr(
prinstress1,
prinstress2,
prinstress3,
alpha,
beta,
res_obj
)
return res_obj
@@ -448,16 +460,19 @@ def calculate_csr(ps1, ps2, ps3, alpha, beta, res_obj):
critical strain ratio = peeq / critical_strain (>1.0 indicates ductile rupture)
peeq = equivalent plastic strain
critical strain = alpha * np.exp(-beta * T)
alpha and beta are material parameters, where alpha can be related to unixial test data (user input) and
beta is normally kept fixed at 1.5, unless available from extensive research experiments
alpha and beta are material parameters,
where alpha can be related to unixial test data (user input) and
beta is normally kept fixed at 1.5,
unless available from extensive research experiments
T = pressure / von Mises stress (stress triaxiality)
"""
csr = [] # critical strain ratio
nsr = len(ps1) # number of stress results
for i in range(nsr):
p = (ps1[i] + ps2[i] + ps3[i]) / 3.0 # pressure
svm = np.sqrt(1.5 * (ps1[i] - p) ** 2 + 1.5 * (ps2[i] - p) ** 2 + 1.5 * (
ps3[i] - p) ** 2) # von Mises stress: https://en.wikipedia.org/wiki/Von_Mises_yield_criterion
svm = np.sqrt(
1.5 * (ps1[i] - p) ** 2 + 1.5 * (ps2[i] - p) ** 2 + 1.5 * (ps3[i] - p) ** 2
) # von Mises stress: https://en.wikipedia.org/wiki/Von_Mises_yield_criterion
if svm != 0.:
T = p / svm # stress triaxiality
else:
@@ -466,6 +481,7 @@ def calculate_csr(ps1, ps2, ps3, alpha, beta, res_obj):
csr.append(abs(res_obj.Peeq[i]) / critical_strain) # critical strain ratio
return csr
def get_concrete_nodes(res_obj):
"""Determine concrete / non-concrete nodes."""
from femmesh.meshtools import get_femnodes_by_refshape
@@ -660,7 +676,10 @@ def calculate_von_mises(stress_tensor):
normal = stress_tensor[:3]
shear = stress_tensor[3:]
pressure = np.average(normal)
return np.sqrt(1.5 * np.linalg.norm(normal - pressure) ** 2 + 3.0 * np.linalg.norm(shear) ** 2)
von_mises = np.sqrt(
1.5 * np.linalg.norm(normal - pressure) ** 2 + 3.0 * np.linalg.norm(shear) ** 2
)
return von_mises
def calculate_principal_stress_std(

1
src/Mod/Fem/femsolver/elmer/equations/electricforce.py
View File

@@ -34,6 +34,7 @@ from . import linear
SOLVER_EXEC_METHODS = ["After Timestep", "Always"]
def create(doc, name="Electricforce"):
return femutils.createObject(
doc, name, Proxy, ViewProxy)

1
src/Mod/Fem/femsolver/elmer/equations/flux.py
View File

@@ -37,6 +37,7 @@ from . import linear
COEFFICIENTS = ["Heat Conductivity", "None"]
VARIABLES = ["Potential", "Temperature"]
def create(doc, name="Flux"):
return femutils.createObject(
doc, name, Proxy, ViewProxy)

2
src/Mod/Fem/femsolver/elmer/equations/linear.py
View File

@@ -136,7 +136,7 @@ class Proxy(equation.Proxy):
"Steady State",
""
)
obj.BiCGstablDegree = (2, 2, 10, 1)
obj.IdrsParameter = (2, 1, 10, 1)
obj.LinearDirectMethod = LINEAR_DIRECT

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

@@ -291,7 +291,7 @@ class Results(run.Results):
else:
self.report.error("Result file not found.")
self.fail()
else:
else:
if os.path.isfile(possible_post_file_single):
postPath = possible_post_file_single
elif os.path.isfile(possible_post_file_old):

5
src/Mod/Fem/femsolver/elmer/writer.py
View File

@@ -835,7 +835,6 @@ class Writer(object):
equation.FluxVariable = flux.VARIABLES
equation.FluxVariable = tempFluxVariable
def _handleElectricforce(self):
activeIn = []
for equation in self.solver.Group:
@@ -1271,7 +1270,7 @@ class Writer(object):
# don't evaluate fluid material
if self._isBodyMaterialFluid(name):
break
if not "YoungsModulus" in m:
if "YoungsModulus" not in m:
Console.PrintMessage("m: {}\n".format(m))
# it is no fluid but also no solid
# -> user set no material reference at all
@@ -1314,7 +1313,7 @@ class Writer(object):
def _haveMaterialFluid(self):
for obj in self._getMember("App::MaterialObject"):
m = obj.Material
# fluid material always has KinematicViscosity defined
# fluid material always has KinematicViscosity defined
if "KinematicViscosity" in m:
return True
return False