Added compatibility with ICC on nersc