Work in progress. Need to re-implement scalar discharge diagnostics.