From 30d9efe691b601dafbd62f26ba27eaf30a22ea16 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Wed, 3 Aug 2022 01:50:12 +0200
Subject: [PATCH] [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
---
 src/Mod/Fem/femsolver/elmer/equations/flux.py | 17 +++++++++++++----
 src/Mod/Fem/femsolver/elmer/writer.py         |  7 +++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

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):