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

Modification du format des fichiers bouteilles. 

Modification de la fonction de lecture des fichiers bouteilles
parent 0b05a1ea
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tsg_data/TOUC0702.btl
+ 28
− 25
View file @ 5d4594aa
yyyy mm dd hh mm Latitude Longitude sssb
2007 07 20 15 30 42.183 -18.000 37.018
2007 07 21 07 25 39.483 -22.500 36.197
2007 07 22 08 20 34.700 -27.917 36.829
2007 07 23 08 05 29.867 -32.333 37.123
2007 07 24 08 15 24.700 -36.883 37.511
2007 07 25 09 05 19.917 -40.883 37.536
2007 07 26 10 10 14.733 -45.083 36.894
2007 07 27 10 25 9.850 -48.967 35.618
2007 08 04 11 15 9.350 -56.283 34.201
2007 08 05 12 20 14.150 -60.833 34.380
2007 08 06 12 05 18.400 -65.167 35.510
2007 08 07 12 20 17.317 -64.633 34.955
2007 08 08 12 05 13.583 -60.250 33.930
2007 08 09 11 50 9.283 -56.150 34.324
2007 08 10 14 20 5.067 -52.100 35.374
2007 08 15 12 10 15.383 -62.317 34.388
2007 08 17 10 50 7.267 -54.250 35.305
2007 08 22 13 35 7.650 -50.467 35.490
2007 08 23 10 50 12.200 -47.650 36.484
2007 08 24 10 50 17.050 -44.067 36.911
2007 08 26 09 10 27.333 -37.700 37.450
2007 08 27 08 15 32.533 -34.100 37.074
2007 08 29 07 05 41.000 -24.033 35.842
2007 08 30 07 40 43.800 -17.467 35.894
CruiseID: TOUC0702
Bottle type: OSI
Date of water sample analysis: 20071025000000
yyyy mm dd hh mm Latitude Longitude sssb code
2007 07 20 15 30 42.183 -18.000 37.018 0
2007 07 21 07 25 39.483 -22.500 36.197 0
2007 07 22 08 20 34.700 -27.917 36.829 0
2007 07 23 08 05 29.867 -32.333 37.123 0
2007 07 24 08 15 24.700 -36.883 37.511 0
2007 07 25 09 05 19.917 -40.883 37.536 0
2007 07 26 10 10 14.733 -45.083 36.894 0
2007 07 27 10 25 9.850 -48.967 35.618 0
2007 08 04 11 15 9.350 -56.283 34.201 0
2007 08 05 12 20 14.150 -60.833 34.380 0
2007 08 06 12 05 18.400 -65.167 35.510 0
2007 08 07 12 20 17.317 -64.633 34.955 0
2007 08 08 12 05 13.583 -60.250 33.930 0
2007 08 09 11 50 9.283 -56.150 34.324 0
2007 08 10 14 20 5.067 -52.100 35.374 0
2007 08 15 12 10 15.383 -62.317 34.388 0
2007 08 17 10 50 7.267 -54.250 35.305 0
2007 08 22 13 35 7.650 -50.467 35.490 0
2007 08 23 10 50 12.200 -47.650 36.484 0
2007 08 24 10 50 17.050 -44.067 36.911 0
2007 08 26 09 10 27.333 -37.700 37.450 0
2007 08 27 08 15 32.533 -34.100 37.074 0
2007 08 29 07 05 41.000 -24.033 35.842 0
2007 08 30 07 40 43.800 -17.467 35.894 0
tsg_data/past0601.btl
+ 32
− 30
View file @ 5d4594aa
past0601
yyyy mm dd hh mm Latitude Longitude sssb
2006 01 14 12 00 42.683 3.833 34.997
2006 01 16 12 05 50.183 -1.833 35.375
2006 01 17 13 04 45.050 -8.783 35.704
2006 01 18 12 59 38.617 -9.383 35.391
2006 01 19 13 01 37.617 -9.933 36.395
2006 01 20 14 02 29.983 -13.333 36.579
2006 01 21 14 04 23.517 -18.100 36.540
2006 01 22 16 58 16.850 -23.017 35.992
2006 01 23 15 02 10.950 -26.000 35.260
2006 01 24 15 01 4.800 -28.750 35.558
2006 01 25 16 04 -1.750 -31.583 36.315
2006 01 26 16 00 -7.733 -34.333 36.788
2006 01 27 16 02 -9.217 -34.283 37.034
2006 01 28 15 03 -16.117 -37.433 37.337
2006 01 29 16 47 -23.100 -42.133 35.920
2006 01 31 17 20 -24.617 -46.650 35.392
2006 02 03 15 03 -24.167 -46.300 35.017
2006 02 06 15 01 -22.367 -40.967 36.522
2006 02 07 16 04 -15.750 -38.350 37.297
2006 02 08 17 26 -12.083 -37.283 36.775
2006 02 09 16 04 -6.167 -33.483 36.455
2006 02 10 15 02 0.400 -30.633 35.725
2006 02 11 15 01 6.950 -27.767 35.850
2006 02 12 17 49 14.283 -24.500 35.693
2006 02 13 14 00 19.467 -21.500 36.492
2006 02 14 14 02 25.633 -18.000 36.911
2006 02 15 13 56 31.833 -13.967 36.684
2006 02 16 13 00 38.033 -9.850 36.269
CruiseID: PAST0601
Bottle type: OSI
Date of water sample analysis: 20071025000000
yyyy mm dd hh mm Latitude Longitude sssb code
2006 01 14 12 00 42.683 3.833 34.997 0
2006 01 16 12 05 50.183 -1.833 35.375 0
2006 01 17 13 04 45.050 -8.783 35.704 0
2006 01 18 12 59 38.617 -9.383 35.391 0
2006 01 19 13 01 37.617 -9.933 36.395 0
2006 01 20 14 02 29.983 -13.333 36.579 0
2006 01 21 14 04 23.517 -18.100 36.540 0
2006 01 22 16 58 16.850 -23.017 35.992 0
2006 01 23 15 02 10.950 -26.000 35.260 0
2006 01 24 15 01 4.800 -28.750 35.558 0
2006 01 25 16 04 -1.750 -31.583 36.315 0
2006 01 26 16 00 -7.733 -34.333 36.788 0
2006 01 27 16 02 -9.217 -34.283 37.034 0
2006 01 28 15 03 -16.117 -37.433 37.337 0
2006 01 29 16 47 -23.100 -42.133 35.920 0
2006 01 31 17 20 -24.617 -46.650 35.392 0
2006 02 03 15 03 -24.167 -46.300 35.017 0
2006 02 06 15 01 -22.367 -40.967 36.522 0
2006 02 07 16 04 -15.750 -38.350 37.297 0
2006 02 08 17 26 -12.083 -37.283 36.775 0
2006 02 09 16 04 -6.167 -33.483 36.455 0
2006 02 10 15 02 0.400 -30.633 35.725 0
2006 02 11 15 01 6.950 -27.767 35.850 0
2006 02 12 17 49 14.283 -24.500 35.693 0
2006 02 13 14 00 19.467 -21.500 36.492 0
2006 02 14 14 02 25.633 -18.000 36.911 0
2006 02 15 13 56 31.833 -13.967 36.684 0
2006 02 16 13 00 38.033 -9.850 36.269 0
tsg_io/readBucketData.m
+ 10
− 16
View file @ 5d4594aa
......@@ -29,7 +29,13 @@ if fid ~= -1
% Read the file - skip 2 lines
% ----------------------------
fgetl( fid );
bucketData = fscanf(fid,'%d %d %d %d %d %f %f %f', [8 Inf])';
fgetl( fid ); % Bottle type: OSI - tsg.PSAL_WS_BOTTLE = ;
tsg.PSAL_WS_ANALDATE = fscanf(fid, 'Date of water sample analysis: %s\r\n');
fgetl( fid );
% Read the data
% -------------
bucketData = fscanf(fid,'%d %d %d %d %d %f %f %f %d', [9 Inf])';
% Every variable are put in a structure
% -------------------------------------
......@@ -45,21 +51,9 @@ if fid ~= -1
tsg.LONX_WS = bucketData(:,7);
tsg.SSPS_WS = bucketData(:,8);
% get code value for 'NO_CONTROL' in hashtable
% --------------------------------------------
code = get(tsg.qc.hash, 'NO_CONTROL', 'code');
% pre-allocate and fill SSPS_WS_QC with 'NO_CONTROL' code value
% -------------------------------------------------------------
%tsg.SSPS_WS_QC = code * ones(size(tsg.SSPS_WS));
tsg.SSPS_WS_QC = castByteQC( code, tsg.SSPS_WS );
%@ completer ces 2 champs !!!!!!!!
%tsg.PSAL_WS_ANALDATE = ;
%tsg.PSAL_WS_BOTTLE = ;
% remplace pour l'instant sample.TYPE !!!!!!
%tsg.SSPS_WS_TYPE = ones(size(tsg.SSPS_WS));
% QC codes are of type BYTE - conversion
% --------------------------------------
tsg.SSPS_WS_QC = int8(bucketData(:,9));
% Sort the struct tsg - increasing time.
% -----------------------------------------
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment