Adding Brian's input options
Merge branch 'master' of github.com:losalamos/CLAMR