build dirs where wrong
Merge branch 'update_esmf' into devel