From e51eaedc568fd678132e94bb3d70938048508fea Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Tue, 15 Nov 2022 22:58:30 -0500 Subject: [PATCH] Making tests compile --- Grid/qcd/action/ActionParams.h | 9 ++++++++ .../action/scalar/ScalarInteractionAction.h | 6 ++--- Grid/qcd/hmc/HMC.h | 7 +++--- Grid/qcd/modules/Registration.h | 12 +++++----- Grid/stencil/Stencil.h | 2 +- systems/Crusher/config-command | 3 +-- tests/core/Test_cf_coarsen_support.cc | 8 +++---- tests/core/Test_checker.cc | 4 ++-- tests/core/Test_contfrac_even_odd.cc | 16 +++++++------- tests/core/Test_dwf_eofa_even_odd.cc | 4 ++-- tests/core/Test_dwf_even_odd.cc | 4 ++-- tests/core/Test_gpwilson_even_odd.cc | 8 +++---- tests/core/Test_mobius_eofa_even_odd.cc | 4 ++-- tests/core/Test_mobius_even_odd.cc | 6 ++--- tests/core/Test_staggered.cc | 10 ++++----- tests/core/Test_staggered5D.cc | 10 ++++----- tests/core/Test_staggered_naive.cc | 10 ++++----- tests/core/Test_wilson_clover.cc | 20 ++++++++--------- tests/core/Test_wilson_conserved_current.cc | 22 +++++++++---------- tests/core/Test_wilson_even_odd.cc | 4 ++-- tests/core/Test_wilson_exp_clover.cc | 20 ++++++++--------- .../core/Test_wilson_twisted_mass_even_odd.cc | 4 ++-- tests/core/Test_zmobius_even_odd.cc | 4 ++-- tests/forces/Test_contfrac_force.cc | 2 +- tests/forces/Test_dwf_force.cc | 2 +- tests/forces/Test_dwf_force_eofa.cc | 4 ++-- tests/forces/Test_dwf_gpforce.cc | 6 ++--- tests/forces/Test_dwf_gpforce_eofa.cc | 2 +- tests/forces/Test_gpdwf_force.cc | 6 ++--- tests/forces/Test_gpdwf_force_1f_2f.cc | 4 ++-- tests/forces/Test_gpwilson_force.cc | 6 ++--- tests/forces/Test_mobius_force.cc | 2 +- tests/forces/Test_mobius_force_eofa.cc | 4 ++-- tests/forces/Test_mobius_gpforce_eofa.cc | 2 +- tests/forces/Test_partfrac_force.cc | 2 +- tests/forces/Test_wilson_force.cc | 2 +- tests/forces/Test_wilsonclover_force.cc | 2 +- tests/forces/Test_zmobius_force.cc | 2 +- tests/hmc/Test_action_dwf_gparity2fvs1f.cc | 8 +++---- tests/hmc/Test_hmc_EODWFRatio.cc | 9 +------- tests/hmc/Test_hmc_EODWFRatio_Gparity.cc | 8 +------ tests/hmc/Test_hmc_EOMobiusRatio.cc | 9 +------- .../hmc/Test_hmc_EOMobiusRatioManyFlavour.cc | 8 +------ .../Test_hmc_EOWilsonCloverFermionGauge.cc | 2 +- tests/hmc/Test_hmc_EOWilsonFermionGauge.cc | 2 +- tests/hmc/Test_hmc_EOWilsonRatio.cc | 2 +- tests/hmc/Test_hmc_GparityIwasakiGauge.cc | 2 +- tests/hmc/Test_hmc_GparityWilsonGauge.cc | 2 +- tests/hmc/Test_hmc_Mobius2p1f.cc | 10 ++++----- tests/hmc/Test_hmc_ScalarActionNxN.cc | 3 +-- tests/hmc/Test_hmc_WC2ASFG_Production.cc | 2 +- tests/hmc/Test_hmc_WC2SFG_Production.cc | 2 +- tests/hmc/Test_hmc_WCFG_Production.cc | 2 +- tests/hmc/Test_hmc_WCMixedRepFG_Production.cc | 4 ++-- tests/hmc/Test_hmc_WCadjFG_Production.cc | 2 +- .../hmc/Test_hmc_WilsonAdjointFermionGauge.cc | 2 +- .../hmc/Test_hmc_WilsonCloverFermionGauge.cc | 2 +- tests/hmc/Test_hmc_WilsonFermionGauge.cc | 2 +- tests/hmc/Test_hmc_WilsonGauge.cc | 6 +++-- ..._WilsonMixedRepresentationsFermionGauge.cc | 4 ++-- tests/hmc/Test_hmc_WilsonRatio.cc | 2 +- tests/hmc/Test_hmc_WilsonTMFermionGauge.cc | 2 +- ...hmc_WilsonTwoIndexSymmetricFermionGauge.cc | 2 +- tests/hmc/Test_rhmc_EOWilson1p1.cc | 2 +- tests/hmc/Test_rhmc_EOWilsonRatio.cc | 2 +- tests/hmc/Test_rhmc_Wilson1p1.cc | 2 +- tests/hmc/Test_rhmc_WilsonRatio.cc | 2 +- 67 files changed, 168 insertions(+), 184 deletions(-) diff --git a/Grid/qcd/action/ActionParams.h b/Grid/qcd/action/ActionParams.h index b2a06280..b332a2c3 100644 --- a/Grid/qcd/action/ActionParams.h +++ b/Grid/qcd/action/ActionParams.h @@ -35,6 +35,15 @@ directory NAMESPACE_BEGIN(Grid); // These can move into a params header and be given MacroMagic serialisation +struct DefaultImplParams { + Coordinate dirichlet; // Blocksize of dirichlet BCs + int partialDirichlet; + DefaultImplParams() { + dirichlet.resize(0); + partialDirichlet=0; + }; +}; + struct GparityWilsonImplParams { Coordinate twists; //mu=Nd-1 is assumed to be the time direction and a twist value of 1 indicates antiperiodic BCs diff --git a/Grid/qcd/action/scalar/ScalarInteractionAction.h b/Grid/qcd/action/scalar/ScalarInteractionAction.h index e04dd486..7708a489 100644 --- a/Grid/qcd/action/scalar/ScalarInteractionAction.h +++ b/Grid/qcd/action/scalar/ScalarInteractionAction.h @@ -47,7 +47,7 @@ private: const unsigned int N = Impl::Group::Dimension; typedef typename Field::vector_object vobj; - typedef CartesianStencil Stencil; + typedef CartesianStencil Stencil; SimpleCompressor compressor; int npoint = 2 * Ndim; @@ -82,7 +82,7 @@ public: virtual RealD S(const Field &p) { assert(p.Grid()->Nd() == Ndim); - static Stencil phiStencil(p.Grid(), npoint, 0, directions, displacements,0); + static Stencil phiStencil(p.Grid(), npoint, 0, directions, displacements); phiStencil.HaloExchange(p, compressor); Field action(p.Grid()), pshift(p.Grid()), phisquared(p.Grid()); phisquared = p * p; @@ -133,7 +133,7 @@ public: double interm_t = usecond(); // move this outside - static Stencil phiStencil(p.Grid(), npoint, 0, directions, displacements,0); + static Stencil phiStencil(p.Grid(), npoint, 0, directions, displacements); phiStencil.HaloExchange(p, compressor); double halo_t = usecond(); diff --git a/Grid/qcd/hmc/HMC.h b/Grid/qcd/hmc/HMC.h index 745e53c8..d4739fb0 100644 --- a/Grid/qcd/hmc/HMC.h +++ b/Grid/qcd/hmc/HMC.h @@ -143,6 +143,7 @@ private: GridBase *Grid = U.Grid(); if(Params.PerformRandomShift){ +#if 0 ////////////////////////////////////////////////////////////////////////////////////////////////////// // Mainly for DDHMC perform a random translation of U modulo volume ////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -167,11 +168,11 @@ private: //shift all fields together in a way that respects the gauge BCs for(int mu=0; mu < Grid->Nd(); mu++) Umu[mu] = FieldImplementation::CshiftLink(Umu[mu],d,shift); - } - for(int mu=0;muNd();mu++) PokeIndex(U,Umu[mu],mu); - + for(int mu=0;muNd();mu++) PokeIndex(U,Umu[mu],mu); + } std::cout << GridLogMessage << "--------------------------------------------------\n"; +#endif } TheIntegrator.reset_timer(); diff --git a/Grid/qcd/modules/Registration.h b/Grid/qcd/modules/Registration.h index 28a9fdae..db43abe1 100644 --- a/Grid/qcd/modules/Registration.h +++ b/Grid/qcd/modules/Registration.h @@ -78,13 +78,13 @@ static Registrar, // Now a specific registration with a fermion field // here must instantiate CG and CR for every new fermion field type (macro!!) -static Registrar< ConjugateGradientModule, - HMC_SolverModuleFactory > __CGWFmodXMLInit("ConjugateGradient"); +static Registrar< ConjugateGradientModule, + HMC_SolverModuleFactory > __CGWFmodXMLInit("ConjugateGradient"); -static Registrar< BiCGSTABModule, - HMC_SolverModuleFactory > __BiCGWFmodXMLInit("BiCGSTAB"); -static Registrar< ConjugateResidualModule, - HMC_SolverModuleFactory > __CRWFmodXMLInit("ConjugateResidual"); +static Registrar< BiCGSTABModule, + HMC_SolverModuleFactory > __BiCGWFmodXMLInit("BiCGSTAB"); +static Registrar< ConjugateResidualModule, + HMC_SolverModuleFactory > __CRWFmodXMLInit("ConjugateResidual"); // add the staggered, scalar versions here diff --git a/Grid/stencil/Stencil.h b/Grid/stencil/Stencil.h index 1e0b5028..ff8a6433 100644 --- a/Grid/stencil/Stencil.h +++ b/Grid/stencil/Stencil.h @@ -698,7 +698,7 @@ public: int checkerboard, const std::vector &directions, const std::vector &distances, - Parameters p) + Parameters p=Parameters()) { face_table_computed=0; _grid = grid; diff --git a/systems/Crusher/config-command b/systems/Crusher/config-command index 57b93e03..ca1d6348 100644 --- a/systems/Crusher/config-command +++ b/systems/Crusher/config-command @@ -4,11 +4,10 @@ --enable-accelerator=hip \ --enable-gen-simd-width=64 \ --enable-simd=GPU \ ---disable-fermion-reps \ --with-gmp=$OLCF_GMP_ROOT \ --with-fftw=$FFTW_DIR/.. \ --with-mpfr=/opt/cray/pe/gcc/mpfr/3.1.4/ \ ---enable-gparity \ +--disable-gparity \ CXX=hipcc MPICXX=mpicxx \ CXXFLAGS="-fPIC -I{$ROCM_PATH}/include/ -std=c++14 -I${MPICH_DIR}/include -L/lib64 " \ LDFLAGS="-L/lib64 -L/opt/rocm-5.2.0/lib/ -L${MPICH_DIR}/lib -lmpi -L${CRAY_MPICH_ROOTDIR}/gtl/lib -lmpi_gtl_hsa -lamdhip64 " diff --git a/tests/core/Test_cf_coarsen_support.cc b/tests/core/Test_cf_coarsen_support.cc index ad0309b9..0812ab7e 100644 --- a/tests/core/Test_cf_coarsen_support.cc +++ b/tests/core/Test_cf_coarsen_support.cc @@ -75,8 +75,8 @@ int main (int argc, char ** argv) RealD M5=1.8; { - OverlapWilsonContFracTanhFermionR Dcf(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,1.0); - HermitianLinearOperator HermIndefOp(Dcf); + OverlapWilsonContFracTanhFermionD Dcf(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,1.0); + HermitianLinearOperator HermIndefOp(Dcf); HermIndefOp.Op(src,ref); HermIndefOp.OpDiag(src,result); @@ -92,8 +92,8 @@ int main (int argc, char ** argv) } { - OverlapWilsonPartialFractionTanhFermionR Dpf(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,1.0); - HermitianLinearOperator HermIndefOp(Dpf); + OverlapWilsonPartialFractionTanhFermionD Dpf(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,1.0); + HermitianLinearOperator HermIndefOp(Dpf); HermIndefOp.Op(src,ref); HermIndefOp.OpDiag(src,result); diff --git a/tests/core/Test_checker.cc b/tests/core/Test_checker.cc index f87133e5..c2382e91 100644 --- a/tests/core/Test_checker.cc +++ b/tests/core/Test_checker.cc @@ -140,14 +140,14 @@ int main (int argc, char ** argv) // RealD mass=0.1; // RealD M5=1.8; - // DomainWallFermionR Ddwf(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5); + // DomainWallFermionD Ddwf(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5); // LatticeFermion src_o(FrbGrid); // LatticeFermion result_o(FrbGrid); // pickCheckerboard(Odd,src_o,src); // result_o=Zero(); - // SchurDiagMooeeOperator HermOpEO(Ddwf); + // SchurDiagMooeeOperator HermOpEO(Ddwf); // ConjugateGradient CG(1.0e-8,10000); // CG(HermOpEO,src_o,result_o); diff --git a/tests/core/Test_contfrac_even_odd.cc b/tests/core/Test_contfrac_even_odd.cc index 42bfe361..5731719a 100644 --- a/tests/core/Test_contfrac_even_odd.cc +++ b/tests/core/Test_contfrac_even_odd.cc @@ -76,20 +76,20 @@ int main (int argc, char ** argv) RealD M5 =1.8; std::cout<(Dcf,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5); + OverlapWilsonContFracTanhFermionD Dcf(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,1.0); + TestWhat(Dcf,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5); std::cout<(Dcfz,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5); + OverlapWilsonContFracZolotarevFermionD Dcfz(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,0.1,6.0); + TestWhat(Dcfz,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5); std::cout<(Dpf,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5); + OverlapWilsonPartialFractionTanhFermionD Dpf(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,1.0); + TestWhat(Dpf,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5); std::cout<(Dpfz,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5); + OverlapWilsonPartialFractionZolotarevFermionD Dpfz(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,0.1,6.0); + TestWhat(Dpfz,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5); Grid_finalize(); } diff --git a/tests/core/Test_dwf_eofa_even_odd.cc b/tests/core/Test_dwf_eofa_even_odd.cc index 7812ebb8..532c740a 100644 --- a/tests/core/Test_dwf_eofa_even_odd.cc +++ b/tests/core/Test_dwf_eofa_even_odd.cc @@ -90,7 +90,7 @@ int main (int argc, char ** argv) RealD shift = 0.1234; RealD M5 = 1.8; int pm = 1; - DomainWallEOFAFermionR Ddwf(Umu, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mq1, mq2, mq3, shift, pm, M5); + DomainWallEOFAFermionD Ddwf(Umu, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mq1, mq2, mq3, shift, pm, M5); LatticeFermion src_e (FrbGrid); LatticeFermion src_o (FrbGrid); @@ -216,7 +216,7 @@ int main (int argc, char ** argv) pickCheckerboard(Even, phi_e, phi); pickCheckerboard(Odd , phi_o, phi); - SchurDiagMooeeOperator HermOpEO(Ddwf); + SchurDiagMooeeOperator HermOpEO(Ddwf); HermOpEO.MpcDagMpc(chi_e, dchi_e); HermOpEO.MpcDagMpc(chi_o, dchi_o); diff --git a/tests/core/Test_dwf_even_odd.cc b/tests/core/Test_dwf_even_odd.cc index 924eb3b7..f915b439 100644 --- a/tests/core/Test_dwf_even_odd.cc +++ b/tests/core/Test_dwf_even_odd.cc @@ -86,7 +86,7 @@ int main (int argc, char ** argv) RealD mass=0.1; RealD M5 =1.8; - DomainWallFermionR Ddwf(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5); + DomainWallFermionD Ddwf(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5); LatticeFermion src_e (FrbGrid); LatticeFermion src_o (FrbGrid); @@ -213,7 +213,7 @@ int main (int argc, char ** argv) pickCheckerboard(Even,phi_e,phi); pickCheckerboard(Odd ,phi_o,phi); - SchurDiagMooeeOperator HermOpEO(Ddwf); + SchurDiagMooeeOperator HermOpEO(Ddwf); HermOpEO.MpcDagMpc(chi_e,dchi_e); HermOpEO.MpcDagMpc(chi_o,dchi_o); diff --git a/tests/core/Test_gpwilson_even_odd.cc b/tests/core/Test_gpwilson_even_odd.cc index d510657e..c8587435 100644 --- a/tests/core/Test_gpwilson_even_odd.cc +++ b/tests/core/Test_gpwilson_even_odd.cc @@ -52,7 +52,7 @@ int main (int argc, char ** argv) // pRNG.SeedFixedIntegers(seeds); pRNG.SeedFixedIntegers(std::vector({45,12,81,9})); - typedef typename GparityWilsonFermionR::FermionField FermionField; + typedef typename GparityWilsonFermionD::FermionField FermionField; FermionField src (&Grid); random(pRNG,src); FermionField phi (&Grid); random(pRNG,phi); @@ -80,10 +80,10 @@ int main (int argc, char ** argv) RealD mass=0.1; - GparityWilsonFermionR::ImplParams params; + GparityWilsonFermionD::ImplParams params; std::vector twists(Nd,0); twists[1] = 1; params.twists = twists; - GparityWilsonFermionR Dw(Umu,Grid,RBGrid,mass,params); + GparityWilsonFermionD Dw(Umu,Grid,RBGrid,mass,params); FermionField src_e (&RBGrid); FermionField src_o (&RBGrid); @@ -199,7 +199,7 @@ int main (int argc, char ** argv) pickCheckerboard(Even,phi_e,phi); pickCheckerboard(Odd ,phi_o,phi); - SchurDiagMooeeOperator HermOpEO(Dw); + SchurDiagMooeeOperator HermOpEO(Dw); HermOpEO.MpcDagMpc(chi_e,dchi_e); HermOpEO.MpcDagMpc(chi_o,dchi_o); diff --git a/tests/core/Test_mobius_eofa_even_odd.cc b/tests/core/Test_mobius_eofa_even_odd.cc index 68ffe624..65d55896 100644 --- a/tests/core/Test_mobius_eofa_even_odd.cc +++ b/tests/core/Test_mobius_eofa_even_odd.cc @@ -92,7 +92,7 @@ int main (int argc, char ** argv) RealD shift = 0.1234; RealD M5 = 1.8; int pm = 1; - MobiusEOFAFermionR Ddwf(Umu, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mq1, mq2, mq3, shift, pm, M5, b, c); + MobiusEOFAFermionD Ddwf(Umu, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mq1, mq2, mq3, shift, pm, M5, b, c); LatticeFermion src_e (FrbGrid); LatticeFermion src_o (FrbGrid); @@ -218,7 +218,7 @@ int main (int argc, char ** argv) pickCheckerboard(Even, phi_e, phi); pickCheckerboard(Odd , phi_o, phi); - SchurDiagMooeeOperator HermOpEO(Ddwf); + SchurDiagMooeeOperator HermOpEO(Ddwf); HermOpEO.MpcDagMpc(chi_e, dchi_e); HermOpEO.MpcDagMpc(chi_o, dchi_o); diff --git a/tests/core/Test_mobius_even_odd.cc b/tests/core/Test_mobius_even_odd.cc index e210f236..91125ac6 100644 --- a/tests/core/Test_mobius_even_odd.cc +++ b/tests/core/Test_mobius_even_odd.cc @@ -108,8 +108,8 @@ int main (int argc, char ** argv) omegas.push_back( std::complex(0.0686324988446592,-0.0550658530827402) ); #endif - MobiusFermionR Ddwf(Umu, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mass, M5, 0.5,0.5); - // DomainWallFermionR Ddwf(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5); + MobiusFermionD Ddwf(Umu, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mass, M5, 0.5,0.5); + // DomainWallFermionD Ddwf(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5); LatticeFermion src_e (FrbGrid); LatticeFermion src_o (FrbGrid); @@ -264,7 +264,7 @@ int main (int argc, char ** argv) pickCheckerboard(Odd ,phi_o,phi); - SchurDiagMooeeOperator HermOpEO(Ddwf); + SchurDiagMooeeOperator HermOpEO(Ddwf); HermOpEO.MpcDagMpc(chi_e,dchi_e); HermOpEO.MpcDagMpc(chi_o,dchi_o); diff --git a/tests/core/Test_staggered.cc b/tests/core/Test_staggered.cc index ba615ad2..f38815ae 100644 --- a/tests/core/Test_staggered.cc +++ b/tests/core/Test_staggered.cc @@ -53,9 +53,9 @@ int main (int argc, char ** argv) pRNG.SeedFixedIntegers(seeds); // pRNG.SeedFixedIntegers(std::vector({45,12,81,9}); - typedef typename ImprovedStaggeredFermionR::FermionField FermionField; - typedef typename ImprovedStaggeredFermionR::ComplexField ComplexField; - typename ImprovedStaggeredFermionR::ImplParams params; + typedef typename ImprovedStaggeredFermionD::FermionField FermionField; + typedef typename ImprovedStaggeredFermionD::ComplexField ComplexField; + typename ImprovedStaggeredFermionD::ImplParams params; FermionField src (&Grid); random(pRNG,src); FermionField result(&Grid); result=Zero(); @@ -130,7 +130,7 @@ int main (int argc, char ** argv) // ref = ref + mass * src; } - ImprovedStaggeredFermionR Ds(Umu,Umu,Grid,RBGrid,mass,c1,c2,u0,params); + ImprovedStaggeredFermionD Ds(Umu,Umu,Grid,RBGrid,mass,c1,c2,u0,params); std::cout< HermOpEO(Ds); + SchurDiagMooeeOperator HermOpEO(Ds); HermOpEO.MpcDagMpc(chi_e,dchi_e); HermOpEO.MpcDagMpc(chi_o,dchi_o); diff --git a/tests/core/Test_staggered5D.cc b/tests/core/Test_staggered5D.cc index b1b3be1d..32ad0d17 100644 --- a/tests/core/Test_staggered5D.cc +++ b/tests/core/Test_staggered5D.cc @@ -60,9 +60,9 @@ int main (int argc, char ** argv) pRNG4.SeedFixedIntegers(seeds); pRNG5.SeedFixedIntegers(seeds); - typedef typename ImprovedStaggeredFermion5DR::FermionField FermionField; - typedef typename ImprovedStaggeredFermion5DR::ComplexField ComplexField; - typename ImprovedStaggeredFermion5DR::ImplParams params; + typedef typename ImprovedStaggeredFermion5DD::FermionField FermionField; + typedef typename ImprovedStaggeredFermion5DD::ComplexField ComplexField; + typename ImprovedStaggeredFermion5DD::ImplParams params; FermionField src (FGrid); @@ -148,7 +148,7 @@ int main (int argc, char ** argv) } } - ImprovedStaggeredFermion5DR Ds(Umu,Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,c1,c2,u0,params); + ImprovedStaggeredFermion5DD Ds(Umu,Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,c1,c2,u0,params); std::cout< HermOpEO(Ds); + SchurDiagMooeeOperator HermOpEO(Ds); HermOpEO.MpcDagMpc(chi_e,dchi_e); HermOpEO.MpcDagMpc(chi_o,dchi_o); diff --git a/tests/core/Test_staggered_naive.cc b/tests/core/Test_staggered_naive.cc index d8ca9d5f..9d32ad46 100644 --- a/tests/core/Test_staggered_naive.cc +++ b/tests/core/Test_staggered_naive.cc @@ -52,9 +52,9 @@ int main (int argc, char ** argv) pRNG.SeedFixedIntegers(seeds); // pRNG.SeedFixedIntegers(std::vector({45,12,81,9}); - typedef typename NaiveStaggeredFermionR::FermionField FermionField; - typedef typename NaiveStaggeredFermionR::ComplexField ComplexField; - typename NaiveStaggeredFermionR::ImplParams params; + typedef typename NaiveStaggeredFermionD::FermionField FermionField; + typedef typename NaiveStaggeredFermionD::ComplexField ComplexField; + typename NaiveStaggeredFermionD::ImplParams params; FermionField src (&Grid); random(pRNG,src); FermionField result(&Grid); result=Zero(); @@ -120,7 +120,7 @@ int main (int argc, char ** argv) // ref = ref + mass * src; } - NaiveStaggeredFermionR Ds(Umu,Grid,RBGrid,mass,c1,u0,params); + NaiveStaggeredFermionD Ds(Umu,Grid,RBGrid,mass,c1,u0,params); std::cout< HermOpEO(Ds); + SchurDiagMooeeOperator HermOpEO(Ds); HermOpEO.MpcDagMpc(chi_e,dchi_e); HermOpEO.MpcDagMpc(chi_o,dchi_o); diff --git a/tests/core/Test_wilson_clover.cc b/tests/core/Test_wilson_clover.cc index 8f143070..0ce0513f 100644 --- a/tests/core/Test_wilson_clover.cc +++ b/tests/core/Test_wilson_clover.cc @@ -52,8 +52,8 @@ int main(int argc, char **argv) pRNG.SeedFixedIntegers(seeds); // pRNG.SeedFixedIntegers(std::vector({45,12,81,9}); - typedef typename WilsonCloverFermionR::FermionField FermionField; - typename WilsonCloverFermionR::ImplParams params; + typedef typename WilsonCloverFermionD::FermionField FermionField; + typename WilsonCloverFermionD::ImplParams params; WilsonAnisotropyCoefficients anis; FermionField src(&Grid); @@ -88,8 +88,8 @@ int main(int argc, char **argv) RealD csw_r = 1.0; RealD csw_t = 1.0; - WilsonCloverFermionR Dwc(Umu, Grid, RBGrid, mass, csw_r, csw_t, anis, params); - CompactWilsonCloverFermionR Dwc_compact(Umu, Grid, RBGrid, mass, csw_r, csw_t, 1.0, anis, params); + WilsonCloverFermionD Dwc(Umu, Grid, RBGrid, mass, csw_r, csw_t, anis, params); + CompactWilsonCloverFermionD Dwc_compact(Umu, Grid, RBGrid, mass, csw_r, csw_t, 1.0, anis, params); std::cout << GridLogMessage << "==========================================================" << std::endl; std::cout << GridLogMessage << "= Testing that Deo + Doe = Dunprec " << std::endl; @@ -324,8 +324,8 @@ int main(int argc, char **argv) } ///////////////// - WilsonCloverFermionR Dwc_prime(U_prime, Grid, RBGrid, mass, csw_r, csw_t, anis, params); - CompactWilsonCloverFermionR Dwc_compact_prime(U_prime, Grid, RBGrid, mass, csw_r, csw_t, 1.0, anis, params); + WilsonCloverFermionD Dwc_prime(U_prime, Grid, RBGrid, mass, csw_r, csw_t, anis, params); + CompactWilsonCloverFermionD Dwc_compact_prime(U_prime, Grid, RBGrid, mass, csw_r, csw_t, 1.0, anis, params); tmp = Omega * src; pickCheckerboard(Even, src_e, tmp); @@ -377,14 +377,14 @@ int main(int argc, char **argv) chi = Zero(); phi = Zero(); - WilsonFermionR Dw(Umu, Grid, RBGrid, mass, params); + WilsonFermionD Dw(Umu, Grid, RBGrid, mass, params); Dw.M(src, result); Dwc.M(src, chi); Dwc_prime.M(Omega * src, phi); - WilsonFermionR Dw_prime(U_prime, Grid, RBGrid, mass, params); + WilsonFermionD Dw_prime(U_prime, Grid, RBGrid, mass, params); Dw_prime.M(Omega * src, result2); err = result - adj(Omega) * result2; @@ -411,7 +411,7 @@ int main(int argc, char **argv) chi = Zero(); phi = Zero(); err = Zero(); - WilsonCloverFermionR Dwc_csw0(Umu, Grid, RBGrid, mass, 0.0, 0.0, anis, params); // <-- Notice: csw=0 + WilsonCloverFermionD Dwc_csw0(Umu, Grid, RBGrid, mass, 0.0, 0.0, anis, params); // <-- Notice: csw=0 pickCheckerboard(Even, phi_e, phi); pickCheckerboard(Odd, phi_o, phi); @@ -437,7 +437,7 @@ int main(int argc, char **argv) chi = Zero(); phi = Zero(); err = Zero(); - CompactWilsonCloverFermionR Dwc_compact_csw0(Umu, Grid, RBGrid, mass, 0.0, 0.0, 1.0, anis, params); // <-- Notice: csw=0 + CompactWilsonCloverFermionD Dwc_compact_csw0(Umu, Grid, RBGrid, mass, 0.0, 0.0, 1.0, anis, params); // <-- Notice: csw=0 pickCheckerboard(Even, phi_e, phi); pickCheckerboard(Odd, phi_o, phi); diff --git a/tests/core/Test_wilson_conserved_current.cc b/tests/core/Test_wilson_conserved_current.cc index 3ee1a271..c66bf940 100644 --- a/tests/core/Test_wilson_conserved_current.cc +++ b/tests/core/Test_wilson_conserved_current.cc @@ -74,7 +74,7 @@ int main (int argc, char ** argv) SU::HotConfiguration(RNG4,Umu); } - typename WilsonCloverFermionR::ImplParams params; + typename WilsonCloverFermionD::ImplParams params; WilsonAnisotropyCoefficients anis; RealD mass = 0.1; RealD csw_r = 1.0; @@ -83,32 +83,32 @@ int main (int argc, char ** argv) std::cout<(Dw,Umu,UGrid,UrbGrid,&RNG4); + WilsonFermionD Dw(Umu,*UGrid,*UrbGrid,mass,params); + TestConserved(Dw,Umu,UGrid,UrbGrid,&RNG4); std::cout<(Dwc,Umu,UGrid,UrbGrid,&RNG4); + WilsonCloverFermionD Dwc(Umu, *UGrid, *UrbGrid, mass, csw_r, csw_t, anis, params); + TestConserved(Dwc,Umu,UGrid,UrbGrid,&RNG4); std::cout<(Dwcc,Umu,UGrid,UrbGrid,&RNG4); + CompactWilsonCloverFermionD Dwcc(Umu, *UGrid, *UrbGrid, mass, csw_r, csw_t, 1.0, anis, params); + TestConserved(Dwcc,Umu,UGrid,UrbGrid,&RNG4); std::cout<(Dewc,Umu,UGrid,UrbGrid,&RNG4); + WilsonExpCloverFermionD Dewc(Umu, *UGrid, *UrbGrid, mass, csw_r, csw_t, anis, params); + TestConserved(Dewc,Umu,UGrid,UrbGrid,&RNG4); std::cout<(Dewcc,Umu,UGrid,UrbGrid,&RNG4); + CompactWilsonExpCloverFermionD Dewcc(Umu, *UGrid, *UrbGrid, mass, csw_r, csw_t, 1.0, anis, params); + TestConserved(Dewcc,Umu,UGrid,UrbGrid,&RNG4); Grid_finalize(); } diff --git a/tests/core/Test_wilson_even_odd.cc b/tests/core/Test_wilson_even_odd.cc index 4d240b80..81081bd0 100644 --- a/tests/core/Test_wilson_even_odd.cc +++ b/tests/core/Test_wilson_even_odd.cc @@ -89,7 +89,7 @@ int main (int argc, char ** argv) RealD mass=0.1; - WilsonFermionR Dw(Umu,Grid,RBGrid,mass); + WilsonFermionD Dw(Umu,Grid,RBGrid,mass); LatticeFermion src_e (&RBGrid); LatticeFermion src_o (&RBGrid); @@ -205,7 +205,7 @@ int main (int argc, char ** argv) pickCheckerboard(Even,phi_e,phi); pickCheckerboard(Odd ,phi_o,phi); - SchurDiagMooeeOperator HermOpEO(Dw); + SchurDiagMooeeOperator HermOpEO(Dw); HermOpEO.MpcDagMpc(chi_e,dchi_e); HermOpEO.MpcDagMpc(chi_o,dchi_o); diff --git a/tests/core/Test_wilson_exp_clover.cc b/tests/core/Test_wilson_exp_clover.cc index 8516d0dc..017d8823 100644 --- a/tests/core/Test_wilson_exp_clover.cc +++ b/tests/core/Test_wilson_exp_clover.cc @@ -52,8 +52,8 @@ int main(int argc, char **argv) pRNG.SeedFixedIntegers(seeds); // pRNG.SeedFixedIntegers(std::vector({45,12,81,9}); - typedef typename WilsonExpCloverFermionR::FermionField FermionField; - typename WilsonExpCloverFermionR::ImplParams params; + typedef typename WilsonExpCloverFermionD::FermionField FermionField; + typename WilsonExpCloverFermionD::ImplParams params; WilsonAnisotropyCoefficients anis; FermionField src(&Grid); @@ -88,8 +88,8 @@ int main(int argc, char **argv) RealD csw_r = 1.0; RealD csw_t = 1.0; - WilsonExpCloverFermionR Dwc(Umu, Grid, RBGrid, mass, csw_r, csw_t, anis, params); - CompactWilsonExpCloverFermionR Dwc_compact(Umu, Grid, RBGrid, mass, csw_r, csw_t, 1.0, anis, params); + WilsonExpCloverFermionD Dwc(Umu, Grid, RBGrid, mass, csw_r, csw_t, anis, params); + CompactWilsonExpCloverFermionD Dwc_compact(Umu, Grid, RBGrid, mass, csw_r, csw_t, 1.0, anis, params); std::cout << GridLogMessage << "==========================================================" << std::endl; std::cout << GridLogMessage << "= Testing that Deo + Doe = Dunprec " << std::endl; @@ -324,8 +324,8 @@ int main(int argc, char **argv) } ///////////////// - WilsonExpCloverFermionR Dwc_prime(U_prime, Grid, RBGrid, mass, csw_r, csw_t, anis, params); - CompactWilsonExpCloverFermionR Dwc_compact_prime(U_prime, Grid, RBGrid, mass, csw_r, csw_t, 1.0, anis, params); + WilsonExpCloverFermionD Dwc_prime(U_prime, Grid, RBGrid, mass, csw_r, csw_t, anis, params); + CompactWilsonExpCloverFermionD Dwc_compact_prime(U_prime, Grid, RBGrid, mass, csw_r, csw_t, 1.0, anis, params); tmp = Omega * src; pickCheckerboard(Even, src_e, tmp); @@ -377,14 +377,14 @@ int main(int argc, char **argv) chi = Zero(); phi = Zero(); - WilsonFermionR Dw(Umu, Grid, RBGrid, mass, params); + WilsonFermionD Dw(Umu, Grid, RBGrid, mass, params); Dw.M(src, result); Dwc.M(src, chi); Dwc_prime.M(Omega * src, phi); - WilsonFermionR Dw_prime(U_prime, Grid, RBGrid, mass, params); + WilsonFermionD Dw_prime(U_prime, Grid, RBGrid, mass, params); Dw_prime.M(Omega * src, result2); err = result - adj(Omega) * result2; @@ -411,7 +411,7 @@ int main(int argc, char **argv) chi = Zero(); phi = Zero(); err = Zero(); - WilsonExpCloverFermionR Dwc_csw0(Umu, Grid, RBGrid, mass, 0.0, 0.0, anis, params); // <-- Notice: csw=0 + WilsonExpCloverFermionD Dwc_csw0(Umu, Grid, RBGrid, mass, 0.0, 0.0, anis, params); // <-- Notice: csw=0 pickCheckerboard(Even, phi_e, phi); pickCheckerboard(Odd, phi_o, phi); @@ -437,7 +437,7 @@ int main(int argc, char **argv) chi = Zero(); phi = Zero(); err = Zero(); - CompactWilsonExpCloverFermionR Dwc_compact_csw0(Umu, Grid, RBGrid, mass, 0.0, 0.0, 1.0, anis, params); // <-- Notice: csw=0 + CompactWilsonExpCloverFermionD Dwc_compact_csw0(Umu, Grid, RBGrid, mass, 0.0, 0.0, 1.0, anis, params); // <-- Notice: csw=0 pickCheckerboard(Even, phi_e, phi); pickCheckerboard(Odd, phi_o, phi); diff --git a/tests/core/Test_wilson_twisted_mass_even_odd.cc b/tests/core/Test_wilson_twisted_mass_even_odd.cc index d9e798c3..0351f7cd 100644 --- a/tests/core/Test_wilson_twisted_mass_even_odd.cc +++ b/tests/core/Test_wilson_twisted_mass_even_odd.cc @@ -90,7 +90,7 @@ int main (int argc, char ** argv) RealD mass=0.1; RealD mu = 0.1; - WilsonTMFermionR Dw(Umu,Grid,RBGrid,mass,mu); + WilsonTMFermionD Dw(Umu,Grid,RBGrid,mass,mu); LatticeFermion src_e (&RBGrid); LatticeFermion src_o (&RBGrid); @@ -206,7 +206,7 @@ int main (int argc, char ** argv) pickCheckerboard(Even,phi_e,phi); pickCheckerboard(Odd ,phi_o,phi); - SchurDiagMooeeOperator HermOpEO(Dw); + SchurDiagMooeeOperator HermOpEO(Dw); HermOpEO.MpcDagMpc(chi_e,dchi_e); HermOpEO.MpcDagMpc(chi_o,dchi_o); diff --git a/tests/core/Test_zmobius_even_odd.cc b/tests/core/Test_zmobius_even_odd.cc index f6e18934..ee6fe860 100644 --- a/tests/core/Test_zmobius_even_odd.cc +++ b/tests/core/Test_zmobius_even_odd.cc @@ -123,7 +123,7 @@ int main (int argc, char ** argv) RealD _mass,RealD _M5, std::vector &gamma, RealD b,RealD c,const ImplParams &p= ImplParams()) : */ - ZMobiusFermionR Ddwf(Umu, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mass, M5, omegas,RealD(1.),RealD(0.)); + ZMobiusFermionD Ddwf(Umu, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mass, M5, omegas,RealD(1.),RealD(0.)); LatticeFermion src_e (FrbGrid); LatticeFermion src_o (FrbGrid); @@ -278,7 +278,7 @@ int main (int argc, char ** argv) pickCheckerboard(Odd ,phi_o,phi); - SchurDiagMooeeOperator HermOpEO(Ddwf); + SchurDiagMooeeOperator HermOpEO(Ddwf); HermOpEO.MpcDagMpc(chi_e,dchi_e); HermOpEO.MpcDagMpc(chi_o,dchi_o); diff --git a/tests/forces/Test_contfrac_force.cc b/tests/forces/Test_contfrac_force.cc index dc9eedce..526cde12 100644 --- a/tests/forces/Test_contfrac_force.cc +++ b/tests/forces/Test_contfrac_force.cc @@ -66,7 +66,7 @@ int main (int argc, char ** argv) //////////////////////////////////// RealD mass=0.01; RealD M5=1.8; - OverlapWilsonContFracTanhFermionR Dcf(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,1.0); + OverlapWilsonContFracTanhFermionD Dcf(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,1.0); Dcf.M (phi,Mphi); ComplexD S = innerProduct(Mphi,Mphi); // pdag MdagM p diff --git a/tests/forces/Test_dwf_force.cc b/tests/forces/Test_dwf_force.cc index e7d17347..1ae28bb2 100644 --- a/tests/forces/Test_dwf_force.cc +++ b/tests/forces/Test_dwf_force.cc @@ -67,7 +67,7 @@ int main (int argc, char ** argv) //////////////////////////////////// RealD mass=0.01; RealD M5=1.8; - DomainWallFermionR Ddwf(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5); + DomainWallFermionD Ddwf(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5); Ddwf.M (phi,Mphi); ComplexD S = innerProduct(Mphi,Mphi); // pdag MdagM p diff --git a/tests/forces/Test_dwf_force_eofa.cc b/tests/forces/Test_dwf_force_eofa.cc index 525178d0..d820573b 100644 --- a/tests/forces/Test_dwf_force_eofa.cc +++ b/tests/forces/Test_dwf_force_eofa.cc @@ -80,8 +80,8 @@ int main (int argc, char** argv) RealD mf = 0.01; RealD mb = 1.0; RealD M5 = 1.8; - DomainWallEOFAFermionR Lop(U, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mf, mf, mb, 0.0, -1, M5); - DomainWallEOFAFermionR Rop(U, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mb, mf, mb, -1.0, 1, M5); + DomainWallEOFAFermionD Lop(U, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mf, mf, mb, 0.0, -1, M5); + DomainWallEOFAFermionD Rop(U, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mb, mf, mb, -1.0, 1, M5); OneFlavourRationalParams Params(0.95, 100.0, 5000, 1.0e-12, 12); ConjugateGradient CG(1.0e-12, 5000); ExactOneFlavourRatioPseudoFermionAction Meofa(Lop, Rop, CG, CG, CG, CG, CG, Params, true); diff --git a/tests/forces/Test_dwf_gpforce.cc b/tests/forces/Test_dwf_gpforce.cc index 9db2c563..72d30369 100644 --- a/tests/forces/Test_dwf_gpforce.cc +++ b/tests/forces/Test_dwf_gpforce.cc @@ -47,7 +47,7 @@ int main (int argc, char ** argv) GridCartesian * FGrid = SpaceTimeGrid::makeFiveDimGrid(Ls,UGrid); GridRedBlackCartesian * FrbGrid = SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls,UGrid); - typedef typename GparityDomainWallFermionR::FermionField FermionField; + typedef typename GparityDomainWallFermionD::FermionField FermionField; int threads = GridThread::GetThreads(); std::cout< twists(Nd,0); twists[nu] = 1; twists[Nd-1] = 1; //antiperiodic in time - GparityDomainWallFermionR::ImplParams params; + GparityDomainWallFermionD::ImplParams params; params.twists = twists; - GparityDomainWallFermionR Dw(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,params); + GparityDomainWallFermionD Dw(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,params); Dw.M (phi,Mphi); diff --git a/tests/forces/Test_dwf_gpforce_eofa.cc b/tests/forces/Test_dwf_gpforce_eofa.cc index fd47d33c..08923faa 100644 --- a/tests/forces/Test_dwf_gpforce_eofa.cc +++ b/tests/forces/Test_dwf_gpforce_eofa.cc @@ -33,7 +33,7 @@ using namespace std; using namespace Grid; typedef GparityWilsonImplR FermionImplPolicy; -typedef GparityDomainWallEOFAFermionR FermionAction; +typedef GparityDomainWallEOFAFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; int main (int argc, char** argv) diff --git a/tests/forces/Test_gpdwf_force.cc b/tests/forces/Test_gpdwf_force.cc index af1ce82b..58dbfc47 100644 --- a/tests/forces/Test_gpdwf_force.cc +++ b/tests/forces/Test_gpdwf_force.cc @@ -56,7 +56,7 @@ int main (int argc, char ** argv) int threads = GridThread::GetThreads(); std::cout< twists(Nd,0); twists[nu] = 1; twists[3] = 1; - GparityDomainWallFermionR::ImplParams params; params.twists = twists; - GparityDomainWallFermionR Ddwf(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,params); + GparityDomainWallFermionD::ImplParams params; params.twists = twists; + GparityDomainWallFermionD Ddwf(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,params); Ddwf.M (phi,Mphi); ComplexD S = innerProduct(Mphi,Mphi); // pdag MdagM p diff --git a/tests/forces/Test_gpdwf_force_1f_2f.cc b/tests/forces/Test_gpdwf_force_1f_2f.cc index 7e14eb08..c343b7ac 100644 --- a/tests/forces/Test_gpdwf_force_1f_2f.cc +++ b/tests/forces/Test_gpdwf_force_1f_2f.cc @@ -70,8 +70,8 @@ void convertFermion1f_from_2f(FermionField1f &out_1f, const FermionField2f &in_2 int nuoff = is_4d ? 0 : 1; //s in 0 direction - int L_2f = FGrid_2f->FullDimensions()[nu+nuoff]; - int L_1f = FGrid_1f->FullDimensions()[nu+nuoff]; + Integer L_2f = FGrid_2f->FullDimensions()[nu+nuoff]; + Integer L_1f = FGrid_1f->FullDimensions()[nu+nuoff]; assert(L_1f == 2 * L_2f); auto in_f0_2fgrid = PeekIndex(in_2f,0); //flavor 0 on 2f Grid diff --git a/tests/forces/Test_gpwilson_force.cc b/tests/forces/Test_gpwilson_force.cc index 7ab2ddeb..4c3380fe 100644 --- a/tests/forces/Test_gpwilson_force.cc +++ b/tests/forces/Test_gpwilson_force.cc @@ -50,7 +50,7 @@ int main (int argc, char ** argv) int threads = GridThread::GetThreads(); std::cout< twists(Nd,0); twists[nu] = 1; twists[3]=1; - GparityWilsonFermionR::ImplParams params; params.twists = twists; - GparityWilsonFermionR Wil(U,*UGrid,*UrbGrid,mass,params); + GparityWilsonFermionD::ImplParams params; params.twists = twists; + GparityWilsonFermionD Wil(U,*UGrid,*UrbGrid,mass,params); Wil.M (phi,Mphi); ComplexD S = innerProduct(Mphi,Mphi); // pdag MdagM p diff --git a/tests/forces/Test_mobius_force.cc b/tests/forces/Test_mobius_force.cc index d2326a81..3518007c 100644 --- a/tests/forces/Test_mobius_force.cc +++ b/tests/forces/Test_mobius_force.cc @@ -76,7 +76,7 @@ int main (int argc, char ** argv) p.boundary_phases[2] = 1.0; p.boundary_phases[3] =- 1.0; - MobiusFermionR Ddwf(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,b,c,p); + MobiusFermionD Ddwf(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,b,c,p); Ddwf.M (phi,Mphi); ComplexD S = innerProduct(Mphi,Mphi); // pdag MdagM p diff --git a/tests/forces/Test_mobius_force_eofa.cc b/tests/forces/Test_mobius_force_eofa.cc index 1d25771a..a8871faa 100644 --- a/tests/forces/Test_mobius_force_eofa.cc +++ b/tests/forces/Test_mobius_force_eofa.cc @@ -82,8 +82,8 @@ int main (int argc, char** argv) RealD mf = 0.01; RealD mb = 1.0; RealD M5 = 1.8; - MobiusEOFAFermionR Lop(U, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mf, mf, mb, 0.0, -1, M5, b, c); - MobiusEOFAFermionR Rop(U, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mb, mf, mb, -1.0, 1, M5, b, c); + MobiusEOFAFermionD Lop(U, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mf, mf, mb, 0.0, -1, M5, b, c); + MobiusEOFAFermionD Rop(U, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mb, mf, mb, -1.0, 1, M5, b, c); OneFlavourRationalParams Params(0.95, 100.0, 5000, 1.0e-12, 12); ConjugateGradient CG(1.0e-12, 5000); ExactOneFlavourRatioPseudoFermionAction Meofa(Lop, Rop, CG, CG, CG, CG, CG, Params, false); diff --git a/tests/forces/Test_mobius_gpforce_eofa.cc b/tests/forces/Test_mobius_gpforce_eofa.cc index 7f114615..dd71b565 100644 --- a/tests/forces/Test_mobius_gpforce_eofa.cc +++ b/tests/forces/Test_mobius_gpforce_eofa.cc @@ -34,7 +34,7 @@ using namespace Grid; ; typedef GparityWilsonImplR FermionImplPolicy; -typedef GparityMobiusEOFAFermionR FermionAction; +typedef GparityMobiusEOFAFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; int main (int argc, char** argv) diff --git a/tests/forces/Test_partfrac_force.cc b/tests/forces/Test_partfrac_force.cc index 33f7b5fd..173f7626 100644 --- a/tests/forces/Test_partfrac_force.cc +++ b/tests/forces/Test_partfrac_force.cc @@ -69,7 +69,7 @@ int main (int argc, char ** argv) //////////////////////////////////// RealD mass=0.01; RealD M5=1.8; - OverlapWilsonPartialFractionTanhFermionR Dpf(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,1.0); + OverlapWilsonPartialFractionTanhFermionD Dpf(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,1.0); Dpf.M (phi,Mphi); ComplexD S = innerProduct(Mphi,Mphi); // pdag MdagM p diff --git a/tests/forces/Test_wilson_force.cc b/tests/forces/Test_wilson_force.cc index b7bf1268..f4bf8ed3 100644 --- a/tests/forces/Test_wilson_force.cc +++ b/tests/forces/Test_wilson_force.cc @@ -67,7 +67,7 @@ int main (int argc, char ** argv) // Unmodified matrix element //////////////////////////////////// RealD mass=-4.0; //kills the diagonal term - WilsonFermionR Dw (U, Grid,RBGrid,mass); + WilsonFermionD Dw (U, Grid,RBGrid,mass); Dw.M (phi,Mphi); ComplexD S = innerProduct(Mphi,Mphi); // pdag MdagM p diff --git a/tests/forces/Test_wilsonclover_force.cc b/tests/forces/Test_wilsonclover_force.cc index 6a28e4e2..8aa5eb9d 100644 --- a/tests/forces/Test_wilsonclover_force.cc +++ b/tests/forces/Test_wilsonclover_force.cc @@ -70,7 +70,7 @@ int main(int argc, char **argv) //////////////////////////////////// RealD mass = 0.1; Real csw = 1.0; - WilsonCloverFermionR Dw(U, Grid, RBGrid, mass, csw, csw); + WilsonCloverFermionD Dw(U, Grid, RBGrid, mass, csw, csw); Dw.ImportGauge(U); Dw.M(phi, Mphi); ComplexD S = innerProduct(Mphi, Mphi); // Action : pdag MdagM p diff --git a/tests/forces/Test_zmobius_force.cc b/tests/forces/Test_zmobius_force.cc index 89673bc7..5d3a86f4 100644 --- a/tests/forces/Test_zmobius_force.cc +++ b/tests/forces/Test_zmobius_force.cc @@ -81,7 +81,7 @@ int main (int argc, char ** argv) omegas.push_back( std::complex(0.0686324988446592,0.0550658530827402) ); omegas.push_back( std::complex(0.0686324988446592,-0.0550658530827402) ); - ZMobiusFermionR Ddwf(U, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mass, M5, omegas,b,c); + ZMobiusFermionD Ddwf(U, *FGrid, *FrbGrid, *UGrid, *UrbGrid, mass, M5, omegas,b,c); Ddwf.M (phi,Mphi); diff --git a/tests/hmc/Test_action_dwf_gparity2fvs1f.cc b/tests/hmc/Test_action_dwf_gparity2fvs1f.cc index 830bcead..46f87d93 100644 --- a/tests/hmc/Test_action_dwf_gparity2fvs1f.cc +++ b/tests/hmc/Test_action_dwf_gparity2fvs1f.cc @@ -59,7 +59,7 @@ void copy2fTo1fFermionField(FermionField1f &out, const FermionField2f &in, int g LatticeInteger xcoor_1f(out.Grid()); //5d lattice integer LatticeCoordinate(xcoor_1f,gpdir); - int L = dim_2f[gpdir]; + Integer L = dim_2f[gpdir]; out = where(xcoor_1f < L, f0_fullgrid_dbl, f1_fullgrid_dbl); } @@ -76,7 +76,7 @@ void copy2fTo1fGaugeField(LatticeGaugeField &out, const LatticeGaugeField &in, i LatticeInteger xcoor_1f(out.Grid()); LatticeCoordinate(xcoor_1f,gpdir); - int L = dim_2f[gpdir]; + Integer L = dim_2f[gpdir]; out = where(xcoor_1f < L, U_dbl, Uconj_dbl); } @@ -140,11 +140,11 @@ int main(int argc, char **argv) { copy2fTo1fGaugeField(Umu_1f, Umu_2f, mu); typedef GparityWilsonImplR FermionImplPolicy2f; - typedef GparityDomainWallFermionR FermionAction2f; + typedef GparityDomainWallFermionD FermionAction2f; typedef typename FermionAction2f::FermionField FermionField2f; typedef WilsonImplR FermionImplPolicy1f; - typedef DomainWallFermionR FermionAction1f; + typedef DomainWallFermionD FermionAction1f; typedef typename FermionAction1f::FermionField FermionField1f; std::cout << "Generating eta 2f" << std::endl; diff --git a/tests/hmc/Test_hmc_EODWFRatio.cc b/tests/hmc/Test_hmc_EODWFRatio.cc index 93469ffe..ff8521cb 100644 --- a/tests/hmc/Test_hmc_EODWFRatio.cc +++ b/tests/hmc/Test_hmc_EODWFRatio.cc @@ -43,7 +43,7 @@ int main(int argc, char **argv) { // Typedefs to simplify notation typedef GenericHMCRunner HMCWrapper; // Uses the default minimum norm typedef WilsonImplR FermionImplPolicy; - typedef DomainWallFermionR FermionAction; + typedef DomainWallFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; @@ -136,16 +136,9 @@ int main(int argc, char **argv) { TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file // Reset performance counters - NumOp.ZeroCounters(); - DenOp.ZeroCounters(); TheHMC.Run(); // no smearing // TheHMC.Run(SmearingPolicy); // for smearing - std::cout << GridLogMessage << "Numerator report, Pauli-Villars term : " << std::endl; - NumOp.Report(); - std::cout << GridLogMessage << "Denominator report, Dw(m) term (includes CG) : " << std::endl; - DenOp.Report(); - Grid_finalize(); } // main diff --git a/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc b/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc index 9ca0b0a0..f98d0edc 100644 --- a/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc +++ b/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc @@ -42,7 +42,7 @@ int main(int argc, char **argv) { typedef ConjugateHMCRunner HMCWrapper; // Uses the default minimum norm typedef GparityWilsonImplR FermionImplPolicy; - typedef GparityDomainWallFermionR FermionAction; + typedef GparityDomainWallFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; @@ -132,15 +132,9 @@ int main(int argc, char **argv) { TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file // Reset performance counters - NumOp.ZeroCounters(); - DenOp.ZeroCounters(); TheHMC.Run(); // no smearing // TheHMC.Run(SmearingPolicy); // for smearing - std::cout << GridLogMessage << "Numerator report, Pauli-Villars term : " << std::endl; - NumOp.Report(); - std::cout << GridLogMessage << "Denominator report, Dw(m) term (includes CG) : " << std::endl; - DenOp.Report(); Grid_finalize(); diff --git a/tests/hmc/Test_hmc_EOMobiusRatio.cc b/tests/hmc/Test_hmc_EOMobiusRatio.cc index 63b4d4fa..0e0a6611 100644 --- a/tests/hmc/Test_hmc_EOMobiusRatio.cc +++ b/tests/hmc/Test_hmc_EOMobiusRatio.cc @@ -83,7 +83,7 @@ int main(int argc, char **argv) { // Typedefs to simplify notation typedef GenericHMCRunner HMCWrapper; // Uses the default minimum norm typedef WilsonImplR FermionImplPolicy; - typedef MobiusFermionR FermionAction; + typedef MobiusFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; // Serialiser typedef Grid::XmlReader Serialiser; @@ -211,8 +211,6 @@ int main(int argc, char **argv) { */ // Reset performance counters - NumOp.ZeroCounters(); - DenOp.ZeroCounters(); if (ApplySmearing){ SmearingParameters SmPar(Reader); @@ -225,11 +223,6 @@ int main(int argc, char **argv) { TheHMC.Run(); // no smearing } - std::cout << GridLogMessage << "Numerator report, Pauli-Villars term : " << std::endl; - NumOp.Report(); - std::cout << GridLogMessage << "Denominator report, Dw(m) term (includes CG) : " << std::endl; - DenOp.Report(); - Grid_finalize(); } // main diff --git a/tests/hmc/Test_hmc_EOMobiusRatioManyFlavour.cc b/tests/hmc/Test_hmc_EOMobiusRatioManyFlavour.cc index 790433f2..3f29ae62 100644 --- a/tests/hmc/Test_hmc_EOMobiusRatioManyFlavour.cc +++ b/tests/hmc/Test_hmc_EOMobiusRatioManyFlavour.cc @@ -89,7 +89,7 @@ int main(int argc, char **argv) { // Typedefs to simplify notation typedef GenericHMCRunner HMCWrapper; // Uses the default minimum norm typedef WilsonImplR FermionImplPolicy; - typedef MobiusFermionR FermionAction; + typedef MobiusFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; // Serialiser typedef Grid::XmlReader Serialiser; @@ -226,8 +226,6 @@ int main(int argc, char **argv) { */ // Reset performance counters - NumOp.ZeroCounters(); - DenOp.ZeroCounters(); if (ApplySmearing){ SmearingParameters SmPar(Reader); @@ -240,10 +238,6 @@ int main(int argc, char **argv) { TheHMC.Run(); // no smearing } - std::cout << GridLogMessage << "Numerator report, Pauli-Villars term : " << std::endl; - NumOp.Report(); - std::cout << GridLogMessage << "Denominator report, Dw(m) term (includes CG) : " << std::endl; - DenOp.Report(); Grid_finalize(); } // main diff --git a/tests/hmc/Test_hmc_EOWilsonCloverFermionGauge.cc b/tests/hmc/Test_hmc_EOWilsonCloverFermionGauge.cc index 6b9b70b5..f6485f20 100644 --- a/tests/hmc/Test_hmc_EOWilsonCloverFermionGauge.cc +++ b/tests/hmc/Test_hmc_EOWilsonCloverFermionGauge.cc @@ -39,7 +39,7 @@ int main(int argc, char **argv) { // Typedefs to simplify notation typedef GenericHMCRunner HMCWrapper; // Uses the default minimum norm typedef WilsonImplR FermionImplPolicy; - typedef WilsonCloverFermionR FermionAction; + typedef WilsonCloverFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; diff --git a/tests/hmc/Test_hmc_EOWilsonFermionGauge.cc b/tests/hmc/Test_hmc_EOWilsonFermionGauge.cc index 3643c0ad..092e66d1 100644 --- a/tests/hmc/Test_hmc_EOWilsonFermionGauge.cc +++ b/tests/hmc/Test_hmc_EOWilsonFermionGauge.cc @@ -40,7 +40,7 @@ int main(int argc, char **argv) { // Typedefs to simplify notation typedef GenericHMCRunner HMCWrapper; // Uses the default minimum norm typedef WilsonImplR FermionImplPolicy; - typedef WilsonFermionR FermionAction; + typedef WilsonFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; diff --git a/tests/hmc/Test_hmc_EOWilsonRatio.cc b/tests/hmc/Test_hmc_EOWilsonRatio.cc index 675bc605..406aa34d 100644 --- a/tests/hmc/Test_hmc_EOWilsonRatio.cc +++ b/tests/hmc/Test_hmc_EOWilsonRatio.cc @@ -42,7 +42,7 @@ int main(int argc, char **argv) { // Typedefs to simplify notation typedef GenericHMCRunner HMCWrapper; // Uses the default minimum norm typedef WilsonImplR FermionImplPolicy; - typedef WilsonFermionR FermionAction; + typedef WilsonFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; diff --git a/tests/hmc/Test_hmc_GparityIwasakiGauge.cc b/tests/hmc/Test_hmc_GparityIwasakiGauge.cc index d4bfa0a5..d79404a0 100644 --- a/tests/hmc/Test_hmc_GparityIwasakiGauge.cc +++ b/tests/hmc/Test_hmc_GparityIwasakiGauge.cc @@ -41,7 +41,7 @@ int main(int argc, char **argv) { typedef ConjugateHMCRunner HMCWrapper; // Uses the default minimum norm typedef GparityWilsonImplR FermionImplPolicy; - typedef GparityDomainWallFermionR FermionAction; + typedef GparityDomainWallFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; diff --git a/tests/hmc/Test_hmc_GparityWilsonGauge.cc b/tests/hmc/Test_hmc_GparityWilsonGauge.cc index b8c078fe..76901235 100644 --- a/tests/hmc/Test_hmc_GparityWilsonGauge.cc +++ b/tests/hmc/Test_hmc_GparityWilsonGauge.cc @@ -42,7 +42,7 @@ int main(int argc, char **argv) { typedef ConjugateHMCRunner HMCWrapper; // Uses the default minimum norm typedef GparityWilsonImplR FermionImplPolicy; - typedef GparityDomainWallFermionR FermionAction; + typedef GparityDomainWallFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; diff --git a/tests/hmc/Test_hmc_Mobius2p1f.cc b/tests/hmc/Test_hmc_Mobius2p1f.cc index 508f5b5e..8c97fbb5 100644 --- a/tests/hmc/Test_hmc_Mobius2p1f.cc +++ b/tests/hmc/Test_hmc_Mobius2p1f.cc @@ -39,7 +39,7 @@ int main(int argc, char **argv) { // Typedefs to simplify notation typedef WilsonImplR FermionImplPolicy; - typedef MobiusFermionR FermionAction; + typedef MobiusFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; typedef Grid::XmlReader Serialiser; @@ -148,14 +148,14 @@ int main(int argc, char **argv) { // Level1.push_back(&StrangePseudoFermion); // DJM: setup for EOFA ratio (Shamir) - // DomainWallEOFAFermionR Strange_Op_L(U, *FGrid, *FrbGrid, *GridPtr, *GridRBPtr, strange_mass, strange_mass, pv_mass, 0.0, -1, M5); - // DomainWallEOFAFermionR Strange_Op_R(U, *FGrid, *FrbGrid, *GridPtr, *GridRBPtr, pv_mass, strange_mass, pv_mass, -1.0, 1, M5); + // DomainWallEOFAFermionD Strange_Op_L(U, *FGrid, *FrbGrid, *GridPtr, *GridRBPtr, strange_mass, strange_mass, pv_mass, 0.0, -1, M5); + // DomainWallEOFAFermionD Strange_Op_R(U, *FGrid, *FrbGrid, *GridPtr, *GridRBPtr, pv_mass, strange_mass, pv_mass, -1.0, 1, M5); // ExactOneFlavourRatioPseudoFermionAction EOFA(Strange_Op_L, Strange_Op_R, CG, OFRp, true); // Level1.push_back(&EOFA); // DJM: setup for EOFA ratio (Mobius) - MobiusEOFAFermionR Strange_Op_L(U, *FGrid, *FrbGrid, *GridPtr, *GridRBPtr, strange_mass, strange_mass, pv_mass, 0.0, -1, M5, b, c); - MobiusEOFAFermionR Strange_Op_R(U, *FGrid, *FrbGrid, *GridPtr, *GridRBPtr, pv_mass, strange_mass, pv_mass, -1.0, 1, M5, b, c); + MobiusEOFAFermionD Strange_Op_L(U, *FGrid, *FrbGrid, *GridPtr, *GridRBPtr, strange_mass, strange_mass, pv_mass, 0.0, -1, M5, b, c); + MobiusEOFAFermionD Strange_Op_R(U, *FGrid, *FrbGrid, *GridPtr, *GridRBPtr, pv_mass, strange_mass, pv_mass, -1.0, 1, M5, b, c); ExactOneFlavourRatioPseudoFermionAction EOFA(Strange_Op_L, Strange_Op_R, CG, OFRp, true); Level1.push_back(&EOFA); diff --git a/tests/hmc/Test_hmc_ScalarActionNxN.cc b/tests/hmc/Test_hmc_ScalarActionNxN.cc index 726ecd4a..119a39dc 100644 --- a/tests/hmc/Test_hmc_ScalarActionNxN.cc +++ b/tests/hmc/Test_hmc_ScalarActionNxN.cc @@ -34,7 +34,7 @@ class ScalarActionParameters : Serializable { double, lambda, double, g); - ScalarActionParameters() = default; + ScalarActionParameters() {}; template ScalarActionParameters(Reader& Reader){ @@ -45,7 +45,6 @@ class ScalarActionParameters : Serializable { } using namespace Grid; - ; template class MagMeas : public HmcObservable { diff --git a/tests/hmc/Test_hmc_WC2ASFG_Production.cc b/tests/hmc/Test_hmc_WC2ASFG_Production.cc index 0bbf4ece..55c84c0a 100644 --- a/tests/hmc/Test_hmc_WC2ASFG_Production.cc +++ b/tests/hmc/Test_hmc_WC2ASFG_Production.cc @@ -80,7 +80,7 @@ int main(int argc, char **argv) // Typedefs to simplify notation typedef GenericHMCRunnerHirep HMCWrapper; // Uses the default minimum norm typedef WilsonTwoIndexAntiSymmetricImplR FermionImplPolicy; // gauge field implemetation for the pseudofermions - typedef WilsonCloverTwoIndexAntiSymmetricFermionR FermionAction; // type of lattice fermions (Wilson, DW, ...) + typedef WilsonCloverTwoIndexAntiSymmetricFermionD FermionAction; // type of lattice fermions (Wilson, DW, ...) typedef typename FermionAction::FermionField FermionField; //typedef Grid::JSONReader Serialiser; typedef Grid::XmlReader Serialiser; diff --git a/tests/hmc/Test_hmc_WC2SFG_Production.cc b/tests/hmc/Test_hmc_WC2SFG_Production.cc index 64a3f1cb..80f7baaf 100644 --- a/tests/hmc/Test_hmc_WC2SFG_Production.cc +++ b/tests/hmc/Test_hmc_WC2SFG_Production.cc @@ -81,7 +81,7 @@ int main(int argc, char **argv) // Typedefs to simplify notation typedef GenericHMCRunnerHirep HMCWrapper; // Uses the default minimum norm typedef WilsonTwoIndexSymmetricImplR FermionImplPolicy; // gauge field implemetation for the pseudofermions - typedef WilsonCloverTwoIndexSymmetricFermionR FermionAction; // type of lattice fermions (Wilson, DW, ...) + typedef WilsonCloverTwoIndexSymmetricFermionD FermionAction; // type of lattice fermions (Wilson, DW, ...) typedef typename FermionAction::FermionField FermionField; //typedef Grid::JSONReader Serialiser; typedef Grid::XmlReader Serialiser; diff --git a/tests/hmc/Test_hmc_WCFG_Production.cc b/tests/hmc/Test_hmc_WCFG_Production.cc index cebe3791..bd02886d 100644 --- a/tests/hmc/Test_hmc_WCFG_Production.cc +++ b/tests/hmc/Test_hmc_WCFG_Production.cc @@ -79,7 +79,7 @@ int main(int argc, char **argv) // Typedefs to simplify notation typedef GenericHMCRunner HMCWrapper; // Uses the default minimum norm typedef WilsonImplR FermionImplPolicy; - typedef WilsonCloverFermionR FermionAction; + typedef WilsonCloverFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; typedef Grid::XmlReader Serialiser; diff --git a/tests/hmc/Test_hmc_WCMixedRepFG_Production.cc b/tests/hmc/Test_hmc_WCMixedRepFG_Production.cc index 211900be..ac017860 100644 --- a/tests/hmc/Test_hmc_WCMixedRepFG_Production.cc +++ b/tests/hmc/Test_hmc_WCMixedRepFG_Production.cc @@ -84,11 +84,11 @@ int main(int argc, char **argv) { typedef GenericHMCRunnerHirep HMCWrapper; typedef WilsonImplR FundImplPolicy; - typedef WilsonCloverFermionR FundFermionAction; + typedef WilsonCloverFermionD FundFermionAction; typedef typename FundFermionAction::FermionField FundFermionField; typedef WilsonTwoIndexAntiSymmetricImplR ASymmImplPolicy; - typedef WilsonCloverTwoIndexAntiSymmetricFermionR ASymmFermionAction; + typedef WilsonCloverTwoIndexAntiSymmetricFermionD ASymmFermionAction; typedef typename ASymmFermionAction::FermionField ASymmFermionField; typedef Grid::XmlReader Serialiser; diff --git a/tests/hmc/Test_hmc_WCadjFG_Production.cc b/tests/hmc/Test_hmc_WCadjFG_Production.cc index 5cf4bac1..a9673e6c 100644 --- a/tests/hmc/Test_hmc_WCadjFG_Production.cc +++ b/tests/hmc/Test_hmc_WCadjFG_Production.cc @@ -81,7 +81,7 @@ int main(int argc, char **argv) // Typedefs to simplify notation typedef GenericHMCRunnerHirep HMCWrapper; // Uses the default minimum norm typedef WilsonAdjImplR FermionImplPolicy; // gauge field implemetation for the pseudofermions - typedef WilsonCloverAdjFermionR FermionAction; // type of lattice fermions (Wilson, DW, ...) + typedef WilsonCloverAdjFermionD FermionAction; // type of lattice fermions (Wilson, DW, ...) typedef typename FermionAction::FermionField FermionField; typedef Grid::XmlReader Serialiser; diff --git a/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc b/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc index cc56cae3..774c9037 100644 --- a/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc +++ b/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc @@ -46,7 +46,7 @@ int main(int argc, char **argv) { // Typedefs to simplify notation typedef GenericHMCRunnerHirep HMCWrapper; typedef WilsonAdjImplR FermionImplPolicy; // gauge field implemetation for the pseudofermions - typedef WilsonAdjFermionR FermionAction; // type of lattice fermions (Wilson, DW, ...) + typedef WilsonAdjFermionD FermionAction; // type of lattice fermions (Wilson, DW, ...) typedef typename FermionAction::FermionField FermionField; //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/hmc/Test_hmc_WilsonCloverFermionGauge.cc b/tests/hmc/Test_hmc_WilsonCloverFermionGauge.cc index 9e27e3ec..149e6c5c 100644 --- a/tests/hmc/Test_hmc_WilsonCloverFermionGauge.cc +++ b/tests/hmc/Test_hmc_WilsonCloverFermionGauge.cc @@ -41,7 +41,7 @@ int main(int argc, char **argv) // Typedefs to simplify notation typedef GenericHMCRunner HMCWrapper; // Uses the default minimum norm typedef WilsonImplR FermionImplPolicy; - typedef WilsonCloverFermionR FermionAction; + typedef WilsonCloverFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/hmc/Test_hmc_WilsonFermionGauge.cc b/tests/hmc/Test_hmc_WilsonFermionGauge.cc index cc1f2474..a0c43c51 100644 --- a/tests/hmc/Test_hmc_WilsonFermionGauge.cc +++ b/tests/hmc/Test_hmc_WilsonFermionGauge.cc @@ -42,7 +42,7 @@ int main(int argc, char **argv) { // Typedefs to simplify notation typedef GenericHMCRunner HMCWrapper; // Uses the default minimum norm typedef WilsonImplR FermionImplPolicy; - typedef WilsonFermionR FermionAction; + typedef WilsonFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; diff --git a/tests/hmc/Test_hmc_WilsonGauge.cc b/tests/hmc/Test_hmc_WilsonGauge.cc index 4ef0e658..28feadf3 100644 --- a/tests/hmc/Test_hmc_WilsonGauge.cc +++ b/tests/hmc/Test_hmc_WilsonGauge.cc @@ -69,8 +69,10 @@ int main(int argc, char **argv) TopologyObsParameters TopParams; TopParams.interval = 5; TopParams.do_smearing = true; - TopParams.Smearing.steps = 200; - TopParams.Smearing.step_size = 0.01; + TopParams.Smearing.init_step_size = 0.01; + TopParams.Smearing.tolerance = 1e-5; + // TopParams.Smearing.steps = 200; + // TopParams.Smearing.step_size = 0.01; TopParams.Smearing.meas_interval = 50; TopParams.Smearing.maxTau = 2.0; TheHMC.Resources.AddObservable(TopParams); diff --git a/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc b/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc index 3b8cdda6..60d760a6 100644 --- a/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc +++ b/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc @@ -51,9 +51,9 @@ int main(int argc, char **argv) { typedef GenericHMCRunnerHirep HMCWrapper; typedef WilsonAdjImplR AdjImplPolicy; // gauge field implemetation for the pseudofermions - typedef WilsonAdjFermionR AdjFermionAction; // type of lattice fermions (Wilson, DW, ...) + typedef WilsonAdjFermionD AdjFermionAction; // type of lattice fermions (Wilson, DW, ...) typedef WilsonTwoIndexSymmetricImplR SymmImplPolicy; - typedef WilsonTwoIndexSymmetricFermionR SymmFermionAction; + typedef WilsonTwoIndexSymmetricFermionD SymmFermionAction; typedef typename AdjFermionAction::FermionField AdjFermionField; diff --git a/tests/hmc/Test_hmc_WilsonRatio.cc b/tests/hmc/Test_hmc_WilsonRatio.cc index 3e3cac7e..e134dd83 100644 --- a/tests/hmc/Test_hmc_WilsonRatio.cc +++ b/tests/hmc/Test_hmc_WilsonRatio.cc @@ -41,7 +41,7 @@ int main(int argc, char **argv) { // Typedefs to simplify notation typedef GenericHMCRunner HMCWrapper; // Uses the default minimum norm typedef WilsonImplR FermionImplPolicy; - typedef WilsonFermionR FermionAction; + typedef WilsonFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; diff --git a/tests/hmc/Test_hmc_WilsonTMFermionGauge.cc b/tests/hmc/Test_hmc_WilsonTMFermionGauge.cc index 5928efbe..9916580e 100644 --- a/tests/hmc/Test_hmc_WilsonTMFermionGauge.cc +++ b/tests/hmc/Test_hmc_WilsonTMFermionGauge.cc @@ -42,7 +42,7 @@ int main(int argc, char **argv) { // Typedefs to simplify notation typedef GenericHMCRunner HMCWrapper; // Uses the default minimum norm typedef WilsonImplR FermionImplPolicy; - typedef WilsonTMFermionR FermionAction; + typedef WilsonTMFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; diff --git a/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc b/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc index 387842f7..bdcd27c5 100644 --- a/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc +++ b/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc @@ -45,7 +45,7 @@ int main(int argc, char **argv) { typedef GenericHMCRunnerHirep HMCWrapper; typedef WilsonTwoIndexSymmetricImplR FermionImplPolicy; // gauge field implemetation for the pseudofermions - typedef WilsonTwoIndexSymmetricFermionR FermionAction; // type of lattice fermions (Wilson, DW, ...) + typedef WilsonTwoIndexSymmetricFermionD FermionAction; // type of lattice fermions (Wilson, DW, ...) typedef typename FermionAction::FermionField FermionField; //:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tests/hmc/Test_rhmc_EOWilson1p1.cc b/tests/hmc/Test_rhmc_EOWilson1p1.cc index 51a966b1..1e0975ca 100644 --- a/tests/hmc/Test_rhmc_EOWilson1p1.cc +++ b/tests/hmc/Test_rhmc_EOWilson1p1.cc @@ -41,7 +41,7 @@ int main(int argc, char **argv) { // Typedefs to simplify notation typedef GenericHMCRunner HMCWrapper; // Uses the default minimum norm typedef WilsonImplR FermionImplPolicy; - typedef WilsonFermionR FermionAction; + typedef WilsonFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; diff --git a/tests/hmc/Test_rhmc_EOWilsonRatio.cc b/tests/hmc/Test_rhmc_EOWilsonRatio.cc index 44fb6d47..06d54215 100644 --- a/tests/hmc/Test_rhmc_EOWilsonRatio.cc +++ b/tests/hmc/Test_rhmc_EOWilsonRatio.cc @@ -42,7 +42,7 @@ int main(int argc, char **argv) { // Typedefs to simplify notation typedef GenericHMCRunner HMCWrapper; // Uses the default minimum norm typedef WilsonImplR FermionImplPolicy; - typedef WilsonFermionR FermionAction; + typedef WilsonFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; diff --git a/tests/hmc/Test_rhmc_Wilson1p1.cc b/tests/hmc/Test_rhmc_Wilson1p1.cc index 93b748d2..2935092c 100644 --- a/tests/hmc/Test_rhmc_Wilson1p1.cc +++ b/tests/hmc/Test_rhmc_Wilson1p1.cc @@ -42,7 +42,7 @@ int main(int argc, char **argv) { // Typedefs to simplify notation typedef GenericHMCRunner HMCWrapper; // Uses the default minimum norm typedef WilsonImplR FermionImplPolicy; - typedef WilsonFermionR FermionAction; + typedef WilsonFermionD FermionAction; typedef typename FermionAction::FermionField FermionField; diff --git a/tests/hmc/Test_rhmc_WilsonRatio.cc b/tests/hmc/Test_rhmc_WilsonRatio.cc index 4896d329..60bb7641 100644 --- a/tests/hmc/Test_rhmc_WilsonRatio.cc +++ b/tests/hmc/Test_rhmc_WilsonRatio.cc @@ -41,7 +41,7 @@ int main(int argc, char **argv) { // Typedefs to simplify notation typedef GenericHMCRunner HMCWrapper; // Uses the default minimum norm typedef WilsonImplR FermionImplPolicy; - typedef WilsonFermionR FermionAction; + typedef WilsonFermionD FermionAction; typedef typename FermionAction::FermionField FermionField;