Maintenance

Committing before merge of viscous flux and test routines.