more merge fixes, mainly changing res[r] to rsr
Simple test script to run "diags" on all the AMWG plot sets.
delete debugging printout