[cleanup][convectivemixing] propertymacros, warnings, use Brine.Salinity to adapt to changes in master