diff --git a/@netcdf_native/tsgqc_netcdf.csv b/@netcdf_native/tsgqc_netcdf.csv index b1085cdac76018d1ab64e0345d9f29921d10c3ad..9ab677658a08af9f5dda6aeb44a229a9489c7ac0 100644 --- a/@netcdf_native/tsgqc_netcdf.csv +++ b/@netcdf_native/tsgqc_netcdf.csv @@ -91,40 +91,40 @@ $ATTRIBUTES$ #;key__;name;conventions;uicontrolType;string;value;length;height;line;horizontalAlignment;comment;# #;char;char;char;char;char;float;float;float;float;char;char;# #;TITLE;TITLE;;text;TSG GOSUD ;;0.1;0.02;;right;A description of the dataset;# -#;CYCLE_MESURE;CYCLE MESURE:;;edit;;;;;;right;Cruise or travel name;# -#;PLATFORM_NAME;PLATFORM NAME:;;edit;;;;;;right;Ship name;# -#;PROJECT_NAME;PROJECT NAME:;;popupmenu;ORE-SSS|CORIOLIS|IRD|SISMER|SURVOSRAL|TSG_Recherche;1;0.1;0.02;;right;Name of project which operates the TSG line, ex: ORE-SSS;# -#;SHIP_CALL_SIGN;SHIP CALL SIGN:;;edit;;;;;;right;Ship call sign;# -#;SHIP_MMSI;SHIP MMSI:;;edit;;;;;;right;Ship MMSI (ASN) number;# -#;DATE_TSG;TSG INSTALL DATE;yyyymmddHHMMSS;edit;;;;;;right;TSG installation date, format: yyyymmddHHMMSS;# -#;TYPE_TSG;TYPE TSG:;;popupmenu;SBE21|SBE45|UNKNO;1;0.1;0.02;;right;Thermosalinograph model number;# -#;NUMBER_TSG;NUMBER TSG:;;edit;;;;;;right;TSG serial number;# -#;DATE_TINT;TINT INSTALL DATE;yyyymmddHHMMSS;edit;;;;;;right;TINT installation date, format: yyyymmddHHMMSS;# -#;TYPE_TINT;TYPE TINT:;;popupmenu;SBE38|SBE3S|UNKNO|NA;1;0.1;0.02;;right;External sea surface temperature sensor;# -#;NUMBER_TINT;NUMBER TINT:;;edit;;;;;;right;External temperature sensor serial number;# -#;DATA_TYPE;DATA TYPE:;;popupmenu;TRAJECTORY|PROFIL|TIME_SERIE;1;;;;right;Describe data type contained in file, eg: TRAJECTORY, PROFIL or TIME_SERIE;# -#;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;# +#;CYCLE_MESURE;CYCLE MESURE:;;edit;;;;;;right;Cruise name or travel name. Example : EGEE6 or PAST0601;# +#;PLATFORM_NAME;PLATFORM NAME:;;edit;;;;;;right;Ship name. Example : Pourquoi Pas ?;# +#;PROJECT_NAME;PROJECT NAME:;;popupmenu;ORE-SSS|CORIOLIS|IRD|SISMER|SURVOSRAL|TSG_Recherche;1;0.1;0.02;;right;Name of project which operates the TSG line. Example: ORE-SSS;# +#;SHIP_CALL_SIGN;SHIP CALL SIGN:;;edit;;;;;;right;Ship call sign. Example : FABB;# +#;SHIP_MMSI;SHIP MMSI:;;edit;;;;;;right;Ship MMSI (ASN) number. Example : 227 222 00;# +#;DATE_TSG;TSG INSTALL DATE;yyyymmddHHMMSS;edit;;;;;;right;Date of TSG installation, format : yyyymmddDDHHMMSS;# +#;TYPE_TSG;TYPE TSG:;;popupmenu;SBE21|SBE45|UNKNO;1;0.1;0.02;;right;Thermosalinograph model number. Example : SBE21 or SBE45;# +#;NUMBER_TSG;NUMBER TSG:;;edit;;;;;;right;Thermosalinograph serial number. Example: 2250;# +#;DATE_TINT;TINT INSTALL DATE;yyyymmddHHMMSS;edit;;;;;;right;Date of TINT installation, format: yyyymmddHHMMSS;# +#;TYPE_TINT;TYPE TINT:;;popupmenu;SBE38|SBE3S|UNKNO|NA;1;0.1;0.02;;right;Temperature sensor at intake. Example: SBE38;# +#;NUMBER_TINT;NUMBER TINT:;;edit;;;;;;right;Intake temperature sensor serial number. Example: 3940;# +#;DATA_TYPE;DATA TYPE:;;popupmenu;TRAJECTORY|PROFILE|TIME-SERIES;1;;;;right;Describe data type contained in file. Example: TRAJECTORY, PROFILE or TIME-SERIES;# +#;DATA_MODE;DATA MODE:;;popupmenu;R|D;1;0.1;0.02;;right;Indicate if the file contains real time or delayed mode data. R : real time data, D : delayed mode data;# #;SAMPLING_PERIOD;SAMPLING PERIOD:;;edit;300;;0.050000001;;;right;Sampling period in seconds: 6 to 3600;# -#;DATE_START;DATE_START:;yyyymmddHHMMSS;edit;;;;;;right;Date of first measurements, format: yyyymmddHHMMSS;# -#;DATE_END;DATE END:;yyyymmddHHMMSS;edit;;;;;;right;Date of last measurements, format: yyyymmddHHMMSS;# +#;DATE_START;DATE_START:;yyyymmddHHMMSS;edit;;;;;;right;Date of first measurements (UTC), format: yyyymmddHHMMSS;# +#;DATE_END;DATE END:;yyyymmddHHMMSS;edit;;;;;;right;Date of last measurements (UTC), format: yyyymmddHHMMSS;# #;SOUTH_LATX;SOUTH LATX:;;edit;;;;;;right;South limit of measurements;# #;NORTH_LATX;NORTH LATX:;;edit;;;;;;right;North limit of measurements;# #;WEST_LONX;WEST LONX:;;edit;;;;;;right;West limit of measurements;# #;EAST_LONX;EAST LONX:;;edit;;;;;;right;East limit of measurements;# -#;FORMAT_VERSION;FORMAT VERSION:;;popupmenu;1.6|2.0;2;0.1;0.02;;right;File format version;# -#;CONVENTIONS;CONVENTIONS:;;popupmenu;GOSUD 1.6, CF1.4|GOSUD 2.0, CF1.4;2;0.1;0.02;;right;NetCDF file format conventions;# -#;DATE_CREATION;DATE CREATION:;yyyymmddHHMMSS;edit;;;;;;right;Date and time of file creation, format: yyyymmddHHMMSS;# -#;DATE_UPDATE;DATE UPDATE:;yyyymmddHHMMSS;edit;;;;;;right;Date and time of file update, format: yyyymmddHHMMSS;# -#;DATA_RESTRICTIONS;DATA RESTRICTIONS:;;edit;NONE;;;;;right;Restriction on use for these data;# -#;CITATION;CITATION:;;edit;;;;;;left;This citation should be used for publications;# -#;COMMENT;COMMENT:;;edit;;;;;;right;;# -#;PI_NAME;PI NAME:;;popupmenu;Denis Diverres|David Varillon|Thierry Delcroix|Yves Gouriou|Bernard Bourles|Gilles Reverdin|Rosemary Morrow|Emilie Brion|Magali Krieger|Julien Perrier;1;0.1;0.02;;right;Name of principal investigator in charge of the TSG, ex: Delcroix;# +#;FORMAT_VERSION;FORMAT VERSION:;;popupmenu;3.0;1;0.1;0.02;;right;GOSUD file format version, example: 3.0;# +#;CONVENTIONS;CONVENTIONS:;;popupmenu;CF1.4, GOSUD 3.0;1;0.1;0.02;;right;GOSUD NetCDF file format conventions, example: CF1.4, GOSUD 3.0;# +#;DATE_CREATION;DATE CREATION:;yyyymmddHHMMSS;edit;;;;;;right;Date and time (UTC) of creation of this file, format: yyyymmddHHMMSS;# +#;DATE_UPDATE;DATE UPDATE:;yyyymmddHHMMSS;edit;;;;;;right;Date and time (UTC) of update of this file, format: yyyymmddHHMMSS;# +#;DATA_RESTRICTIONS;DATA RESTRICTIONS:;;edit;NONE;;;;;right;Restriction on use for these data, example: NONE;# +#;CITATION;CITATION:;;edit;;;;;;left;This citation should be used for publications. Example : "These data were collected and made freely available by the International GOSUD Project and the national programmes that contribute to it.";# +#;COMMENT;COMMENT:;;edit;;;;;;right;Comment.;# +#;PI_NAME;PI NAME:;;popupmenu;Denis Diverres|David Varillon|Thierry Delcroix|Yves Gouriou|Bernard Bourles|Gilles Reverdin|Rosemary Morrow|Emilie Brion|Magali Krieger|Julien Perrier;1;0.1;0.02;;right;Name of the principal investigator in charge of the TSG line.;# #;DATA_CENTRE;DATA CENTRE:;;edit;;;;;;right;Code for data center (2 char);# -#;DATA_ACQUISITION;DATA ACQUISITION:;;popupmenu;IRD|GENAVIR|SHOM|CNRS|IPEV|IFREMER;1;0.1;0.02;;right;Acquisition data centre, ex: SHOM,IRD,GENAVIR,CNRS,...;# -#;PROCESSING_CENTRE;PROCESSING CENTRE:;;popupmenu;ORE-SSS|CORIOLIS|IRD|SISMER|SURVOSTRAL|SO_TSG_RECHERCHE;1;0.1;0.02;;right;Processing data centre, ex: ORE-SSS,CORIOLIS,SISMER,...;# -#;PROCESSING_STATES;PROCESSING STATES:;;popupmenu;0A|0B|1A|1B|1C|2B+|2C+|3B|3C;1;0.1;0.02;;right;0A: DONNEE BRUTE|1A: DONNEE LOCALISEE;# -#;WS_TYPE;WATER SAMPLE TYPE:;;popupmenu;OSIL|UNKNO|NA;3;0.1;0.02;;right;Water sample: NA, Not Available;# -#;TYPE_POSITION;TYPE_POSITION:;;popupmenu;GPS|GPS DIFFERENTIAL|ARGOS|INTERPOLATE|MANUAL|NONE|UNKNOW;1;0.1;0.02;;right;Description of navigation system;# +#;DATA_ACQUISITION;DATA ACQUISITION:;;popupmenu;IRD|GENAVIR|SHOM|CNRS|IPEV|IFREMER;1;0.1;0.02;;right;Acquisition data centre, example: SHOM, IRD, GENAVIR, CNRS,…;# +#;PROCESSING_CENTRE;PROCESSING CENTRE:;;popupmenu;ORE-SSS|CORIOLIS|IRD|SISMER|SURVOSTRAL|SO_TSG_RECHERCHE;1;0.1;0.02;;right;Processing data centre, example: ORE-SSS, CORIOLIS, SISMER, ...;# +#;PROCESSING_STATES;PROCESSING STATES:;;popupmenu;0A|0B|1A|1B|1C|2B+|2C+|3B|3C;1;0.1;0.02;;right;0A: RAW DATA|1A: CLIMATOLOGY CONTROL|1B: APPLICATION OF QUALITY CODE AFTER VISUAL INSPECTION|1C: VALIDED BY PI|2C+: CALIBRATED DATA VALIDATED BY PI;# +#;WS_TYPE;WATER SAMPLE TYPE:;;popupmenu;ARGO|CTD|OSIL|UNKNO|WS|XBT|XCTD|NA;8;0.1;0.02;;right;Model of water sample. Default: NA, Not Available, Example: OSIL;# +#;TYPE_POSITION;TYPE_POSITION:;;popupmenu;GPS|GPS DIFFERENTIAL|ARGOS|INTERPOLATE|MANUAL|NONE|UNKNOW;1;0.1;0.02;;right;Description of navigation system. Example: GPS, GPS DIFFERENTIAL, ARGOS, INTERPOLATE, MANUAL, NONE, UNKNOW;# #;HISTORY;HISTORY;;edit;;;0.15000001;0.02;;left;Provides an audit trail for modifications to the original data;# % $QUALITY$ diff --git a/@netcdf_native/tsgqc_netcdf.xls b/@netcdf_native/tsgqc_netcdf.xls index 292a4101f4574454a7f811e3d32bde2d887ba4dd..a0e6552be5e4a6aff9af6a727e70a48a19994d7c 100644 Binary files a/@netcdf_native/tsgqc_netcdf.xls and b/@netcdf_native/tsgqc_netcdf.xls differ diff --git a/TSGQC_amelioration.xls b/TSGQC_amelioration.xls index 6244b0a227519e0d817008741c564cf3ff96e671..20879e472d8f17d3d91c3ebba9ff9902df6a62c7 100644 Binary files a/TSGQC_amelioration.xls and b/TSGQC_amelioration.xls differ diff --git a/tsg_doc/CORTSG_format_gosud.doc b/tsg_doc/CORTSG_format_gosud.doc index 81e1c0cf4443e2c9ec4ccdbf4bb0e2029653633c..c2d34e09e0567107986fadc79819de5b17d29c15 100644 Binary files a/tsg_doc/CORTSG_format_gosud.doc and b/tsg_doc/CORTSG_format_gosud.doc differ diff --git a/tsg_doc/CORTSG_format_gosud.pdf b/tsg_doc/CORTSG_format_gosud.pdf index 2c1e0ba1446b15c0e779ee065a2ccde202261066..1f2b2040059773810be695a75d1d70eff1245b30 100644 Binary files a/tsg_doc/CORTSG_format_gosud.pdf and b/tsg_doc/CORTSG_format_gosud.pdf differ diff --git a/tsg_util/tsg_initialisation.m b/tsg_util/tsg_initialisation.m index c1a9a78e6bd29abd0fe33d202454968c97ebcf0d..e84cac3f293b636cb72bb0783dd49200bc2f6d62 100644 --- a/tsg_util/tsg_initialisation.m +++ b/tsg_util/tsg_initialisation.m @@ -13,7 +13,7 @@ function tsg_initialisation(hMainFig) %% global definition, see tsgqc.m % ------------------------------- -global NETCDF_FORMAT_VERSION +global GOSUD_FORMAT_VERSION %% init tsg.preference % tsg_initialisation is called when new file is reading @@ -229,7 +229,7 @@ end % set some fields % --------------- -tsg.FORMAT_VERSION = NETCDF_FORMAT_VERSION; +tsg.FORMAT_VERSION = GOSUD_FORMAT_VERSION; tsg.DATE_CREATION = date; tsg.DATE_UPDATE = tsg.DATE_CREATION; tsg.REFERENCE_DATE_TIME = REFERENCE_DATE_TIME; diff --git a/tsgqc.m b/tsgqc.m index b94ba7397120c88b9ea3923179489fc4d198b1ab..23a25921ec6275d1ea926dac965c96bf4b0536b6 100644 --- a/tsgqc.m +++ b/tsgqc.m @@ -32,18 +32,18 @@ function tsgqc( varargin ) % --------------------------------------- global VERSION global CHAR_VERSION -global NETCDF_FORMAT_VERSION +global GOSUD_FORMAT_VERSION % version number, may be used to initialize some files when it change % 0.90x -> 1.0RCx % ------------------------------------------------------------------- -VERSION = 1.24; % -> 1.3 -CHAR_VERSION = '1.24'; +VERSION = 1.3; % -> 1.3 +CHAR_VERSION = '1.3'; % netcdf file version, see DATA FORMAT TSG document: % CORTSG_format_gosud.doc % -------------------------------------------------- -NETCDF_FORMAT_VERSION = '2.0'; +GOSUD_FORMAT_VERSION = '3.0'; %% Initialization tasks % ********************