Add parameter na_m2 to griddecl and change setdimens accordingly