Which object has more thermal energy?

 - a 150-gram glass of water at a temperature of 85°F
 - a 150-gram glass of water at a temperature of 40°F
The two glasses of water have the same mass but different temperatures. Since the 85°F glass of water is hotter than the 40°F glass of water, it has more thermal energy.