Geometry and CFD results for AD-retrofit and TPB-up-scaling