Advances in prediction of tokamak experiments with theory-based models