diff --git a/benchmarks/Benchmark_ITT.cc b/benchmarks/Benchmark_ITT.cc index 674ad9da..36ca76dd 100644 --- a/benchmarks/Benchmark_ITT.cc +++ b/benchmarks/Benchmark_ITT.cc @@ -543,7 +543,7 @@ public: Umu5d[Ls*ss+s] = Umu[ss]; } } - ref = zero; + ref = Zero(); for(int mu=0;mu(Umu5d,mu); } diff --git a/benchmarks/Benchmark_dwf.cc b/benchmarks/Benchmark_dwf.cc index c9afeb16..6dc3799b 100644 --- a/benchmarks/Benchmark_dwf.cc +++ b/benchmarks/Benchmark_dwf.cc @@ -80,11 +80,11 @@ int main (int argc, char ** argv) LatticeFermion src (FGrid); random(RNG5,src); #if 0 - src = zero; + src = Zero(); { std::vector origin({0,0,0,latt4[2]-1,0}); SpinColourVectorF tmp; - tmp=zero; + tmp=Zero(); tmp()(0)(0)=Complex(-2.0,0.0); std::cout << " source site 0 " << tmp<Barrier(); sDw.DhopEO(ssrc_o, sr_e, DaggerNo); @@ -407,7 +407,7 @@ int main (int argc, char ** argv) if (1) { // Naive wilson dag implementation - ref = zero; + ref = Zero(); for(int mu=0;mu & latt4, int Ls, int threads,int report ) LatticeGaugeField Umu(UGrid); random(RNG4,Umu); #else - LatticeFermion src (FGrid); src=zero; - LatticeGaugeField Umu(UGrid); Umu=zero; + LatticeFermion src (FGrid); src=Zero(); + LatticeGaugeField Umu(UGrid); Umu=Zero(); #endif - LatticeFermion result(FGrid); result=zero; - LatticeFermion ref(FGrid); ref=zero; + LatticeFermion result(FGrid); result=Zero(); + LatticeFermion ref(FGrid); ref=Zero(); LatticeFermion tmp(FGrid); LatticeFermion err(FGrid); @@ -149,7 +149,7 @@ void benchDw(std::vector & latt4, int Ls, int threads,int report ) #ifdef CHECK if (1) { - ref = zero; + ref = Zero(); for(int mu=0;mu & latt4, int Ls, int threads, int report ) LatticeGaugeField Umu(UGrid); random(RNG4,Umu); #else - LatticeFermion src (FGrid); src=zero; - LatticeGaugeField Umu(UGrid); Umu=zero; + LatticeFermion src (FGrid); src=Zero(); + LatticeGaugeField Umu(UGrid); Umu=Zero(); #endif - LatticeFermion result(FGrid); result=zero; - LatticeFermion ref(FGrid); ref=zero; + LatticeFermion result(FGrid); result=Zero(); + LatticeFermion ref(FGrid); ref=Zero(); LatticeFermion tmp(FGrid); LatticeFermion err(FGrid); @@ -339,8 +339,8 @@ void benchsDw(std::vector & latt4, int Ls, int threads, int report ) setCheckerboard(sr_eo,ssrc_o); setCheckerboard(sr_eo,ssrc_e); - sr_e = zero; - sr_o = zero; + sr_e = Zero(); + sr_o = Zero(); sDw.DhopEO(ssrc_o,sr_e,DaggerNo); PerformanceCounter CounterSdw(8); diff --git a/benchmarks/Benchmark_gparity.cc b/benchmarks/Benchmark_gparity.cc index be0c8b54..640c6081 100644 --- a/benchmarks/Benchmark_gparity.cc +++ b/benchmarks/Benchmark_gparity.cc @@ -56,8 +56,8 @@ int main (int argc, char ** argv) RealD N2 = 1.0/::sqrt(norm2(src)); src = src*N2; - GparityLatticeFermionF result(FGrid); result=zero; - GparityLatticeFermionF ref(FGrid); ref=zero; + GparityLatticeFermionF result(FGrid); result=Zero(); + GparityLatticeFermionF ref(FGrid); ref=Zero(); GparityLatticeFermionF tmp(FGrid); GparityLatticeFermionF err(FGrid); diff --git a/benchmarks/Benchmark_memory_asynch.cc b/benchmarks/Benchmark_memory_asynch.cc index 6b9c4e61..829a70ba 100644 --- a/benchmarks/Benchmark_memory_asynch.cc +++ b/benchmarks/Benchmark_memory_asynch.cc @@ -64,7 +64,7 @@ int main (int argc, char ** argv) int vol = latt_size[0]*latt_size[1]*latt_size[2]*latt_size[3]*threads; - Vec tsum; tsum = zero; + Vec tsum; tsum = Zero(); GridParallelRNG pRNG(&Grid); pRNG.SeedFixedIntegers(std::vector({56,17,89,101})); diff --git a/benchmarks/Benchmark_memory_bandwidth.cc b/benchmarks/Benchmark_memory_bandwidth.cc index 766fc0b3..12b4b4e3 100644 --- a/benchmarks/Benchmark_memory_bandwidth.cc +++ b/benchmarks/Benchmark_memory_bandwidth.cc @@ -41,7 +41,7 @@ int main (int argc, char ** argv) typedef iVector Vec; - Vec rn = zero; + Vec rn = Zero(); std::vector simd_layout = GridDefaultSimd(Nd,vReal::Nsimd()); std::vector mpi_layout = GridDefaultMpi(); diff --git a/benchmarks/Benchmark_mooee.cc b/benchmarks/Benchmark_mooee.cc index ef5eba8f..788dc7d5 100644 --- a/benchmarks/Benchmark_mooee.cc +++ b/benchmarks/Benchmark_mooee.cc @@ -95,8 +95,8 @@ int main (int argc, char ** argv) setCheckerboard(r_eo,src_o); setCheckerboard(r_eo,src_e); - r_e = zero; - r_o = zero; + r_e = Zero(); + r_o = Zero(); #define BENCH_DW(A,in,out) \ @@ -204,8 +204,8 @@ int main (int argc, char ** argv) setCheckerboard(r_eo,src_o); setCheckerboard(r_eo,src_e); - r_e = zero; - r_o = zero; + r_e = Zero(); + r_o = Zero(); BENCH_DW_MEO(Dhop ,src,result); BENCH_DW_MEO(DhopEO ,src_o,r_e); diff --git a/benchmarks/Benchmark_staggered.cc b/benchmarks/Benchmark_staggered.cc index cb6d22c8..ba99ce38 100644 --- a/benchmarks/Benchmark_staggered.cc +++ b/benchmarks/Benchmark_staggered.cc @@ -57,10 +57,10 @@ int main (int argc, char ** argv) typename ImprovedStaggeredFermionR::ImplParams params; FermionField src (&Grid); random(pRNG,src); - FermionField result(&Grid); result=zero; - FermionField ref(&Grid); ref=zero; - FermionField tmp(&Grid); tmp=zero; - FermionField err(&Grid); tmp=zero; + FermionField result(&Grid); result=Zero(); + FermionField ref(&Grid); ref=Zero(); + FermionField tmp(&Grid); tmp=Zero(); + FermionField err(&Grid); tmp=Zero(); LatticeGaugeField Umu(&Grid); random(pRNG,Umu); std::vector U(4,&Grid); @@ -71,12 +71,12 @@ int main (int argc, char ** argv) // Only one non-zero (y) #if 0 - Umu=zero; + Umu=Zero(); Complex cone(1.0,0.0); for(int nn=0;nn(Umu,mu); } - ref = zero; + ref = Zero(); /* { // Naive wilson implementation - ref = zero; + ref = Zero(); for(int mu=0;mu({45,12,81,9}); LatticeFermion src (&Grid); random(pRNG,src); - LatticeFermion result(&Grid); result=zero; - LatticeFermion ref(&Grid); ref=zero; - LatticeFermion tmp(&Grid); tmp=zero; - LatticeFermion err(&Grid); tmp=zero; + LatticeFermion result(&Grid); result=Zero(); + LatticeFermion ref(&Grid); ref=Zero(); + LatticeFermion tmp(&Grid); tmp=Zero(); + LatticeFermion err(&Grid); tmp=Zero(); LatticeGaugeField Umu(&Grid); random(pRNG,Umu); std::vector U(4,&Grid); @@ -86,12 +86,12 @@ int main (int argc, char ** argv) // Only one non-zero (y) #if 0 - Umu=zero; + Umu=Zero(); Complex cone(1.0,0.0); for(int nn=0;nn());