Salt conservation, free surface, and varying levels: a new formulation for ocean general circulation models