diff --git a/INSTALL b/INSTALL index f27a54a9d36cb736abe1f45c96abc9ab3998c1c1..814717a93c194fe0d37fde741fb419cc65efe7b0 100644 --- a/INSTALL +++ b/INSTALL @@ -43,6 +43,14 @@ Installation: ftp://ftp.ifremer.fr/ifremer/ird/us191/oceano/lib/matlab/woa05_monthly_surf.nc ftp://ftp.ifremer.fr/ifremer/ird/us191/oceano/lib/matlab/woa05_seasonal_surf.nc + - La climatologie de surface ISAS13 du LPO est maintenant disponible: + + ftp://ftp.ifremer.fr/ifremer/ird/us191/oceano/lib/matlab/isas13_annual_surf.nc + ftp://ftp.ifremer.fr/ifremer/ird/us191/oceano/lib/matlab/isas13_seasonal_surf.nc + ftp://ftp.ifremer.fr/ifremer/ird/us191/oceano/lib/matlab/isas13_monthly_surf.nc + + Voir documentation sous: http://wwz.ifremer.fr/lpo/SO-Argo/Products/ISAS-T-S-fields + Pour les version de tsgqc <= 1.0RC4, recuperer les fichiers de climato sous: ftp://ftp.ifremer.fr/ifremer/ird/us191/oceano/lib/matlab/old-climato diff --git a/tsg_io/readAsciiTsg.m b/tsg_io/readAsciiTsg.m index 82aa34688d8c22c8cb4feaa9d00394ce1d586761..d0004322af22c03880f6575f0aa5ca26e21ff348 100644 --- a/tsg_io/readAsciiTsg.m +++ b/tsg_io/readAsciiTsg.m @@ -169,6 +169,10 @@ for i = 7 : nHeader end +% add POSITION_QC +% --------------- +tsg.POSITION_QC = int8(tsg.qc.hash.NO_CONTROL.code) * ones(nlines, 1, 'int8'); + % populate tsg.file structure % --------------------------- [tsg.file.pathstr, tsg.file.name, tsg.file.ext] = ... diff --git a/tsg_io/readTsgDataLabview.m b/tsg_io/readTsgDataLabview.m index 26693922d547d5aedc354196efbc992679807f65..935abf24d36ef37f577212875ffa19d7ebd5e155 100644 --- a/tsg_io/readTsgDataLabview.m +++ b/tsg_io/readTsgDataLabview.m @@ -207,10 +207,11 @@ if fid ~= -1 % ---------------------------- tsg.qc.active.Code = tsg.qc.hash.NO_CONTROL.code; - % Set salinity QC (SSPS_QC) par NOCONTROL code + % Set <PARAM>_QC with NOCONTROL code % -------------------------------------------- tsg.SSPS_QC = castByteQC( tsg.qc.active.Code, noNaN ); tsg.SSJT_QC = castByteQC( tsg.qc.active.Code, noNaN ); + tsg.POSITION_QC = castByteQC( tsg.qc.active.Code, noNaN ); % populate tsg.file structure % --------------------------- diff --git a/tsg_io/readTsgDataNuka.m b/tsg_io/readTsgDataNuka.m index f000630818b26594cf7a80458a45997843ee539e..f36f86c61580bb8beb458c91e9ce4180334e4f57 100644 --- a/tsg_io/readTsgDataNuka.m +++ b/tsg_io/readTsgDataNuka.m @@ -24,9 +24,9 @@ nbFieldNames = length( tsgNames ); % Get NO_CONTROL, GOOD, PROBABLY_GOOD codes % ----------------------------------------- -NO_CONTROL = tsg.qc.hash.NO_CONTROL.code; -GOOD = tsg.qc.hash.GOOD.code; -PROBABLY_GOOD = tsg.qc.hash.PROBABLY_GOOD.code; +NO_CONTROL = int8(tsg.qc.hash.NO_CONTROL.code); +GOOD = int8(tsg.qc.hash.GOOD.code); +PROBABLY_GOOD = int8(tsg.qc.hash.PROBABLY_GOOD.code); % Display read file info on console % --------------------------------- @@ -107,7 +107,8 @@ tsg.SSPS = cellData{10}; % by default, SSPS flagged GOOD as data have been corrected by G. Reverdin % ------------------------------------------------------------------------ -tsg.SSPS_QC=GOOD*ones(nrecords,1,'int32'); +tsg.SSPS_QC = GOOD * ones(nrecords, 1, 'int8'); +tsg.POSITION_QC = NO_CONTROL * ones(nrecords, 1, 'int8'); % check if there is data from external temperature sensor % ------------------------------------------------------- diff --git a/tsg_util/plot_Tsg.m b/tsg_util/plot_Tsg.m index 128dae5854fc864b027cdfada0e61192cd6da0d3..76d0ddd42f62e85fa49e94fcae9f2a54135720c5 100644 --- a/tsg_util/plot_Tsg.m +++ b/tsg_util/plot_Tsg.m @@ -70,6 +70,9 @@ if ~isempty( X ) && ~isempty( Y ) end else + if isempty(colVal) + colVal = 'k'; + end line( X, Y, 'Tag', ['TAG_PLOT' num2str(PlotNum) '_LINE_' para], ... 'LineStyle', lineType, ... 'Marker', markType, 'MarkerSize', markSize, 'Color', colVal); diff --git a/tsg_util/plot_Validation.m b/tsg_util/plot_Validation.m index 216d90a160aa1b52dcc8b9ba6e932caffe6e182f..c5e60c007e75254be9985137f3d059a6a1ad1c8d 100644 --- a/tsg_util/plot_Validation.m +++ b/tsg_util/plot_Validation.m @@ -25,7 +25,7 @@ switch nPlot % ------------------------ if ~isempty( tsg.(PARA) ) - % if lineType is selcted from menu option/preferences and ne 'none' + % if lineType is selected from menu option/preferences and ne 'none' % ----------------------------------------------------------------- if ~strcmp(lineType, 'none') @@ -85,7 +85,7 @@ switch nPlot erase_Line( hPlotAxes, 3 ); % if ~isempty( tsg.(PARA) ) plot_Tsg( hMainFig, hPlotAxes, 3, tsg.DAYD, tsg.(PARA),[],... - PARA, 'k', lineType, '*', 2); + PARA, '', lineType, '*', 2); % end end diff --git a/tsgqc.m b/tsgqc.m index 638d5a513091dd1f4e998e54f33d0785bba03e37..8a8d6b8169121c82e75cf232d9ba3afd24118eac 100644 --- a/tsgqc.m +++ b/tsgqc.m @@ -38,9 +38,9 @@ global GOSUD_FORMAT_VERSION % version number, may be used to initialize some files when it change % 0.90x -> 1.0RCx % ------------------------------------------------------------------- -VERSION = 1.420; % -> 1.41 -CHAR_VERSION = '1.42'; -DATE_VERSION = '05 dec 2014'; +VERSION = 1.430; % -> 1.42 +CHAR_VERSION = '1.43'; +DATE_VERSION = '04 may 2015'; % netcdf file version, see DATA FORMAT TSG document: % CORTSG_format_gosud.doc