changes to get rid of warnings and errors with ifort compiler than were ok with gfortran