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

Modification du format du numero de bouteille: STRING4

parent 15e7681a
No related branches found
No related tags found
No related merge requests found
......@@ -30,7 +30,7 @@ if isempty( tsg.DAYD_EXT )
tsg.SSPS_EXT_QC = int8(data.SSPS_EXT_QC);
tsg.SSPS_EXT_TYPE = char(data.SSPS_EXT_TYPE);
tsg.SSPS_EXT_ANALDATE = char(data.SSPS_EXT_ANALDATE);
tsg.SSPS_EXT_BOTTLE = data.SSPS_EXT_BOTTLE;
tsg.SSPS_EXT_BOTTLE = char(data.SSPS_EXT_BOTTLE);
tsg.SSTP_EXT = data.SSTP_EXT;
tsg.SSTP_EXT_QC = int8(data.SSTP_EXT_QC);
tsg.SSTP_EXT_TYPE = char(data.SSTP_EXT_TYPE);
......@@ -52,7 +52,7 @@ else
tsg.SSPS_EXT_QC = int8(data.SSPS_EXT_QC);
tsg.SSPS_EXT_TYPE = char(data.SSPS_EXT_TYPE);
tsg.SSPS_EXT_ANALDATE = char(data.SSPS_EXT_ANALDATE);
tsg.SSPS_EXT_BOTTLE = data.SSPS_EXT_BOTTLE;
tsg.SSPS_EXT_BOTTLE = char(data.SSPS_EXT_BOTTLE);
tsg.SSTP_EXT = data.SSTP_EXT;
tsg.SSTP_EXT_QC = int8(data.SSTP_EXT_QC);
tsg.SSTP_EXT_TYPE = char(data.SSTP_EXT_TYPE);
......@@ -93,7 +93,8 @@ else
tsg.SSPS_EXT_QC = NO_CONTROL * int8(ones( size( tsg.SSTP_EXT )));
label = '19500101000000';
tsg.SSPS_EXT_ANALDATE = label( ones(length(tsg.SSTP_EXT),1), :);
tsg.SSPS_EXT_BOTTLE = zeros( size( tsg.DAYD_EXT ) );
label = '0';
tsg.SSPS_EXT_BOTTLE = label( ones(length(tsg.SSTP_EXT),1), :);
end
tsg.DAYD_EXT = [tsg.DAYD_EXT; data.DAYD_EXT];
......@@ -101,7 +102,8 @@ else
tsg.LATX_EXT = [tsg.LATX_EXT; data.LATX_EXT];
tsg.LONX_EXT = [tsg.LONX_EXT; data.LONX_EXT];
tsg.SSPS_EXT = [tsg.SSPS_EXT; data.SSPS_EXT];
tsg.SSPS_EXT_BOTTLE = [tsg.SSPS_EXT_BOTTLE; data.SSPS_EXT_BOTTLE];
tsg.SSPS_EXT_BOTTLE = strvcat(tsg.SSPS_EXT_BOTTLE,...
char(data.SSPS_EXT_BOTTLE));
tsg.SSPS_EXT_QC = [tsg.SSPS_EXT_QC; int8(data.SSPS_EXT_QC)];
tsg.SSPS_EXT_TYPE = strvcat(tsg.SSPS_EXT_TYPE,...
char(data.SSPS_EXT_TYPE));
......@@ -125,7 +127,7 @@ if ~isempty(tsg.DAYD_EXT)
tsg.LONX_EXT = tsg.LONX_EXT(iOrder);
tsg.SSPS_EXT = tsg.SSPS_EXT(iOrder);
tsg.SSPS_EXT_QC = tsg.SSPS_EXT_QC(iOrder);
tsg.SSPS_EXT_BOTTLE = tsg.SSPS_EXT_BOTTLE(iOrder);
tsg.SSPS_EXT_BOTTLE = tsg.SSPS_EXT_BOTTLE(iOrder,:);
tsg.SSPS_EXT_TYPE = tsg.SSPS_EXT_TYPE(iOrder,:);
tsg.SSPS_EXT_ANALDATE = tsg.SSPS_EXT_ANALDATE(iOrder,:);
tsg.SSTP_EXT = tsg.SSTP_EXT(iOrder);
......@@ -138,6 +140,11 @@ if ~isempty(tsg.DAYD_EXT)
tsg.SSPS_EXT_TYPE(1,:) = [];
tsg.SSTP_EXT_TYPE = char( blanks(4), tsg.SSTP_EXT_TYPE);
tsg.SSTP_EXT_TYPE(1,:) = [];
% _BOTTLE must be of type CHAR*4
% ------------------------------
tsg.SSPS_EXT_BOTTLE = char( blanks(4), tsg.SSPS_EXT_BOTTLE);
tsg.SSPS_EXT_BOTTLE(1,:) = [];
end
......
......@@ -88,18 +88,19 @@ label = 'ARGO';
argo.SSPS_EXT_TYPE = label( ones(m,1), :);
argo.SSTP_EXT_TYPE = label( ones(m,1), :);
% No bottle number
% ----------------
label = '0';
argo.SSPS_EXT_BOTTLE = label( ones(m,1), :);
% No analysis date for ARGO floats
% ---------------------------------
label = '19500101000000';
argo.SSPS_EXT_ANALDATE = label( ones(length(argo.SSPS_EXT),1), :);
% No bottle number
% ----------------
argo.SSPS_EXT_BOTTLE = zeros( size(argo.DAYD_EXT) );
% keep data only within TSG data time-limit
% -----------------------------------------
ind = find( argo.DAYD_EXT < tsg.DAYD(1) | argo.DAYD_EXT > tsg.DAYD(end));
ind = find( argo.DAYD_EXT < tsg.DAYD(1)-3 | argo.DAYD_EXT > tsg.DAYD(end)+3);
argo.DAYD_EXT(ind) = [];
argo.DATE_EXT(ind,:) = [];
......@@ -108,6 +109,7 @@ argo.LONX_EXT(ind) = [];
argo.SSPS_EXT(ind) = [];
argo.SSPS_EXT_QC(ind) = [];
argo.SSPS_EXT_TYPE(ind,:) = [];
argo.SSPS_EXT_BOTTLE(ind,:) = [];
argo.SSPS_EXT_ANALDATE(ind,:) = [];
argo.SSTP_EXT(ind) = [];
argo.SSTP_EXT_QC(ind) = [];
......
......@@ -86,11 +86,12 @@ end
% Build the format depending on the header parameters
% 1 - Decimate the HEADER - The 7th first parameters are always
% %HEADER YEAR MNTH DAYX hh mm ss
% 2 - The 6 Date and time parametes are read in %d
% 2 - The 6 Date and time parameters are read in %d
% -------------------------------------------------------------
format = '%d %d %d %d %d %d';
for i = 7 : nHeader
if isempty( strfind(char(header(i)), 'TYPE')) && ...
if isempty( strfind(char(header(i)), 'TYPE')) && ...
isempty( strfind( char(header(i)), 'BOTTLE') ) && ...
isempty( strfind( char(header(i)), 'ANALDATE') );
format = [format ' %f'];
else
......@@ -153,7 +154,8 @@ for i = 1:2
end
if isempty(strmatch([para '_BOTTLE'], header)) && strcmp(para, 'SSPS_EXT')
s.([para '_BOTTLE']) = zeros(size(s.(para)));
label = '0';
s.([para '_BOTTLE']) = label( ones(length(s.(para)),1), :);
header = [header; [para '_BOTTLE']];
end
......
......@@ -18,8 +18,8 @@ function [error] = writeAsciiSample( hMainFig, filename)
% ----------
error = -1;
PARA = { 'SSPS_EXT'; 'SSPS_EXT_QC'; 'SSPS_EXT_TYPE'; 'SSPS_EXT_ANALDATE';...
'SSTP_EXT'; 'SSTP_EXT_QC'; 'SSTP_EXT_TYPE'};
PARA = { 'SSPS_EXT'; 'SSPS_EXT_QC'; 'SSPS_EXT_TYPE'; 'SSPS_EXT_BOTTLE'; ...
'SSPS_EXT_ANALDATE'; 'SSTP_EXT'; 'SSTP_EXT_QC'; 'SSTP_EXT_TYPE'};
% Choose parameters to export
% ---------------------------
......@@ -79,6 +79,13 @@ if choice
data2(j,:) = sprintf( ' %s', strjust(tsg.(para)(j,:)));
end
data = strcat( data, data2 );
elseif findstr( '_BOTTLE', para)
for j = 1:nbRecords
data2(j,:) = sprintf( ' %s', strjust(tsg.(para)(j,:)));
end
data = strcat( data, data2 );
elseif findstr( '_ANALDATE', para)
......
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