make test/topologicalcharge-*.mx3 faster

machine-w · Nov 12, 2015 · 1a47333 · 1a47333
1 parent 7313693
commit 1a47333
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/test/topologicalcharge-skyrmion.mx3 b/test/topologicalcharge-skyrmion.mx3
@@ -13,20 +13,20 @@ Msat    = 1000e3
 Aex     = 10e-12
 anisU   = vector(0, 0, 1)
 Ku1     = 0.65e6
-alpha   = 0.02
+alpha   = 1
 
 m = blochskyrmion(1, 1).scale(4,4,1)
-relax()
+steps(500)
 expect("Skyrmion number" , ext_topologicalcharge,  1.0, tol)
 
 m = blochskyrmion(-1, 1).scale(4,4,1)
-relax()
+steps(500)
 expect("Skyrmion number" , ext_topologicalcharge,  1.0, tol)
 
 m = blochskyrmion(1, -1).scale(4,4,1)
-relax()
+steps(500)
 expect("Skyrmion number" , ext_topologicalcharge,  -1.0, tol)
 
 m = blochskyrmion(-1, -1).scale(4,4,1)
-relax()
-expect("Skyrmion number" , ext_topologicalcharge,  -1.0, tol)
+steps(500)
+expect("Skyrmion number" , ext_topologicalcharge,  -1.0, tol)
diff --git a/test/topologicalcharge-uniform.mx3 b/test/topologicalcharge-uniform.mx3
@@ -11,38 +11,39 @@ Msat    = 1000e3
 Aex     = 10e-12
 anisU   = vector(0, 0, 1)
 Ku1     = 0.65e6
-alpha   = 0.02
+alpha   = 1
 
 tol := 0.002
 
 m = uniform(0.0, 0.0, 1.0)
 b_ext = vector(0.0, 0.0, 2.0)
-relax()
+steps(50)
 expect("Skyrmion number" , ext_topologicalcharge,  0.0, tol)
 
 m = uniform(0.0, 0.0, -1.0)
-relax()
+b_ext = vector(0.0, 0.0, -2.0)
+steps(50)
 expect("Skyrmion number" , ext_topologicalcharge,  0.0, tol)
 
 Ku1     = 0.0
 tol = 5e-10  // changed by Arne, 5e-11 failed on GTX480
 
 b_ext = vector(2.0, 0.0, 0.0)
 m = uniform(1.0, 0.0, 0.0)
-relax()
+steps(50)
 expect("Skyrmion number" , ext_topologicalcharge,  0.0, tol)
 
 b_ext = vector(-2.0, 0.0, 0.0)
 m = uniform(-1.0, 0.0, 0.0)
-relax()
+steps(50)
 expect("Skyrmion number" , ext_topologicalcharge,  0.0, tol)
 
 b_ext = vector(0.0, 2.0, 0.0)
 m = uniform(0.0, 1.0, 0.0)
-relax()
+steps(50)
 expect("Skyrmion number" , ext_topologicalcharge,  0.0, tol)
 
 b_ext = vector(0.0, -2.0, 0.0)
 m = uniform(0.0, -1.0, 0.0)
-relax()
+steps(50)
 expect("Skyrmion number" , ext_topologicalcharge,  0.0, tol)
diff --git a/test/topologicalcharge-vortex.mx3 b/test/topologicalcharge-vortex.mx3
@@ -11,19 +11,20 @@ setcellsize(3e-9, 1.5e-9, 4e-9)
 // aka Py
 Msat    = 800e3
 Aex     = 13e-12
+alpha   = 1
 
 m = vortex(1, 1)
-relax()
+steps(500)
 expect("Skyrmion number" , ext_topologicalcharge,  0.5, tol)
 
 m = vortex(-1, 1)
-relax()
+steps(500)
 expect("Skyrmion number" , ext_topologicalcharge,  0.5, tol)
 
 m = vortex(1, -1)
-relax()
+steps(500)
 expect("Skyrmion number" , ext_topologicalcharge,  -0.5, tol)
 
 m = vortex(-1, -1)
-relax()
-expect("Skyrmion number" , ext_topologicalcharge,  -0.5, tol)
+steps(500)
+expect("Skyrmion number" , ext_topologicalcharge,  -0.5, tol)