maj des fichiers de declarations des variables et attributs, correction sur le...

maj des fichiers de declarations des variables et attributs, correction sur le type des attributs de variables qui ne peut prendre que le type double ou char (voir help ncatt sous matlab)

@tsg_nc/tsg_nc.m

@@ -127,7 +127,7 @@ for i=1:ncv.size
           theStruct.(member) = int8(str2num(value));  
         
         case 'integer'
-           theStruct.(member) = int16(str2num(value));  
+          theStruct.(member) = int16(str2num(value));  
            
         case 'float'
           theStruct.(member) = single(str2double(value));

@tsg_nc/tsg_ncattr.csv

@@ -12,7 +12,7 @@ char;char;char;char;char;char;float;float;float;char;char;char
 #;TSG_NUMBER;TSG NUMBER:;;edit;;;;;right;TSG serial number;#
 #;TINT_TYPE;TINT TYPE:;;popupmenu;SBE38|SBE3S|UNKNO|NA;1;.1;.02;right;External sea surface temperature sensor;#
 #;TINT_NUMBER;TINT NUMBER:;;edit;;;;;right;External temperature sensor serial number;#
-#;DATA_TYPE;DATA TYPE:;;edit;;;;;right;Describe data type contained in file, eg: Thermosalinometer data;#
+#;DATA_TYPE;DATA TYPE:;;edit;TRAJECTORY TSG data;;;;right;Describe data type contained in file, eg: Thermosalinometer data;#
 #;DATA_MODE;DATA MODE:;;popupmenu;Delayed mode data|Real time data;1;0.1;0.02;right;Indicate if the file contains real time or delayed mode data;#
 #;SAMPLING_PERIOD;SAMPLING PERIOD:;;edit;300;;.05;;right;Sampling period in seconds: 6 to 3600;#
 #;DATE_START;DATE_START:;yyyymmddhhmnss;edit;;;;;right;Date of first measurements;#
@@ -32,3 +32,4 @@ char;char;char;char;char;char;float;float;float;char;char;char
 #;DATA_ACQUISITION;DATA ACQUISITION:;;popupmenu;IRD|GENAVIR|SHOM|CNRS;1;.1;.02;right;Acquisition data centre, ex: SHOM,IRD,GENAVIR,CNRS,...;#
 #;PROCESSING_CENTRE;PROCESSING CENTRE:;;popupmenu;ORE-SSS|CORIOLIS/IRD|CORIOLIS/SISMER;1;.1;.02;right;Processing data centre, ex: ORE-SSS,CORIOLIS,SISMER,...;#
 #;PROCESSING_STATES;PROCESSING STATES:;;popupmenu;0A|1A|2B|2B+|2C|2C+|3B;1;.1;.02;right;0A: DONNEE BRUTE|1A: DONNEE LOCALISEE;#
+#;WS_TYPE;WATER_SAMPLE_TYPE:;;popupmenu;OSIL|UNKNO|NA;3;.1;.02;right;Water sample: NA, Not Available;#

@tsg_nc/tsg_ncvar.csv

@@ -2,7 +2,7 @@
 % $Id$
 %
 id;code;dimension;nctype;long_name;standard_name;units;conventions;valid_min;valid_max;format;FillValue_;epic_code;axis;resolution;comment;missing_value;endl
-char;char;cell;char;char;char;char;char;integer;integer;char;float;integer;char;float;char;byte;char
+char;char;cell;char;char;char;char;char;double;double;char;double;double;char;double;char;double;char
 #;REFERENCE_DATE_TIME;'STRING14';char;;;;yyyymmddhhmmss;;;;;;;;Reference date for julian days origin;;#
 #;DATE;'DAYD','STRING14';char;DATE OF MAIN INSTRUMENT MEASUREMENT;;;yyyymmddhhmmss;;;;;;;;This is the original data describing the date, it must not be lost;;#
 #;DATE_WS;'DAYD_WS','STRING14';char;DATE OF WATER SAMPLE;;;yyyymmddhhmmss;;;;;;;;This is the original data describing the date, it must not be lost;;#
@@ -35,14 +35,14 @@ char;char;cell;char;char;char;char;char;integer;integer;char;float;integer;char;
 #;SSJT_ADJUSTED;'DAYD';float;WATER JACKET TEMPERATURE ADJUSTED;temperature in TSG adjusted;degrees Celsius;;-1.5;38;%6.3lf;99999;;;0.001;Adjusted SSJT with external data (CTD,ARGO,XBT,...);;#
 #;SSJT_ADJUSTED_ERROR;'DAYD';float;ERROR ON ADJUSTED WATER JACKET TEMPERATURE;error temperature in TSG adjusted;degrees Celsius;;-1.5;38;%6.3lf;99999;;;0.001;;;#
 #;SSJT_ADJUSTED_QC;'DAYD';byte;WATER JACKET TEMPERATURE QUALITY FLAG;quality flag applied on temperature in TSG adjusted;;;0;9;%1d;;;;;Quality flag applied on adjusted SSJT;0;#
-#;SSJT_ADJUSTED_HIST;'DAYD_HIST','STRING256';char;ADJUSTED WATER JACKET TEMPERATURE PROCESSING HISTORY;temperature in TSG adjusted processing history;;;;;;;;;;;;#
+#;SSJT_ADJUSTED_HIST;'STRING256';char;ADJUSTED WATER JACKET TEMPERATURE PROCESSING HISTORY;temperature in TSG adjusted processing history;;;;;;;;;;;;#
 #;SSPS;'DAYD';float;SEA SURFACE PRACTICAL SALINITY;surface salinity;P.S.U.;;0;40;%6.3lf;99999;;;0.001;Ocean salinity deduced fron conductivity and water jacket temperature;;#
 #;SSPS_QC;'DAYD';byte;SEA SURFACE SALINITY QUALITY FLAG;surface salinity quality;;;0;9;%1d;;;;;Quality flag applied on salinity values;0;#
 #;SSPS_CAL;'DAYD';float;SEA SURFACE SALINITY CALIBRATED;surface salinity calibrated;P.S.U.;;0;40;%6.3lf;99999;;;;Calibrated Ocean salinity deduced fron conductivity and jacket tsg temperature;;#
 #;SSPS_ADJUSTED;'DAYD';float;SEA SURFACE SALINITY ADJUSTED;surface salinity adjusted;P.S.U.;;0;40;%6.3lf;99999;;;0.001;Adjusted Ocean salinity deduced fron conductivity and jacket tsg temperature;;#
 #;SSPS_ADJUSTED_ERROR;'DAYD';float;ERROR ON SEA SURFACE SALINITY ADJUSTED;error surface salinity adjusted;P.S.U.;;0;40;%6.3lf;99999;;;;Error on adjusted Ocean salinity deduced fron conductivity and jacket tsg temperature;;#
 #;SSPS_ADJUSTED_QC;'DAYD';byte;ERROR ON SEA SURFACE SALINITY ADJUSTED QUALITY FLAG;error surface salinity adjusted quality;;;0;9;%1d;;;;;Quality flag applied on adjusted Ocean salinity deduced fron conductivity and jacket tsg temperature;0;#
-#;SSPS_ADJUSTED_HIST;'DAYD_HIST','STRING256';char;ADJUSTED SEA SURFACE SALINITY PROCESSING HISTORY;surface salinity adjusted processing history;;;;;;;;;;;;#
+#;SSPS_ADJUSTED_HIST;'STRING256';char;ADJUSTED SEA SURFACE SALINITY PROCESSING HISTORY;surface salinity adjusted processing history;;;;;;;;;;;;#
 #;SSPS_DEPH;'N1';float;NOMINAL DEPTH OF WATER INTAKE FOR SALINITY MEASUREMENT;depth surface salinity;meter;;0;100;%6.3lf;99999;;;;;;#
 #;SSPS_DEPH_MIN;'N1';float;MINIMUM DEPTH OF WATER INTAKE FOR SALINITY MEASUREMENT;min depth surface salinity;meter;;0;100;%6.3lf;99999;;;;;;#
 #;SSPS_DEPH_MAX;'N1';float;MAXIMUM DEPTH OF WATER INTAKE FOR SALINITY MEASUREMENT;max depth surface salinity;meter;;0;100;%6.3lf;99999;;;;;;#
@@ -50,7 +50,6 @@ char;char;cell;char;char;char;char;char;integer;integer;char;float;integer;char;
 #;SSPS_WS_QC;'DAYD_WS';byte;SEA SURFACE SALINITY QUALITY FLAG;surface salinity quality;;;0;9;%1d;;;;;Quality flag applied on salinity values from water sample;0;#
 #;SSPS_WS_ANALDATE;'DAYD_WS','STRING14';char;DATE OF WATER SAMPLE SURFACE SALINITY ANALYSIS;;;yyyymmddhhmmss;;;;;;;;Date of sea surface salinity water sample analysis;;#
 #;SSPS_WS_BOTTLE;'DAYD_WS','STRING4';char;SEA SURFACE SALINITY BOTTLE NUMBER;;;;;;;;;;;Number of sea surface salinity water sample;;#
-#;SSPS_WS_TYPE;'DAYD_WS','STRING8';char;SEA SURFACE SALINITY BOTTLE TYPE;;;;;;;;;;;Model of sea surface salinity water sample;Example: OSIL;#
 #;SSTP;'DAYD';float;SEA SURFACE TEMPERATURE;surface temperature;degrees Celsius;;-1.5;38;%6.3lf;99999;;;0.001;Sea Surface Temperature (SST) measure at intake with external instrument. This is ocean Temperature;;#
 #;SSTP_QC;'DAYD';byte;SEA SURFACE TEMPERATURE QUALITY FLAG;surface temperature quality;;;0;9;%1d;;;;;Quality flag applied on SSTP temperature values;0;#
 #;SSTP_CAL;'DAYD';float;SEA SURFACE TEMPERATURE CALIBRATED;surface temperature calibrated;degrees Celsius;;-1.5;38;%6.3lf;99999;;;;Sea Surface Temperature Calibrated;;#
@@ -58,7 +57,7 @@ char;char;cell;char;char;char;char;char;integer;integer;char;float;integer;char;
 #;SSTP_ADJUSTED;'DAYD';float;SEA SURFACE TEMPERATURE ADJUSTED;surface temperature adjusted;degrees Celsius;;-1.5;38;%6.3lf;99999;;;;Adjusted Ocean temperature;;#
 #;SSTP_ADJUSTED_ERROR;'DAYD';float;ERROR ON SEA SURFACE TEMPERATURE ADJUSTED;error surface temperature adjusted;degrees Celsius;;-1.5;38;%6.3lf;99999;;;;Error on adjusted Ocean temperature;;#
 #;SSTP_ADJUSTED_QC;'DAYD';byte;SEA SURFACE TEMPERATURE ADJUSTED QUALITY FLAG;quality flag on surface temperature adjusted;;;0;9;%1d;;;;;Quality flag applied on adjusted Ocean temperature;0;#
-#;SSTP_ADJUSTED_HIST;'DAYD_HIST','STRING256';char;ADJUSTED SEA SURFACE TEMPERATURE PROCESSING HISTORY;surface temperature adjusted processing history;;;;;;;;;;;;#
+#;SSTP_ADJUSTED_HIST;'STRING256';char;ADJUSTED SEA SURFACE TEMPERATURE PROCESSING HISTORY;surface temperature adjusted processing history;;;;;;;;;;;;#
 #;SSTP_DEPH;'N1';float;NOMINAL DEPTH OF WATER INTAKE FOR TEMPERATURE MEASUREMENT;depth surface temperature;meter;;0;100;%6.3lf;99999;;;;;;#
 #;SSTP_DEPH_MIN;'N1';float;MINIMUM DEPTH OF WATER INTAKE FOR TEMPERATURE MEASUREMENT;min depth surface temperature;meter;;0;100;%6.3lf;99999;;;;;;#
 #;SSTP_DEPH_MAX;'N1';float;MAXIMUM DEPTH OF WATER INTAKE FOR TEMPERATURE MEASUREMENT;max depth surface temperature;meter;;0;100;%6.3lf;99999;;;;;;#

tsg_io/writeTSGDataNetCDF.m

@@ -102,7 +102,6 @@ nc('STRING256') = 256;
 nc('STRING14')  = 14;
 nc('STRING4')   = 4;
 nc('N1')        = 1;
-nc('DAYD_HIST') = 5;
 
 % display filename after 'Interpreter','None' initialization to prevent
 % display console warning
@@ -164,11 +163,16 @@ for i=1:numel(ncv_keys)
     % ---------------------------------------------------------------
     if ~isempty(value)
       
-      % value has the rigth netcdf type, don't need to cast with nc[type]
-      % like ncfloat or ncchar
-      % -----------------------------------------------------------------
-      nc{variable}.(fieldName) = value;
-      
+      % ncatt(theAttname, theAttvalue, theParent) uses the class of
+      % theAttvalue as theAtttype ('char' or 'double').
+      % need to be cast before assignment
+      % -----------------------------------------------------------
+      if isnumeric(value)
+        nc{variable}.(fieldName) = double(value);
+      else
+         nc{variable}.(fieldName) = char(value);
+      end
+
     end
   end
 end