Scaled demag energy calc in atomistic code

Author: davidcorteso

fidimag/atomistic/demag.py

@@ -69,4 +69,6 @@ def compute_energy(self):
         energy = self.demag.compute_energy(
             self.spin, self.mu_s_scale, self.field, self.energy)
 
+        self.energy /= self.scale
+
         return energy / self.scale

fidimag/atomistic/demag_hexagonal.py

@@ -149,6 +149,9 @@ def compute_energy(self):
         energy = self.demag.compute_energy(
             self.spin_c, self.mu_s_scale_c, self.field_c, self.energy_c)
 
+        self.scalar2cuboid(self.energy_c, self.energy, invert=True)
+        self.energy /= self.scale
+
         return energy / self.scale
 
     def create_cuboid_mesh(self):