Remove change to new_trap_int weights calculation for 8.1
David Dickinson
Branch: feature/temporarily_remove_new_trap_int_changes_for_8_1
Branch: feature/improve_new_trap_int_convergence
Merged
Merged pull request
Merged in feature/temporarily_remove_new_trap_int_changes_for_8_1 (pull request #522)
Removes the change to the new trap int weight calculation for release 8.1 to allow further testing. Retains code tidying.