Cherrypicks PR 322 and 324#352

laurenchilutti merged 2 commits into

NOAA-GFDL:mainNOAA-GFDL/GFDL_atmos_cubed_sphere:mainfrom

laurenchilutti:cherrypickslaurenchilutti/GFDL_atmos_cubed_sphere:cherrypicksCopy head branch name to clipboard