Refs #10132. Switching to new geometry.

 * Renaming current geometry file.
 * Changing dates for now old geometry file.
 * Adding new geometry file.
Merge branch 'feature/10132_new_CNCS_geom' into develop