A Generalized Formulation of Augmented Drift-Diffusion Transport Suitable for Use in General Purpose Device Simulators