New Gravity Wave Treatments for GISS Climate Models