From 364d35ba4ac07a05c2ac7a252b70ff038999d654 Mon Sep 17 00:00:00 2001 From: Luke Campbell Date: Thu, 14 Mar 2013 14:44:09 -0400 Subject: [PATCH] Removes PSS78 constant See PSS78 algorithm for details. --- ion_functions/workflow_tests/fake_data.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ion_functions/workflow_tests/fake_data.py b/ion_functions/workflow_tests/fake_data.py index 873a9fa..d074682 100644 --- a/ion_functions/workflow_tests/fake_data.py +++ b/ion_functions/workflow_tests/fake_data.py @@ -7,19 +7,18 @@ def data_l2_density(conductivity, temp,pressure, lat, lon): ''' - Based on calculations done here: https://github.com/ooici/coi-services/blob/master/ion/processes/data/transforms/ctd/ctd_L2_density.py#L55 ''' from pygsw import vectors as gsw - sp = gsw.sp_from_c(conductivity/42.914, temp, pressure) + # + sp = gsw.sp_from_c(conductivity, temp, pressure) sa = gsw.sa_from_sp(sp, pressure, lon, lat) rho = gsw.rho(sa, temp, pressure) return rho def data_l2_salinity(conductivity, temp, pressure): ''' - Based on calculations done here: https://github.com/ooici/coi-services/blob/master/ion/processes/data/transforms/ctd/ctd_L2_salinity.py#L58 ''' import pygsw.vectors as gsw - sal_value = gsw.sp_from_c(conductivity/42.914, temp, pressure) + sal_value = gsw.sp_from_c(conductivity, temp, pressure) return sal_value