1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-27 14:15:55 +01:00

Namespace QCD gone

This commit is contained in:
paboyle 2018-01-14 22:38:22 +00:00
parent cc349c6512
commit 6ee5ea6b32

View File

@ -24,24 +24,22 @@
See the full license in the file "LICENSE" in the top level distribution See the full license in the file "LICENSE" in the top level distribution
directory directory
*************************************************************************************/ *************************************************************************************/
/* END LEGAL */ /* END LEGAL */
#ifndef SCALAR_INT_ACTION_H #ifndef SCALAR_INT_ACTION_H
#define SCALAR_INT_ACTION_H #define SCALAR_INT_ACTION_H
// Note: this action can completely absorb the ScalarAction for real float fields // Note: this action can completely absorb the ScalarAction for real float fields
// use the scalarObjs to generalise the structure // use the scalarObjs to generalise the structure
namespace Grid { NAMESPACE_BEGIN(Grid);
// FIXME drop the QCD namespace everywhere here
template <class Impl, int Ndim > template <class Impl, int Ndim >
class ScalarInteractionAction : public QCD::Action<typename Impl::Field> { class ScalarInteractionAction : public QCD::Action<typename Impl::Field> {
public: public:
INHERIT_FIELD_TYPES(Impl); INHERIT_FIELD_TYPES(Impl);
private: private:
RealD mass_square; RealD mass_square;
RealD lambda; RealD lambda;
@ -55,7 +53,7 @@ namespace Grid {
std::vector<int> displacements;// = {1,1,1,1, -1,-1,-1,-1}; std::vector<int> displacements;// = {1,1,1,1, -1,-1,-1,-1};
public: public:
ScalarInteractionAction(RealD ms, RealD l) : mass_square(ms), lambda(l), displacements(2*Ndim,0), directions(2*Ndim,0){ ScalarInteractionAction(RealD ms, RealD l) : mass_square(ms), lambda(l), displacements(2*Ndim,0), directions(2*Ndim,0){
for (int mu = 0 ; mu < Ndim; mu++){ for (int mu = 0 ; mu < Ndim; mu++){
@ -141,8 +139,8 @@ namespace Grid {
} }
} }
} }
}; };
} // namespace Grid NAMESPACE_END(Grid);
#endif // SCALAR_INT_ACTION_H #endif // SCALAR_INT_ACTION_H