Checkpoint again.  Added PA variant for computeEnergy.