cam6_4_034: Add missing total energy in physics state from dycore in snapshots and cleanup total water

cam6_4_034: Add missing total energy in physics state from dycore in snapshots and cleanup total water #97