Revised uranium--plutonium cycle PWR and BWR models for the ORIGEN computer code