Generalize wrapper to handle more simulator types

The simulator must (of course) still be a two-phase incompressible simulator; with "types" here I mean the implementing class.