Index: gliderproc/trunk/gliderOptode_Generate_L1_Data.m =================================================================== --- gliderproc/trunk/gliderOptode_Generate_L1_Data.m (revision 503) +++ gliderproc/trunk/gliderOptode_Generate_L1_Data.m (revision 504) @@ -95,12 +95,12 @@ oxyw_temp = []; oxyw_dphase = []; - oxyw_bphase = []; - oxyw_rphase = []; - oxyw_bamp = []; - oxyw_bpot = []; - oxyw_ramp = []; - oxyw_rawtemp = []; - oxyw_time = []; - oxyw_installed = []; + % oxyw_bphase = []; + % oxyw_rphase = []; + % oxyw_bamp = []; + % oxyw_bpot = []; + % oxyw_ramp = []; + % oxyw_rawtemp = []; + % oxyw_time = []; + % oxyw_installed = []; ptime_ebd = []; @@ -138,28 +138,28 @@ data.data(:,strmatch('sci_oxy3835_wphase_dphase',... data.vars, 'exact'))]; - oxyw_bphase = [oxyw_bphase; ... - data.data(:,strmatch('sci_oxy3835_wphase_bphase',... - data.vars, 'exact'))]; - oxyw_rphase = [oxyw_rphase; ... - data.data(:,strmatch('sci_oxy3835_wphase_rphase',... - data.vars, 'exact'))]; - oxyw_bamp = [oxyw_bamp; ... - data.data(:,strmatch('sci_oxy3835_wphase_bamp',... - data.vars, 'exact'))]; - oxyw_bpot = [oxyw_bpot; ... - data.data(:,strmatch('sci_oxy3835_wphase_bpot',... - data.vars, 'exact'))]; - oxyw_ramp = [oxyw_ramp; ... - data.data(:,strmatch('sci_oxy3835_wphase_ramp',... - data.vars, 'exact'))]; - oxyw_rawtemp = [oxyw_rawtemp; ... - data.data(:,strmatch('sci_oxy3835_wphase_rawtemp',... - data.vars, 'exact'))]; - oxyw_time = [oxyw_time; ... - data.data(:,strmatch('sci_oxy3835_wphase_timestamp',... - data.vars, 'exact'))]; - oxyw_installed = [oxyw_installed; ... - data.data(:,strmatch('sci_oxy3835_wphase_is_installed',... - data.vars, 'exact'))]; + % oxyw_bphase = [oxyw_bphase; ... + % data.data(:,strmatch('sci_oxy3835_wphase_bphase',... + % data.vars, 'exact'))]; + % oxyw_rphase = [oxyw_rphase; ... + % data.data(:,strmatch('sci_oxy3835_wphase_rphase',... + % data.vars, 'exact'))]; + % oxyw_bamp = [oxyw_bamp; ... + % data.data(:,strmatch('sci_oxy3835_wphase_bamp',... + % data.vars, 'exact'))]; + % oxyw_bpot = [oxyw_bpot; ... + % data.data(:,strmatch('sci_oxy3835_wphase_bpot',... + % data.vars, 'exact'))]; + % oxyw_ramp = [oxyw_ramp; ... + % data.data(:,strmatch('sci_oxy3835_wphase_ramp',... + % data.vars, 'exact'))]; + % oxyw_rawtemp = [oxyw_rawtemp; ... + % data.data(:,strmatch('sci_oxy3835_wphase_rawtemp',... + % data.vars, 'exact'))]; + % oxyw_time = [oxyw_time; ... + % data.data(:,strmatch('sci_oxy3835_wphase_timestamp',... + % data.vars, 'exact'))]; + % oxyw_installed = [oxyw_installed; ... + % data.data(:,strmatch('sci_oxy3835_wphase_is_installed',... + % data.vars, 'exact'))]; ptime_ebd = [ptime_ebd; ... data.data(:,strmatch('sci_m_present_time',... @@ -179,12 +179,12 @@ oxyw_saturation = oxyw_saturation(i); oxyw_temp = oxyw_temp(i); - oxyw_bphase = oxyw_bphase(i); - oxyw_rphase = oxyw_rphase(i); - oxyw_bamp = oxyw_bamp(i); - oxyw_bpot = oxyw_bpot(i); - oxyw_ramp = oxyw_ramp(i); - oxyw_rawtemp = oxyw_rawtemp(i); - oxyw_time = oxyw_time(i); - oxyw_installed = oxyw_installed(i); + % oxyw_bphase = oxyw_bphase(i); + % oxyw_rphase = oxyw_rphase(i); + % oxyw_bamp = oxyw_bamp(i); + % oxyw_bpot = oxyw_bpot(i); + % oxyw_ramp = oxyw_ramp(i); + % oxyw_rawtemp = oxyw_rawtemp(i); + % oxyw_time = oxyw_time(i); + % oxyw_installed = oxyw_installed(i); % apply the sort() function to ptime_oxy @@ -196,12 +196,12 @@ oxyw_temp = oxyw_temp(I); oxyw_dphase = oxyw_dphase(I); - oxyw_bphase = oxyw_bphase(I); - oxyw_rphase = oxyw_rphase(I); - oxyw_bamp = oxyw_bamp(I); - oxyw_bpot = oxyw_bpot(I); - oxyw_ramp = oxyw_ramp(I); - oxyw_rawtemp = oxyw_rawtemp(I); - oxyw_time = oxyw_time(I); - oxyw_installed = oxyw_installed(I); + % oxyw_bphase = oxyw_bphase(I); + % oxyw_rphase = oxyw_rphase(I); + % oxyw_bamp = oxyw_bamp(I); + % oxyw_bpot = oxyw_bpot(I); + % oxyw_ramp = oxyw_ramp(I); + % oxyw_rawtemp = oxyw_rawtemp(I); + % oxyw_time = oxyw_time(I); + % oxyw_installed = oxyw_installed(I); % load CTD data from existing mat file... @@ -249,5 +249,5 @@ % third, implement the pressure correction to DO concentration (page 32) - os_tspcoor = o2_tscorr .* (1 + (0.04 .* depthi ./ 1000)); + o2_tspcoor = o2_tscorr .* (1 + (0.04 .* depthi ./ 1000)); % use polynomial to calculate DO satuations using the measured temp and @@ -273,33 +273,33 @@ o2_sol = exp(rslt); - o2_sat = (os_tspcoor .* 2.2414) ./ o2_sol; + o2_sat = (o2_tspcoor .* 2.2414) ./ o2_sol; % convert ptime into datenum style... - ptime_ebd_datenum = ptime_ebd/3600/24+datenum(1970, 1, 1, 0, 0, 0); + ptime_ebd_datenum = (ptime_ebd/3600/24) + datenum(1970, 1, 1, 0, 0, 0); % create configuration struct... units = struct( ... - 'oxyw_oxygen', '10?6 mol/dm3', ... + 'oxyw_oxygen', '10e-6 mol/dm3', ... 'oxyw_saturation', 'percent', ... 'oxyw_temp', 'degrees C', ... 'oxyw_dphase', 'degrees', ... - 'oxyw_bphase', 'degrees', ... - 'oxyw_rphase', 'degrees', ... - 'oxyw_bamp', 'mA', ... - 'oxyw_bpot', 'mV', ... - 'oxyw_ramp', 'mA', ... - 'oxyw_rawtemp', 'degrees C', ... - 'oxyw_time', 'timestamp', ... - 'oxyw_installed', 'bool', ... + ... % 'oxyw_bphase', 'degrees', ... + ... % 'oxyw_rphase', 'degrees', ... + ... % 'oxyw_bamp', 'mA', ... + ... % 'oxyw_bpot', 'mV', ... + ... % 'oxyw_ramp', 'mA', ... + ... % 'oxyw_rawtemp', 'degrees C', ... + ... % 'oxyw_time', 'timestamp', ... + ... % 'oxyw_installed', 'bool', ... 'ptime_ebd', 'seconds since 0000-01-01T00:00', ... 'ptime_ebd_datenum', 'days since 1970-01-01T00:00', ... 'tempi', 'degrees C', ... 'salini', 'psu', ... - 'depthi', 'decibars', ... - 'o2_tcorr', '10?6 mol/dm3', ... - 'o2_tscorr', '10?6 mol/dm3', ... - 'o2_tspcoor', '10?6 mol/dm3', ... + 'depthi', 'meters', ... + 'o2_tcorr', '10e-6 mol/dm3', ... + 'o2_tscorr', '10e-6 mol/dm3', ... + 'o2_tspcoor', '10e-6 mol/dm3', ... 'o2_sol', 'cm3/liter at 1031 hPa', ... - 'os_sat', 'percent'); + 'o2_sat', 'percent'); variable_description = struct( ... @@ -308,22 +308,22 @@ 'oxyw_temp', 'water temperature', ... 'oxyw_dphase', 'phase difference', ... - 'oxyw_bphase', 'blue phase', ... - 'oxyw_rphase', 'red phase', ... - 'oxyw_bamp', 'blue current bias', ... - 'oxyw_bpot', 'blue voltage bias', ... - 'oxyw_ramp', 'red current bias', ... - 'oxyw_rawtemp', 'raw water temperature', ... - 'oxyw_time', 'optode timestampe', ... - 'oxyw_installed', 'bool', ... - 'ptime_ebd', 'seconds since 0000-01-01T00:00', ... - 'ptime_ebd_datenum', 'days since 1970-01-01T00:00', ... - 'tempi', 'degrees C', ... - 'salini', 'psu', ... - 'depthi', 'decibars', ... - 'o2_tcorr', '10?6 mol/dm3', ... - 'o2_tscorr', '10?6 mol/dm3', ... - 'o2_tspcoor', '10?6 mol/dm3', ... - 'o2_sol', 'cm3/liter at 1031 hPa', ... - 'os_sat', 'percent'); + ... % 'oxyw_bphase', 'blue phase', ... + ... % 'oxyw_rphase', 'red phase', ... + ... % 'oxyw_bamp', 'blue current bias', ... + ... % 'oxyw_bpot', 'blue voltage bias', ... + ... % 'oxyw_ramp', 'red current bias', ... + ... % 'oxyw_rawtemp', 'raw water temperature', ... + ... % 'oxyw_time', 'optode timestampe', ... + ... % 'oxyw_installed', 'bool', ... + 'ptime_ebd', 'science computer time', ... + 'ptime_ebd_datenum', 'science computer date', ... + 'tempi', 'interpolated CTD water temperature', ... + 'salini', 'interpoloted CTD salinity', ... + 'depthi', 'interpolated CTD depth', ... + 'o2_tcorr', 'temperature corrected dissolved oxygen', ... + 'o2_tscorr', 'temperature and salinity corrected dissolved oxygen', ... + 'o2_tspcoor', 'temperature, salinity, and pressure corrected dissolved oxygen', ... + 'o2_sol', 'corrected oxygen solubility', ... + 'o2_sat', 'corrected oxygen saturation'); correction_coefficients = struct('C0coef', C0coef, ... @@ -337,5 +337,5 @@ 'start_date', strStartDate,... 'end_date', strEndDate,... - 'correction_coefficients', correction_parameters,... + 'correction_coefficients', correction_coefficients,... 'var_descriptions', variable_description,... 'var_units', units); @@ -351,12 +351,12 @@ 'oxyw_temp', ... 'oxyw_dphase', ... - 'oxyw_bphase', ... - 'oxyw_rphase', ... - 'oxyw_bamp', ... - 'oxyw_bpot', ... - 'oxyw_ramp', ... - 'oxyw_rawtemp', ... - 'oxyw_time', ... - 'oxyw_installed', ... + ... % 'oxyw_bphase', ... + ... % 'oxyw_rphase', ... + ... % 'oxyw_bamp', ... + ... % 'oxyw_bpot', ... + ... % 'oxyw_ramp', ... + ... % 'oxyw_rawtemp', ... + ... % 'oxyw_time', ... + ... % 'oxyw_installed', ... 'ptime_ebd', ... 'ptime_ebd_datenum', ... @@ -368,5 +368,5 @@ 'o2_tspcoor', ... 'o2_sol', ... - 'os_sat'); + 'o2_sat'); end