now writing calc_salinity and calc_density