portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-11 03:46:55 +01:00
Code Releases Activity

Fixed conflicts. PLEASE avoid making wholesale cosmetic only changes, this created

Browse Source 
a HUGE amount of difficult to resolve and understand conflicts .

Wholesale formatting, reordering functions etc... in a central file like Tensor_class
or Grid_vector_types while others are also editing without making substantial functionality
changes creates pain.
This commit is contained in:
paboyle
2016-07-15 20:59:07 +01:00
parent f4dd5062d7
commit 4908b77d46
8 changed files with 273 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/qcd/QCD.h
View File

@ -500,7 +500,6 @@ namespace QCD {
#include <Grid/qcd/hmc/integrators/Integrator.h>
#include <Grid/qcd/hmc/integrators/Integrator_algorithm.h>
#include <Grid/qcd/hmc/HMC.h>
#include <qcd/smearing/Smearing.h>
#include <Grid/qcd/smearing/Smearing.h>
#endif

8
lib/qcd/smearing/Smearing.h
View File

@ -1,9 +1,9 @@
#ifndef GRID_QCD_SMEARING_H
#define GRID_QCD_SMEARING_H
#include <qcd/smearing/BaseSmearing.h>
#include <qcd/smearing/APEsmearing.h>
#include <qcd/smearing/StoutSmearing.h>
#include <qcd/smearing/GaugeConfiguration.h>
#include <Grid/qcd/smearing/BaseSmearing.h>
#include <Grid/qcd/smearing/APEsmearing.h>
#include <Grid/qcd/smearing/StoutSmearing.h>
#include <Grid/qcd/smearing/GaugeConfiguration.h>
#endif