Fem: udpdate current density

Author: marioalexis84

src/Mod/Fem/femsolver/elmer/equations/magnetodynamic2D_writer.py

@@ -31,6 +31,7 @@
 from FreeCAD import Console
 from FreeCAD import Units
 
+from femtools import femutils
 from .. import sifio
 from .. import writer as general_writer
 
@@ -135,15 +136,13 @@ def handleMagnetodynamic2DMaterial(self, bodies):
                     )
 
     def _outputMagnetodynamic2DBodyForce(self, obj, name, equation):
-        if hasattr(obj, "NormalCurrentDensity_re"):
-            # output only if current density is enabled and needed
-            if obj.Mode == "Normal":
-                currentDensity = float(obj.NormalCurrentDensity_re.getValueAs("A/m^2"))
-                self.write.bodyForce(name, "Current Density", round(currentDensity, 6))
-                # imaginaries are only needed for harmonic equation
-                if equation.IsHarmonic:
-                    currentDensity = float(obj.NormalCurrentDensity_im.getValueAs("A/m^2"))
-                    self.write.bodyForce(name, "Current Density Im", round(currentDensity, 6))
+        if femutils.is_derived_from(obj, "Fem::ConstraintCurrentDensity") and obj.Mode == "Normal":
+            currentDensity = obj.NormalCurrentDensity_re.getValueAs("A/m^2").Value
+            self.write.bodyForce(name, "Current Density", round(currentDensity, 6))
+            # imaginaries are only needed for harmonic equation
+            if equation.IsHarmonic:
+                currentDensity = obj.NormalCurrentDensity_im.getValueAs("A/m^2").Value
+                self.write.bodyForce(name, "Current Density Im", round(currentDensity, 6))
 
         if hasattr(obj, "Magnetization_re_1"):
             # output only if magnetization is enabled and needed

src/Mod/Fem/femsolver/elmer/equations/magnetodynamic_writer.py

@@ -162,26 +162,26 @@ def handleMagnetodynamicMaterial(self, bodies):
                     )
 
     def _outputMagnetodynamicBodyForce(self, obj, name, equation):
-        if hasattr(obj, "CurrentDensity_re_1"):
+        if femutils.is_derived_from(obj, "Fem::ConstraintCurrentDensity") and obj.Mode == "Custom":
             # output only if current density is enabled and needed
-            if not obj.CurrentDensity_re_1_Disabled:
+            if obj.EnableCurrentDensity_re_1:
                 currentDensity = float(obj.CurrentDensity_re_1.getValueAs("A/m^2"))
                 self.write.bodyForce(name, "Current Density 1", round(currentDensity, 6))
-            if not obj.CurrentDensity_re_2_Disabled:
+            if obj.EnableCurrentDensity_re_2:
                 currentDensity = float(obj.CurrentDensity_re_2.getValueAs("A/m^2"))
                 self.write.bodyForce(name, "Current Density 2", round(currentDensity, 6))
-            if not obj.CurrentDensity_re_3_Disabled:
+            if obj.EnableCurrentDensity_re_3:
                 currentDensity = float(obj.CurrentDensity_re_3.getValueAs("A/m^2"))
                 self.write.bodyForce(name, "Current Density 3", round(currentDensity, 6))
             # imaginaries are only needed for harmonic equation
             if equation.IsHarmonic:
-                if not obj.CurrentDensity_im_1_Disabled:
+                if obj.EnableCurrentDensity_im_1:
                     currentDensity = float(obj.CurrentDensity_im_1.getValueAs("A/m^2"))
                     self.write.bodyForce(name, "Current Density Im 1", round(currentDensity, 6))
-                if not obj.CurrentDensity_im_2_Disabled:
+                if obj.EnableCurrentDensity_im_2:
                     currentDensity = float(obj.CurrentDensity_im_2.getValueAs("A/m^2"))
                     self.write.bodyForce(name, "Current Density Im 2", round(currentDensity, 6))
-                if not obj.CurrentDensity_im_3_Disabled:
+                if obj.EnableCurrentDensity_im_3:
                     currentDensity = float(obj.CurrentDensity_im_3.getValueAs("A/m^2"))
                     self.write.bodyForce(name, "Current Density Im 3", round(currentDensity, 6))
 

src/Mod/Fem/femsolver/elmer/equations/staticcurrent_writer.py

@@ -96,10 +96,13 @@ def handleStaticCurrentBndConditions(self):
                     # output the FreeCAD label as comment
                     if obj.Label:
                         self.write.boundary(name, "! FreeCAD Name", obj.Label)
-                    self.write.boundary(name, "Current Density BC", True)
-                    self.write.boundary(
-                        name, "Current Density", obj.NormalCurrentDensity.getValueAs("A/m^2").Value
-                    )
+                    if obj.Mode == "Normal":
+                        self.write.boundary(name, "Current Density BC", True)
+                        self.write.boundary(
+                            name,
+                            "Current Density",
+                            obj.NormalCurrentDensity_re.getValueAs("A/m^2").Value,
+                        )
 
                 self.write.handled(obj)
 

src/Mod/Fem/femviewprovider/view_constraint_currentdensity.py

@@ -38,7 +38,7 @@ class VPConstraintCurrentDensity(view_base_femconstraint.VPBaseFemConstraint):
     def __init__(self, vobj):
         super().__init__(vobj)
         mat = vobj.ShapeAppearance[0]
-        mat.DiffuseColor = (0.0, 0.6, 0.0, 0.0)
+        mat.DiffuseColor = (0.71, 0.40, 0.11, 0.0)
         vobj.ShapeAppearance = mat
 
     def setEdit(self, vobj, mode=0):
@@ -49,3 +49,10 @@ def setEdit(self, vobj, mode=0):
     def attach(self, vobj):
         super().attach(vobj)
         vobj.loadSymbol(self.resource_symbol_dir + "ConstraintCurrentDensity.iv")
+
+    def updateData(self, obj, prop):
+        if prop == "Mode":
+            if obj.Mode == "Normal":
+                obj.ViewObject.RotateSymbol = True
+            elif obj.Mode == "Custom":
+                obj.ViewObject.RotateSymbol = False