Match gres type for step

Previous logic did not work properly to allocate specific GRES
model types to job steps from the matching job model types.