From f9043d80fdf356865a41f744b5caf40cbcbb27e6 Mon Sep 17 00:00:00 2001 From: Yves Gouriou <yves.gouriou@ird.fr> Date: Fri, 13 Feb 2009 12:43:59 +0000 Subject: [PATCH] Prend en compte les modifications apportees a la toolbox SW_CSIRO. En particulier l'utilisation de ITS90 dans le calcul de la salinite --- TSGQC_amelioration.xls | Bin 24576 -> 24064 bytes tsg_util/calibration.m | 15 +++++++++++++-- tsg_util/t90TOt68.m | 7 ------- 3 files changed, 13 insertions(+), 9 deletions(-) delete mode 100644 tsg_util/t90TOt68.m diff --git a/TSGQC_amelioration.xls b/TSGQC_amelioration.xls index abb034e8162e20017da4d95594ea20543cf908f5..6b2032b91db35c5af046d286a915d0ab94e4baf8 100644 GIT binary patch delta 3767 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 delta 3562 zcmZ`+U2I!t8Gg^PkL@_A?KsYl|C*D;NgSuKoz`(Wm$r77W^1;!NmC%2x<RX0At*{q z=1g1pv5^Ks6I5Bgn`xTF#BN|*u+H1f6sk(xuxZn@n`sh*WdtEEkQfLqK#cIb-{*7e zgmI3}@%i5Gd!Oh1``&Y0+tF(Gw5_a`er_`AoFJk*3%}6BzSgEsn8K?c^}30^zOqqX zD_2BG|FW3Z{o;9j#_?5pP<*VP({@GC5kGYQmXy5EkcY%Oj<)_?Lo3k+t<p7Gqe+U; zuSp{>?dYJ?iBX~h_&vBPMMaIMgSK!dCst*h6X1H>sTf0EubNT-A+hCb({}40IRCBJ z|KWZ`7w>ru1DZtj=e(clnn%p}<Kn#|M*W9J&TD}qn9wLl^b~ax6-{x+*Cjsk4U0*C zp9uTgMTdVt7=gmb-%ZAF(QJ8hb#3x{<fHa{i{v;<g3~XT0|AGRz9Ra=gY{?45A@WB zVCcZYbsy1B@ay#xoq;RA1zo3;C>J97nv3Y|uy}T8e0aiq*ZtN#5IKn2^*&~h#~|+4 zlSJt$qBq4S`32phiHSt6dmFkXTBaLxoyug=Jk8Lo_#}}T)12h`h+a1q|5DR*YNHq0 zbDm{5>!&4M$M2Hvz`aB{@&3p|+mAZin23X{i=)F)*Zk!RU;4d?xyvzSMqrdrBEHn| zDm~*6-%a#&!B}}@^#IN19F+Wl6Y{u!cJ{}A<KV+j+NXVC4iD6KM?TcRR#h76{wjVJ zAGtEeqX511zYf8%`{Cj`Jqaf_s3Pw~m&;GwSlg_u-dLx}<Js);%~hJewo+bPy;Y`% z%auxbLyj+(S9l3T*Oph;SI#f5l#%ia>o+$mi)%M3bZLF<=}YTnL~T5iMKPW~H&fzJ za4=dgHg6H+*I>vp?i;jRe}CjNc1Qd(nbW=@(qsLl7*dR+(6^Cy2hJ~I%oWaKC(he* z&9OlS?X@-6yP)}sxIH#q4KXq3{iX*&Wql7NWSnbSkCgGiL-Sr<R@06Vuj4>_Xj|&u zYsfeO9*QvpSu(cIg9>PsVUydkqF?h%K#vqA4Y8QIc;+N8VVmR>ZygVrOliwd<d6j< zu4NMnUak`#r_zJUOzby^`Wo&iS(lV$T_Q6cIjuz9QdBr#Wsj68OKMt9TGA_JNx99z zD!xD7U$tydD<X1*l3DggKSvgmGG&;xE-qyrD<6{a=;z4#TV+)Q=`-{;J}wgWINjwg zgL1mqa=IW5$r9_Q*3%_*+3x|wi5epfBhCQh>Np2vnW>QjBW^Ql<fQ5#2G-D^L0Lg+ z(uEN_^GoVObrPZBukRHns8->7@rk{nE@8NK)6xajbD*{|WHvAzsM`#B3ek6To^w$a z&!3)UOfHBdwl_eN4N!B_0(Bk$<?V1<Dlml;pr<jfK+(M#pqlQ&oSV)_lR3+1gf@DT zn&^g&US&W7YG;Y7NR13C+VBS8OPEnM^L{w@e?VQ(x!;Zhn{t-83K`P{jwUAW-Wi4I zLAE(p36V_q-#2WlyP+N@E;CklLp_dDdF+OISgAvs^PUj3bbow=+8gUVQafOepe=UN zQ8&sF@i;1emtL@+^O@%J?aYFf5WAV)v0*sF%-o7bX{>?NA?@J$<aBnxjyYjwPidyO znjKmQ;?>rSIX$^oL~BG&d?>1tMDqbPYg_39c81HUF=t?ov&PsyV9$$pvL#^qCKvrC z9c!!$V9l(!IT@|0?6Q@eDAXigSlBn<>jYm?Vs;+j>y&)_l2SSbzAd;VFkdJ59>z1L zIVg9aRXe8bN6_{o$haxnk)Q-lHGqRKu<1xpI+8nnsv4(6V?~z?qeb1tVQf(M$rfNy z?|yTyIM%Y$LZBVDSwmn=;p0fT69VROGzaBQ2$<t|rXue&u55d!9R}?_0NO1<xw<$; z-2hG5G3sss4a(BSmksJEPmHN@-GdlCAa#3y`yjfFLh7NalP=J(Jv1<~BG3ciM=+y; z&r&M_%_8cxgWn6_k{yL!7<^Xx$_Dqs;36&+g<jxZvT((pPMpwAh*&OKwW1xA+bAy^ z1Dtr;av}__Y3W25T+=pJ7+fdO6_rb2@Z4udJPfV^X7Ck?5)5O@PN5A2WquAZRIwle zic^vz0*WudbOjob6eIS?K>DntMnIuVXNm|YVzPGm1*ItN0w;>SkO#JE&QYL0WIGU* z=+)5%d=wtUIo1uBR`{rdXAigu9r6J5G24L{C<-=33>4?Ft(7}5$zbI<rX1)%qVJ-6 z#IbZp>`aYnGvW_Z1Lv0Lak_$Q3Fj4@{JVtD)$39gKu_RL7ZZ?fI{2C$Xvo9^`TP*5 zQ3K5*j>h0nuNw`~#FJCJluz(~mUpKk`mgfhH$(I4GdUtIPP=>_4YiCDFDNJ09vSNs zx26}Y^>0rfS`XFwV<%tM#O}zQ?Lt=D5tD_Xfu~>qx8p5b{K9<^7k>%;6c>NOye>8i zqwO9%S^t=RUYKg5zCZr?&X3;G9QD5z{C=^O=y+{zEl}bV{AYiEpFbzK8cbZgv$z!5 zUv4Zs&vnDe<&<*IPT}G<aIF5bM;Ep2t81Rx8}8t1AP|+S&*<Tk;$K&9X>qanSha(< JCO)d=@n5O|9H0OI diff --git a/tsg_util/calibration.m b/tsg_util/calibration.m index 22cc03e..ffbe13d 100644 --- a/tsg_util/calibration.m +++ b/tsg_util/calibration.m @@ -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 diff --git a/tsg_util/t90TOt68.m b/tsg_util/t90TOt68.m deleted file mode 100644 index 15ade3f..0000000 --- a/tsg_util/t90TOt68.m +++ /dev/null @@ -1,7 +0,0 @@ -function [t68] = t90TOt68( t90 ) - -if ~isempty( t90 ) - t68 = 1.00024 * t90; -end - -end -- GitLab