portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-19 16:27:05 +01: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
{