Index: gliderproc/trunk/extractDbd.m =================================================================== --- gliderproc/trunk/extractDbd.m (revision 503) +++ gliderproc/trunk/extractDbd.m (revision 507) @@ -37,5 +37,5 @@ end - disp(['Extracting ', strGliderName, 'Deployment ', num2str(deploymentNumber)]); + disp(['Extracting DBDs for ', strGliderName, ' Deployment ', num2str(deploymentNumber)]); % populate arrays for the deployment start and end dates... Index: gliderproc/trunk/gliderOptode_Generate_L1_Data.m =================================================================== --- gliderproc/trunk/gliderOptode_Generate_L1_Data.m (revision 506) +++ gliderproc/trunk/gliderOptode_Generate_L1_Data.m (revision 507) @@ -56,5 +56,5 @@ % define optode foil calibration coefficients - % by glider and deployment + % and oxygen bounds values by glider and deployment switch gliderIndex case 1 % Pelagia @@ -69,4 +69,8 @@ C3coef=[-3.96052E-02,7.46930E-04,-1.17804E-05,6.677619E-08]; C4coef=[1.61999E-04,-2.37870E-06,3.63223E-08,-1.62194E-10]; + lo_oxy = 50; + hi_oxy = 2000; + lo_sat = 50; + hi_sat = 2000; case 3 % Deployment 3; % replaced foil on 12 March 2012; @@ -78,4 +82,8 @@ C3coef=[-5.26332308E-02,7.15467419E-04,3.31185072E-06,-1.86124024E-07]; C4coef=[2.10916841E-04,-1.84087896E-06,-4.28645540E-08,1.11120317E-09]; + lo_oxy = 100; + hi_oxy = 300; + lo_sat = 20; + hi_sat = 140; end case 2 % Ramses all deployments; @@ -87,6 +95,16 @@ C3coef=[-5.99449e-2 1.48326e-3 -2.82110e-5 2.15156e-7]; C4coef=[2.43614e-4 -5.26759e-6 1.00064e-7 -7.14320e-10]; + lo_oxy = 10; + hi_oxy = 250; + lo_sat = 20; + hi_sat = 100; end + disp(['Processing DO for ', strGliderName, ' Deployment ', strDeploymentNumber]); + disp(['lo_oxy filter = ', num2str(lo_oxy)]); + disp(['hi_oxy filter = ', num2str(hi_oxy)]); + disp(['lo_sat filter = ', num2str(lo_sat)]); + disp(['hi_sat filter = ', num2str(hi_sat)]); + %*** READ IN EBD DATA **** % declare arrays for accumulating data @@ -178,4 +196,68 @@ oxyw_oxygen = oxyw_oxygen(i); 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); + + % remove unreasonably low oxygen values from EBD data... + i = find(gt(oxyw_oxygen, lo_oxy)); + oxyw_oxygen = oxyw_oxygen(i); + ptime_ebd = ptime_ebd(i); + oxyw_saturation = oxyw_saturation(i); + oxyw_dphase = oxyw_dphase(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); + + % remove unreasonably high oxygen values from EBD data... + i = find(lt(oxyw_oxygen, hi_oxy)); + oxyw_oxygen = oxyw_oxygen(i); + ptime_ebd = ptime_ebd(i); + oxyw_saturation = oxyw_saturation(i); + oxyw_dphase = oxyw_dphase(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); + + % remove unreasonably low saturation values from EBD data... + i = find(gt(oxyw_saturation, lo_sat)); + oxyw_saturation = oxyw_saturation(i); + ptime_ebd = ptime_ebd(i); + oxyw_oxygen = oxyw_oxygen(i); + oxyw_dphase = oxyw_dphase(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); + + % remove unreasonably high saturation values from EBD data... + i = find(lt(oxyw_saturation, hi_sat)); + oxyw_saturation = oxyw_saturation(i); + ptime_ebd = ptime_ebd(i); + oxyw_oxygen = oxyw_oxygen(i); + oxyw_dphase = oxyw_dphase(i); oxyw_temp = oxyw_temp(i); % oxyw_bphase = oxyw_bphase(i);