Contributes to #744. Restores the capability to run the nbp cross-checking in combination with the analytical spinup