Add variables to compare with pensipp results
Remove dict trim_by_year

A step towards trimestres as the only argument (with workstate, sali and
soon info_ind)