Skip to content
Snippets Groups Projects
Commit f9043d80 authored by Yves Gouriou's avatar Yves Gouriou
Browse files

Prend en compte les modifications apportees a la toolbox

SW_CSIRO. En particulier l'utilisation de ITS90 dans le
calcul de la salinite
parent f8c911be
No related branches found
No related tags found
No related merge requests found
No preview for this file type
......@@ -7,6 +7,14 @@ function calibration( hMainFig )
%
% Compute salinity from calibrated conductivity and jacket temperature
%
% Bug :
% 1 - tsg.SSPS_CAL = sw_salt( cond/sw_c3515(),t90TOt68(temp),zeros(size(cond)));
% replaced by
% tsg.SSPS_CAL = sw_salt( cond/sw_c3515(),temp,zeros(size(cond)));
%
% CSIRO toolbox modified sw_salt modified to use temprature ITS90
%
%
% Get tsg application data
% ------------------------
......@@ -69,8 +77,11 @@ if ~isempty( indC ) || ~isempty( indT )
end
if ~isempty( temp ) && ~isempty( cond )
tsg.SSPS_CAL = sw_salt( ...
cond/sw_c3515(), t90TOt68(temp), zeros(size(cond)));
% Modification du 13/02/2009
% tsg.SSPS_CAL = sw_salt( ...
% cond/sw_c3515(), t90TOt68(temp), zeros(size(cond)));
tsg.SSPS_CAL = sw_salt( cond/sw_c3515(), temp, zeros(size(cond)));
end
else
......
function [t68] = t90TOt68( t90 )
if ~isempty( t90 )
t68 = 1.00024 * t90;
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment