portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-11-03 21:44:33 +00:00
Code Releases Activity

Merge branch 'feature/qed-fvol' of https://github.com/paboyle/Grid into feature/qed-fvol

Browse Source 
# Conflicts:
#	extras/Hadrons/Modules.hpp
#	extras/Hadrons/modules.inc
This commit is contained in:
James Harrison
2017-06-07 16:59:47 +01:00
parent 009f48a904 f6aa82b7f2
commit c2b2b71c5d
265 changed files with 30461 additions and 7193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extras/Hadrons/Modules/MScalar/ChargedProp.cc
View File

@@ -82,7 +82,7 @@ void TChargedProp::execute(void)
LOG(Message) << "Caching momentum space free scalar propagator"
<< " (mass= " << par().mass << ")..." << std::endl;
freeMomProp_ = env().createLattice<ScalarField>(freeMomPropName_);
Scalar<SIMPL>::MomentumSpacePropagator(*freeMomProp_, par().mass);
SIMPL::MomentumSpacePropagator(*freeMomProp_, par().mass);
}
else
{

6
extras/Hadrons/Modules/MScalar/ChargedProp.hpp
View File

@@ -1,5 +1,5 @@
#ifndef Hadrons_ChargedProp_hpp_
#define Hadrons_ChargedProp_hpp_
#ifndef Hadrons_MScalar_ChargedProp_hpp_
#define Hadrons_MScalar_ChargedProp_hpp_
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Module.hpp>
@@ -59,4 +59,4 @@ END_MODULE_NAMESPACE
END_HADRONS_NAMESPACE
#endif // Hadrons_ChargedProp_hpp_
#endif // Hadrons_MScalar_ChargedProp_hpp_

4
extras/Hadrons/Modules/MScalar/FreeProp.cc
View File

@@ -52,14 +52,14 @@ void TFreeProp::execute(void)
LOG(Message) << "Caching momentum space free scalar propagator"
<< " (mass= " << par().mass << ")..." << std::endl;
freeMomProp = env().createLattice<ScalarField>(freeMomPropName_);
Scalar<SIMPL>::MomentumSpacePropagator(*freeMomProp, par().mass);
SIMPL::MomentumSpacePropagator(*freeMomProp, par().mass);
}
else
{
freeMomProp = env().getObject<ScalarField>(freeMomPropName_);
}
LOG(Message) << "Computing free scalar propagator..." << std::endl;
Scalar<SIMPL>::FreePropagator(source, prop, *freeMomProp);
SIMPL::FreePropagator(source, prop, *freeMomProp);
if (!par().output.empty())
{

6
extras/Hadrons/Modules/MScalar/FreeProp.hpp
View File

@@ -1,5 +1,5 @@
#ifndef Hadrons_FreeProp_hpp_
#define Hadrons_FreeProp_hpp_
#ifndef Hadrons_MScalar_FreeProp_hpp_
#define Hadrons_MScalar_FreeProp_hpp_
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Module.hpp>
@@ -47,4 +47,4 @@ END_MODULE_NAMESPACE
END_HADRONS_NAMESPACE
#endif // Hadrons_FreeProp_hpp_
#endif // Hadrons_MScalar_FreeProp_hpp_