[FEM] Elmer: Flux: add missing settings

- enable the disabled options. They work and are according to the Elmer manual. The user is free to use them or not and since they are all False by default, existing analyses won't be affected.
- add two missing settings
- for new equations, enable at least one calculation, otherwise nothing will happen when an inexperienced user uses the default
This commit is contained in:
Uwe
2022-08-03 01:50:12 +02:00
parent 6edf0cc5ba
commit 30d9efe691
2 changed files with 20 additions and 4 deletions

View File

@@ -45,19 +45,31 @@ class Proxy(linear.Proxy, equationbase.FluxProxy):
def __init__(self, obj):
super(Proxy, self).__init__(obj)
obj.addProperty(
"App::PropertyBool",
"DiscontinuousGalerkin",
"Flux",
""
)
obj.addProperty(
"App::PropertyBool",
"AverageWithinMaterials",
"Flux",
""
)
obj.addProperty(
"App::PropertyBool",
"CalculateFlux",
"Flux",
""
)
obj.CalculateFlux = True
obj.addProperty(
"App::PropertyString",
"FluxVariable",
"Flux",
"Insert variable name for flux calculation"
)
"""
obj.addProperty(
"App::PropertyBool",
"CalculateFluxAbs",
@@ -70,14 +82,12 @@ class Proxy(linear.Proxy, equationbase.FluxProxy):
"Flux",
"Select calculation of magnitude of flux"
)
"""
obj.addProperty(
"App::PropertyBool",
"CalculateGrad",
"Flux",
"Select calculation of gradient"
)
"""
obj.addProperty(
"App::PropertyBool",
"CalculateGradAbs",
@@ -96,7 +106,6 @@ class Proxy(linear.Proxy, equationbase.FluxProxy):
"Flux",
"Select calculation of positive magnitude"
)
"""
obj.Priority = 5

View File

@@ -536,8 +536,15 @@ class Writer(object):
s["Equation"] = "Flux Solver" # equation.Name
s["Procedure"] = sifio.FileAttr("FluxSolver/FluxSolver")
s["Flux Variable"] = equation.FluxVariable
s["Discontinuous Galerkin"] = equation.DiscontinuousGalerkin
s["Average Within Materials"] = equation.AverageWithinMaterials
s["Calculate Flux"] = equation.CalculateFlux
s["Calculate Flux Abs"] = equation.CalculateFluxAbs
s["Calculate Flux Magnitude"] = equation.CalculateFluxMagnitude
s["Calculate Grad"] = equation.CalculateGrad
s["Calculate Grad Abs"] = equation.CalculateGradAbs
s["Calculate Grad Magnitude"] = equation.CalculateGradMagnitude
s["Enforce Positive Magnitude"] = equation.EnforcePositiveMagnitude
return s
def _handleElectricforce(self):