portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-04 19:25:56 +01:00
Code Releases Activity

necessary to merge

Browse Source
This commit is contained in:
Alessandro Lupo 2021-10-12 17:08:46 +01:00
parent 8a5b794f25
commit b145fd4f5b
1 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Grid/qcd/action/gauge/GaugeImplTypes.h
View File

@ -121,10 +121,7 @@ public:
// //
LinkField Pmu(P.Grid()); LinkField Pmu(P.Grid());
Pmu = Zero(); Pmu = Zero();
<<<<<<< HEAD
=======
>>>>>>> 470d4dcc6db9fa41faceac54908bcd60a08bfd8a
for (int mu = 0; mu < Nd; mu++) for (int mu = 0; mu < Nd; mu++)
{ {
if (isSp2n == true) if (isSp2n == true)
@ -134,14 +131,10 @@ public:
} else } else
{ {
<<<<<<< HEAD
Group::GaussianFundamentalLieAlgebraMatrix(pRNG, Pmu); Group::GaussianFundamentalLieAlgebraMatrix(pRNG, Pmu);
} }
=======
SU<Nrepresentation>::GaussianFundamentalLieAlgebraMatrix(pRNG, Pmu);
}
>>>>>>> 470d4dcc6db9fa41faceac54908bcd60a08bfd8a
RealD scale = ::sqrt(HMC_MOMENTUM_DENOMINATOR) ; RealD scale = ::sqrt(HMC_MOMENTUM_DENOMINATOR) ;
Pmu = Pmu*scale; Pmu = Pmu*scale;
PokeIndex<LorentzIndex>(P, Pmu, mu); PokeIndex<LorentzIndex>(P, Pmu, mu);
@ -195,27 +188,17 @@ public:
} }
} }
<<<<<<< HEAD
static inline void HotConfiguration(GridParallelRNG &pRNG, Field &U) static inline void HotConfiguration(GridParallelRNG &pRNG, Field &U)
{ {
Group::HotConfiguration(pRNG, U); Group::HotConfiguration(pRNG, U);
=======
static inline void HotConfiguration(GridParallelRNG &pRNG, Field &U)
{
SU<Nc>::HotConfiguration(pRNG, U);
>>>>>>> 470d4dcc6db9fa41faceac54908bcd60a08bfd8a
} }
static inline void TepidConfiguration(GridParallelRNG &pRNG, Field &U) { static inline void TepidConfiguration(GridParallelRNG &pRNG, Field &U) {
Group::TepidConfiguration(pRNG, U); Group::TepidConfiguration(pRNG, U);
} }
<<<<<<< HEAD
=======
>>>>>>> 470d4dcc6db9fa41faceac54908bcd60a08bfd8a
static inline void ColdConfiguration(GridParallelRNG &pRNG, Field &U) static inline void ColdConfiguration(GridParallelRNG &pRNG, Field &U)
{ {
if (isSp2n == true) if (isSp2n == true)
@ -224,15 +207,11 @@ public:
Sp<nSp>::ColdConfiguration(pRNG, U); Sp<nSp>::ColdConfiguration(pRNG, U);
} else } else
{ {
<<<<<<< HEAD
Group::ColdConfiguration(pRNG, U); Group::ColdConfiguration(pRNG, U);
} }
} }
=======
SU<Nc>::ColdConfiguration(pRNG, U);
}
}
//sp2n... see sp2n.h //sp2n... see sp2n.h
/* /*
@ -272,7 +251,7 @@ public:
Sp<nSp>::ColdConfiguration(pRNG, U); Sp<nSp>::ColdConfiguration(pRNG, U);
} }
*/ */
>>>>>>> 470d4dcc6db9fa41faceac54908bcd60a08bfd8a
}; };
@ -285,17 +264,10 @@ typedef GaugeImplTypes<vComplex, Nc, 12, true> SymplGimplTypesR;
typedef GaugeImplTypes<vComplexF, Nc, 12, true> SymplGimplTypesF; typedef GaugeImplTypes<vComplexF, Nc, 12, true> SymplGimplTypesF;
typedef GaugeImplTypes<vComplexD, Nc, 12, true> SymplGimplTypesD; typedef GaugeImplTypes<vComplexD, Nc, 12, true> SymplGimplTypesD;
<<<<<<< HEAD
typedef GaugeImplTypes<vComplex, Group::AdjointDimension> GimplAdjointTypesR;
typedef GaugeImplTypes<vComplexF, Group::AdjointDimension> GimplAdjointTypesF;
typedef GaugeImplTypes<vComplexD, Group::AdjointDimension> GimplAdjointTypesD;
=======
typedef GaugeImplTypes<vComplex, SU<Nc>::AdjointDimension> GimplAdjointTypesR; typedef GaugeImplTypes<vComplex, SU<Nc>::AdjointDimension> GimplAdjointTypesR;
typedef GaugeImplTypes<vComplexF, SU<Nc>::AdjointDimension> GimplAdjointTypesF; typedef GaugeImplTypes<vComplexF, SU<Nc>::AdjointDimension> GimplAdjointTypesF;
typedef GaugeImplTypes<vComplexD, SU<Nc>::AdjointDimension> GimplAdjointTypesD; typedef GaugeImplTypes<vComplexD, SU<Nc>::AdjointDimension> GimplAdjointTypesD;
>>>>>>> 470d4dcc6db9fa41faceac54908bcd60a08bfd8a