Changes to compile for Intel 14.0.2 on NCAR yellowstone