diff --git a/src/Mod/Fem/femsolver/elmer/equations/flux.py b/src/Mod/Fem/femsolver/elmer/equations/flux.py index 6984443131..17edbbc575 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/flux.py +++ b/src/Mod/Fem/femsolver/elmer/equations/flux.py @@ -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 diff --git a/src/Mod/Fem/femsolver/elmer/writer.py b/src/Mod/Fem/femsolver/elmer/writer.py index 02e8cd1c5c..1b43b108e7 100644 --- a/src/Mod/Fem/femsolver/elmer/writer.py +++ b/src/Mod/Fem/femsolver/elmer/writer.py @@ -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):