I have a merge conflict for timestep_tracer. The fields gTrNm1 and gTrtmp are no longer needed. I'll remove them as well as the corresponding entry in the parameter list in S/R thermodynamics. P.