Removed the energetic from the wave class, since they do not belong there....

Removed the energetic from the wave class, since they do not belong there. Fixed a bug in the strain filenames: now it should correctly account for scri extraction of extrapolation 'rInf'. Improved comments