Skip to content

Commit 6ef606d

Browse files
committed
add missing import to gaugeUtils
field creation no longer zeros out data
1 parent 2601cb5 commit 6ef606d

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

src/field/fieldET.nim

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ template eval*[F:Field](x: typedesc[FieldUnop[foToSingle,F]]): typedesc =
134134
proc new*[V:static[int],T](x:var FieldObj[V,T]; l:Layout[V]) =
135135
# remember to change newFieldArray if the following changes
136136
x.l = l
137-
x.s.new(l.nSitesOuter)
137+
x.s.newU(l.nSitesOuter)
138138
#fence()
139139
x.elemSize = sizeOf(T)
140140
proc newU*[V:static[int],T](x:var FieldObj[V,T]; l:Layout[V]) =
@@ -145,7 +145,7 @@ proc newU*[V:static[int],T](x:var FieldObj[V,T]; l:Layout[V]) =
145145
x.elemSize = sizeOf(T)
146146
proc new*[V:static[int],T](x:var Field[V,T]; l:Layout[V]) =
147147
x.new()
148-
new(x[], l)
148+
newU(x[], l)
149149
proc newU*[V:static[int],T](x:var Field[V,T]; l:Layout[V]) =
150150
x.new()
151151
newU(x[], l)
@@ -164,11 +164,11 @@ proc newOneOfU*(x: Field): auto =
164164
template l*(x: FieldUnop): untyped = x.f1.l
165165
proc newOneOf*(x: FieldUnop): auto =
166166
var r: evalType(x)
167-
r.new(x.l)
167+
r.newU(x.l)
168168
r
169169
proc newOneOf*(x: Subsetted): auto =
170170
var r: type(x)
171-
r.field.new(x.field.l)
171+
r.field.newU(x.field.l)
172172
r.subset = x.subset
173173
r
174174
template new*(x: typedesc[Field], l: Layout): untyped =
@@ -185,7 +185,7 @@ proc newFieldArray*[V:static[int],T](l:Layout[V]; t:typedesc[Field[V,T]]; n: int
185185
result.shape = @[n]
186186
result.arr = newseq[t](n)
187187
var s:typeof(result.arr[0].s)
188-
s.new(l.nSitesOuter*n)
188+
s.newU(l.nSitesOuter*n)
189189
for i in 0..<n:
190190
newFarrElem(result.arr[i], l, s, i)
191191

@@ -203,7 +203,7 @@ template newFieldArray2*[V:static[int],T](l:Layout[V]; ty:typedesc[Field[V,T]];
203203
let nu {.inject.} = j
204204
if constraint: inc t
205205
var s:typeof(r.arr[0].s)
206-
s.new(l.nSitesOuter*t)
206+
s.newU(l.nSitesOuter*t)
207207
var k = 0
208208
t = 0
209209
for i in 0..<n:
@@ -228,7 +228,7 @@ proc newOneOf*[V:static[int],T](fa:FieldArray[V,T]):FieldArray[V,T] {.noinit.} =
228228
break
229229
if n < 0: return
230230
(fa.arr[n].l, fa.arr[n].s.len)
231-
s.new(n)
231+
s.newU(n)
232232
var t = 0
233233
for i in 0..<fa.arr.len:
234234
if fa.arr[i] == nil: continue

src/gauge/gaugeUtils.nim

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import times
99
import os
1010
import strUtils, sequtils
1111
import maths, rng, physics/qcdTypes
12+
import base/flopcount
1213

1314
import std/[hashes, tables]
1415

@@ -1577,11 +1578,11 @@ when isMainModule:
15771578
echo st[i].norm2
15781579
]#
15791580

1580-
var u1 = lo.newGauge(gkU, 1)
1581+
var u1 = lo.newGauge(GroupKind.gkU, 1)
15811582
echo plaq(u1)
1582-
var su2 = lo.newGauge(gkSU, 2)
1583+
var su2 = lo.newGauge(GroupKind.gkSU, 2)
15831584
echo plaq(su2)
1584-
var su3 = lo.newGauge(gkSU, 3)
1585+
var su3 = lo.newGauge(GroupKind.gkSU, 3)
15851586
echo plaq(su3)
15861587

15871588
#echoTimers()

0 commit comments

Comments
 (0)