Solid-state thermoclines with internal baffle structures are used in place of heat exchangers in a closed thermodynamic cycle power generation or energy storage system, such as a closed Brayton cycle system. The baffles limit the conductive and/or radiative transfer of heat between a solid thermal medium within different zones defined by the baffle structures.