generalise batch mode to specify individual modes

Change command line to include calculation mode