Model charge calculation and residue charge calculation have been modified