Merge branch 'develop-nao_dimension_checks' into 'master'
Modify NAO dimension check to allow 'ftime_dim' to be NULL if ftime_avg is FALSE See merge request !180
Modify NAO dimension check to allow 'ftime_dim' to be NULL if ftime_avg is FALSE See merge request !180