From 22064c7e4c1c737fa8a1296f70b1f491f2925eac Mon Sep 17 00:00:00 2001 From: Alessandro Lupo Date: Fri, 25 Nov 2022 13:10:29 +0000 Subject: [PATCH] Fixing #11 --- Grid/qcd/representations/sp_two_index.h | 14 ++++++------- Grid/qcd/representations/spfundamental.h | 4 ++-- Grid/qcd/utils/Sp2nTwoIndex.h | 20 +++++++++---------- .../sp2n/Test_hmc_Sp_Wilson2ASFermionGauge.cc | 4 ++-- .../Test_hmc_Sp_WilsonFundFermionGauge.cc | 8 ++++---- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Grid/qcd/representations/sp_two_index.h b/Grid/qcd/representations/sp_two_index.h index d6884736..ec0663b4 100644 --- a/Grid/qcd/representations/sp_two_index.h +++ b/Grid/qcd/representations/sp_two_index.h @@ -29,7 +29,7 @@ public: typedef typename Sp_TwoIndex::LatticeTwoIndexField LatticeField; static const int Dimension = (ncolour * (ncolour + S) / 2) - 1; static const bool isFundamental = false; - static const int nsp = Nc / 2; + //static const int nsp = Nc / 2; LatticeField U; explicit SpTwoIndexRep(GridBase *grid) : U(grid) {} @@ -43,7 +43,7 @@ public: U = Zero(); LatticeColourMatrix tmp(Uin.Grid()); - Vector::Matrix> eij(Dimension); + Vector::Matrix> eij(Dimension); for (int a = 0; a < Dimension; a++) Sp_TwoIndex::base(a, eij[a]); @@ -71,7 +71,7 @@ public: out_mu = Zero(); - typename Sp::LatticeAlgebraVector h(in.Grid()); + typename Sp::LatticeAlgebraVector h(in.Grid()); projectOnAlgebra(h, in_mu, double(Nc + 2 * S)); // factor T(r)/T(fund) FundamentalLieAlgebraMatrix(h, out_mu); // apply scale only once pokeLorentz(out, out_mu, mu); // should be 2 for sp4 as. ok @@ -80,15 +80,15 @@ public: } private: - void projectOnAlgebra(typename Sp::LatticeAlgebraVector &h_out, + void projectOnAlgebra(typename Sp::LatticeAlgebraVector &h_out, const LatticeMatrix &in, Real scale = 1.0) const { Sp_TwoIndex::projectOnAlgebra(h_out, in, scale); } void FundamentalLieAlgebraMatrix( - typename Sp::LatticeAlgebraVector &h, - typename Sp::LatticeMatrix &out, Real scale = 1.0) const { - Sp::FundamentalLieAlgebraMatrix(h, out, scale); + typename Sp::LatticeAlgebraVector &h, + typename Sp::LatticeMatrix &out, Real scale = 1.0) const { + Sp::FundamentalLieAlgebraMatrix(h, out, scale); } }; diff --git a/Grid/qcd/representations/spfundamental.h b/Grid/qcd/representations/spfundamental.h index bab9a005..df6b6fed 100644 --- a/Grid/qcd/representations/spfundamental.h +++ b/Grid/qcd/representations/spfundamental.h @@ -14,12 +14,12 @@ template class SpFundamentalRep { public: static const int Dimension = ncolour; - static const int nSp = ncolour/2; + //static const int nSp = ncolour/2; static const bool isFundamental = true; // typdef to be used by the Representations class in HMC to get the // types for the higher representation fields - typedef typename Sp::LatticeMatrix LatticeMatrix; + typedef typename Sp::LatticeMatrix LatticeMatrix; typedef LatticeGaugeField LatticeField; explicit SpFundamentalRep(GridBase* grid) {} //do nothing diff --git a/Grid/qcd/utils/Sp2nTwoIndex.h b/Grid/qcd/utils/Sp2nTwoIndex.h index 60739551..3b685802 100644 --- a/Grid/qcd/utils/Sp2nTwoIndex.h +++ b/Grid/qcd/utils/Sp2nTwoIndex.h @@ -33,11 +33,11 @@ NAMESPACE_BEGIN(Grid); //inline Real delta(int a, int b) { return (a == b) ? 1.0 : 0.0; } template -class Sp_TwoIndex : public Sp { +class Sp_TwoIndex : public Sp { public: static const int nsp = ncolour/2; static const int Dimension = nsp * (ncolour + S) - 1 ; - static const int NumGenerators = Sp::AlgebraDimension; + static const int NumGenerators = Sp::AlgebraDimension; template using iSp2nTwoIndexMatrix = iScalar > >; @@ -175,21 +175,21 @@ public: template static void generator(int Index, iSp2nTwoIndexMatrix &i2indTa) { - Vector::template iSp2nMatrix > ta( + Vector::template iSp2nMatrix > ta( NumGenerators); - Vector::template iSp2nMatrix > eij(Dimension); - typename Sp::template iSp2nMatrix tmp; + Vector::template iSp2nMatrix > eij(Dimension); + typename Sp::template iSp2nMatrix tmp; i2indTa = Zero(); for (int a = 0; a < NumGenerators; a++) - Sp::generator(a, ta[a]); + Sp::generator(a, ta[a]); for (int a = 0; a < Dimension; a++) base(a, eij[a]); for (int a = 0; a < Dimension; a++) { tmp = transpose(ta[Index]) * adj(eij[a]) + adj(eij[a]) * ta[Index]; for (int b = 0; b < Dimension; b++) { - typename Sp::template iSp2nMatrix tmp1 = + typename Sp::template iSp2nMatrix tmp1 = tmp * eij[b]; Complex iTr = TensorRemove(timesI(trace(tmp1))); i2indTa()()(a, b) = iTr; @@ -245,7 +245,7 @@ public: } static void TwoIndexLieAlgebraMatrix( - const typename Sp::LatticeAlgebraVector &h, + const typename Sp::LatticeAlgebraVector &h, LatticeTwoIndexMatrix &out, Real scale = 1.0) { conformable(h, out); GridBase *grid = out.Grid(); @@ -264,7 +264,7 @@ public: // Projects the algebra components // of a lattice matrix ( of dimension ncol*ncol -1 ) static void projectOnAlgebra( - typename Sp::LatticeAlgebraVector &h_out, + typename Sp::LatticeAlgebraVector &h_out, const LatticeTwoIndexMatrix &in, Real scale = 1.0) { conformable(h_out, in); h_out = Zero(); @@ -280,7 +280,7 @@ public: // a projector that keeps the generators stored to avoid the overhead of // recomputing them - static void projector(typename Sp::LatticeAlgebraVector &h_out, + static void projector(typename Sp::LatticeAlgebraVector &h_out, const LatticeTwoIndexMatrix &in, Real scale = 1.0) { conformable(h_out, in); // to store the generators diff --git a/tests/sp2n/Test_hmc_Sp_Wilson2ASFermionGauge.cc b/tests/sp2n/Test_hmc_Sp_Wilson2ASFermionGauge.cc index c5eb94d0..72fae3f4 100644 --- a/tests/sp2n/Test_hmc_Sp_Wilson2ASFermionGauge.cc +++ b/tests/sp2n/Test_hmc_Sp_Wilson2ASFermionGauge.cc @@ -22,7 +22,7 @@ int main(int argc, char **argv) { CheckpointerParameters CPparams; CPparams.config_prefix = "ckpoint_lat"; CPparams.rng_prefix = "ckpoint_rng"; - CPparams.saveInterval = 5; + CPparams.saveInterval = 100; CPparams.format = "IEEE64BIG"; TheHMC.Resources.LoadNerscCheckpointer(CPparams); @@ -46,7 +46,7 @@ int main(int argc, char **argv) { SpTwoIndexAntiSymmetricRepresentation::LatticeField U(GridPtr); //LatticeGaugeField U(GridPtr); - RealD mass = -0.85; + RealD mass = -0.115; std::vector boundary = {-1,-1,-1,-1}; diff --git a/tests/sp2n/Test_hmc_Sp_WilsonFundFermionGauge.cc b/tests/sp2n/Test_hmc_Sp_WilsonFundFermionGauge.cc index d845c98f..45f86ba8 100644 --- a/tests/sp2n/Test_hmc_Sp_WilsonFundFermionGauge.cc +++ b/tests/sp2n/Test_hmc_Sp_WilsonFundFermionGauge.cc @@ -22,7 +22,7 @@ int main(int argc, char **argv) { CheckpointerParameters CPparams; CPparams.config_prefix = "ckpoint_lat"; CPparams.rng_prefix = "ckpoint_rng"; - CPparams.saveInterval = 5; + CPparams.saveInterval = 100; CPparams.format = "IEEE64BIG"; TheHMC.Resources.LoadNerscCheckpointer(CPparams); @@ -36,7 +36,7 @@ int main(int argc, char **argv) { typedef PlaquetteMod PlaqObs; TheHMC.Resources.AddObservable(); - RealD beta = 2.25 ; + RealD beta = 7.2 ; SymplWilsonGaugeActionR Waction(beta); @@ -46,7 +46,7 @@ int main(int argc, char **argv) { SpFundamentalRepresentation::LatticeField U(GridPtr); //LatticeGaugeField U(GridPtr); - RealD mass = -0.95; + RealD mass = -0.76; FermionAction FermOp(U, *GridPtr, *GridRBPtr, mass); @@ -66,7 +66,7 @@ int main(int argc, char **argv) { TheHMC.TheAction.push_back(Level1); TheHMC.TheAction.push_back(Level2); - TheHMC.Parameters.MD.MDsteps = 20; + TheHMC.Parameters.MD.MDsteps = 36; TheHMC.Parameters.MD.trajL = 1.0; TheHMC.ReadCommandLine(argc, argv);