Skip to content

Commit b3e7aec

Browse files
author
davidcorteso
committed
Removed mu_s_long in atomistic Zeeman class
1 parent dd4a238 commit b3e7aec

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

fidimag/atomistic/zeeman.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,6 @@ def setup(self, mesh, spin, mu_s):
6464
self.n = mesh.n
6565

6666
self.mu_s = mu_s
67-
self.mu_s_long = np.zeros(3 * mesh.n)
68-
69-
self.mu_s_long.shape = (-1, 3)
70-
for i in range(mesh.n):
71-
self.mu_s_long[i, :] = mu_s[i]
72-
73-
self.mu_s_long.shape = (-1,)
7467

7568
self.field = np.zeros(3 * self.n)
7669
self.field[:] = helper.init_vector(self.B0, self.mesh)
@@ -92,11 +85,10 @@ def average_field(self):
9285

9386
def compute_energy(self):
9487

95-
sf = self.field * self.spin * self.mu_s_long
96-
97-
energy = -np.sum(sf)
88+
sf = self.field * self.spin
89+
energy_density = -np.sum(sf.reshape(-1, 3), axis=1) * self.mu_s
9890

99-
return energy
91+
return np.sum(energy_density)
10092

10193

10294
class TimeZeeman(Zeeman):

0 commit comments

Comments
 (0)