portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

Bug fix

Browse Source
This commit is contained in:
Peter Boyle 2023-12-11 20:56:03 -05:00
parent 645e47c1ba
commit f48298ad4e
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Grid/qcd/hmc/integrators/Integrator.h
View File

@ -86,6 +86,7 @@ public:
MomentumFilterBase<MomentaField> const* MomFilter; MomentumFilterBase<MomentaField> const* MomFilter;
const ActionSet<Field, RepresentationPolicy> as; const ActionSet<Field, RepresentationPolicy> as;
ActionSet<Field,RepresentationPolicy> LevelForces; ActionSet<Field,RepresentationPolicy> LevelForces;
//Get a pointer to a shared static instance of the "do-nothing" momentum filter to serve as a default //Get a pointer to a shared static instance of the "do-nothing" momentum filter to serve as a default
@ -124,6 +125,8 @@ public:
void update_P(MomentaField& Mom, Field& U, int level, double ep) { void update_P(MomentaField& Mom, Field& U, int level, double ep) {
// input U actually not used in the fundamental case // input U actually not used in the fundamental case
// Fundamental updates, include smearing // Fundamental updates, include smearing
assert(as.size()==LevelForces.size());
Field level_force(U.Grid()); level_force =Zero(); Field level_force(U.Grid()); level_force =Zero();
for (int a = 0; a < as[level].actions.size(); ++a) { for (int a = 0; a < as[level].actions.size(); ++a) {
@ -233,9 +236,13 @@ public:
MomFilter = getDefaultMomFilter(); MomFilter = getDefaultMomFilter();
for (int level = 0; level < as.size(); ++level) { for (int level = 0; level < as.size(); ++level) {
ActionLevel<Field> Level; int multiplier = as.at(level).multiplier;
Level.push_back(new EmptyAction<Field>); ActionLevel<Field> * Level = new ActionLevel<Field>(multiplier);
LevelForces.push_back(Level); // does it copy by value or reference?? Level->push_back(new EmptyAction<Field>);
LevelForces.push_back(*Level);
// does it copy by value or reference??
// - answer it copies by value, BUT the action level contains a reference that is NOT updated.
// Unsafe code in Guido's area
} }
}; };
@ -254,12 +261,14 @@ public:
void reset_timer(void) void reset_timer(void)
{ {
assert(as.size()==LevelForces.size());
for (int level = 0; level < as.size(); ++level) { for (int level = 0; level < as.size(); ++level) {
for (int actionID = 0; actionID < as[level].actions.size(); ++actionID) { for (int actionID = 0; actionID < as[level].actions.size(); ++actionID) {
as[level].actions.at(actionID)->reset_timer(); as[level].actions.at(actionID)->reset_timer();
} }
int actionID=0; int actionID=0;
LevelForces[level].actions.at(actionID)->reset_timer(); assert(LevelForces.at(level).actions.size()==1);
LevelForces.at(level).actions.at(actionID)->reset_timer();
} }
} }
void print_timer(void) void print_timer(void)
@ -352,6 +361,13 @@ public:
std::cout << as[level].actions.at(actionID)->LogParameters(); std::cout << as[level].actions.at(actionID)->LogParameters();
} }
} }
std::cout << " [Integrator] Total Force loggers: "<< LevelForces.size() <<std::endl;
for (int level = 0; level < LevelForces.size(); ++level) {
std::cout << GridLogMessage << "[Integrator] ---- Level: "<< level << std::endl;
for (int actionID = 0; actionID < LevelForces[level].actions.size(); ++actionID) {
std::cout << GridLogMessage << "["<< LevelForces[level].actions.at(actionID)->action_name() << "] ID: " << actionID << std::endl;
}
}
std::cout << GridLogMessage << ":::::::::::::::::::::::::::::::::::::::::"<< std::endl; std::cout << GridLogMessage << ":::::::::::::::::::::::::::::::::::::::::"<< std::endl;
} }
@ -433,6 +449,7 @@ public:
RealD S(Field& U) RealD S(Field& U)
{ // here also U not used { // here also U not used
assert(as.size()==LevelForces.size());
std::cout << GridLogIntegrator << "Integrator action\n"; std::cout << GridLogIntegrator << "Integrator action\n";
RealD H = - FieldImplementation::FieldSquareNorm(P)/HMC_MOMENTUM_DENOMINATOR; // - trace (P*P)/denom RealD H = - FieldImplementation::FieldSquareNorm(P)/HMC_MOMENTUM_DENOMINATOR; // - trace (P*P)/denom