fix hisqev

jcosborn · Jan 22, 2025 · a18147d · a18147d
1 parent a0825cb
commit a18147d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/eigens/hisqev.nim b/src/eigens/hisqev.nim
@@ -560,6 +560,9 @@ when isMainModule:
   #var defaultLat = [16,16,16,16]
   defaultSetup()
   var rs = newRNGField(RngMilc6, lo, 987654321)
+  if fn == "":
+    var warm = floatParam("warm", 0.0)
+    g.warm warm, rs
 
   when false:  # HISQ
     threads:
@@ -653,8 +656,9 @@ when isMainModule:
     let s2 = t2.even.norm2
     let r2req = sp.r2req
     sp.r2req = r2req * (s1/s2)
+    sp.resetStats
     t := 0
-    s.solveEO(t, t2, m, sp)
+    s.solveEE(t, t2, m, sp)
     dt += t
     sp.r2req = r2req
 
@@ -663,7 +667,7 @@ when isMainModule:
   sp.r2req = 1e-16
 
   d1 := 0
-  s.solveEO(d1, src, m, sp)
+  s.solveEE(d1, src, m, sp)
   getResid(r, d1, src)
   echo "r1: ", r.even.norm2
 

diff --git a/src/physics/stagSolve.nim b/src/physics/stagSolve.nim
@@ -64,7 +64,7 @@ proc solveXX*(s: Staggered; r,x: Field; m: SomeNumber; sp0: var SolverParams;
   case sp.backend
   of sbQex:
     tic("sbQex")
-    proc op(a,b: Field) =
+    proc opSolveXX(a,b: Field) =
       tic("solveXX>sbQex>op")
       threadBarrier()
       if parEven:
@@ -83,7 +83,7 @@ proc solveXX*(s: Staggered; r,x: Field; m: SomeNumber; sp0: var SolverParams;
       #var oap = (apply: op, applyPrecon: oppre)
       #cg.solve(oap, sp)
     #else:
-    var oa = (apply: op, precon: cpNone)
+    var oa = (apply: opSolveXX, precon: cpNone)
     cg.solve(oa, sp)
     toc("cg.solve")
     sp.calls = 1